diff --git a/charts/galoy/Chart.yaml b/charts/galoy/Chart.yaml index 434bde4274..fd14c2bdcf 100644 --- a/charts/galoy/Chart.yaml +++ b/charts/galoy/Chart.yaml @@ -16,7 +16,7 @@ version: 0.33.72-dev # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. -appVersion: 0.20.153 +appVersion: 0.20.155 dependencies: - name: redis repository: https://charts.bitnami.com/bitnami diff --git a/charts/galoy/apollo-router/supergraph.graphql b/charts/galoy/apollo-router/supergraph.graphql index 3ced79a8f6..d17e1bab12 100644 --- a/charts/galoy/apollo-router/supergraph.graphql +++ b/charts/galoy/apollo-router/supergraph.graphql @@ -604,6 +604,17 @@ type GraphQLApplicationError implements Error scalar Hex32Bytes @join__type(graph: PUBLIC) +type InAppNotification + @join__type(graph: NOTIFICATIONS) +{ + id: ID! + title: String! + body: String! + deepLink: String + createdAt: Timestamp! + readAt: Timestamp +} + union InitiationVia @join__type(graph: PUBLIC) @join__unionMember(graph: PUBLIC, member: "InitiationViaIntraLedger") @@ -1155,10 +1166,7 @@ type Mutation { apiKeyCreate(input: ApiKeyCreateInput!): ApiKeyCreatePayload! @join__field(graph: API_KEYS) apiKeyRevoke(input: ApiKeyRevokeInput!): ApiKeyRevokePayload! @join__field(graph: API_KEYS) - userDisableNotificationChannel(input: UserDisableNotificationChannelInput!): UserUpdateNotificationSettingsPayload! @join__field(graph: NOTIFICATIONS) - userEnableNotificationChannel(input: UserEnableNotificationChannelInput!): UserUpdateNotificationSettingsPayload! @join__field(graph: NOTIFICATIONS) - userDisableNotificationCategory(input: UserDisableNotificationCategoryInput!): UserUpdateNotificationSettingsPayload! @join__field(graph: NOTIFICATIONS) - userEnableNotificationCategory(input: UserEnableNotificationCategoryInput!): UserUpdateNotificationSettingsPayload! @join__field(graph: NOTIFICATIONS) + userInAppNotificationMarkAsRead(input: UserInAppNotificationMarkAsReadInput!): UserInAppNotificationMarkAsReadPayload! @join__field(graph: NOTIFICATIONS) accountDelete: AccountDeletePayload! @join__field(graph: PUBLIC) accountDisableNotificationCategory(input: AccountDisableNotificationCategoryInput!): AccountUpdateNotificationSettingsPayload! @join__field(graph: PUBLIC) accountDisableNotificationChannel(input: AccountDisableNotificationChannelInput!): AccountUpdateNotificationSettingsPayload! @join__field(graph: PUBLIC) @@ -1822,6 +1830,7 @@ Timestamp field, serialized as Unix time (the number of seconds since the Unix e """ scalar Timestamp @join__type(graph: API_KEYS) + @join__type(graph: NOTIFICATIONS) @join__type(graph: PUBLIC) """A time-based one-time password""" @@ -2011,7 +2020,7 @@ type User { id: ID! apiKeys: [ApiKey!]! @join__field(graph: API_KEYS) - notificationSettings: UserNotificationSettings! @join__field(graph: NOTIFICATIONS) + inAppNotifications(onlyUnread: Boolean): [InAppNotification!]! @join__field(graph: NOTIFICATIONS) """ Get single contact details. @@ -2091,19 +2100,6 @@ type UserContactUpdateAliasPayload errors: [Error!]! } -input UserDisableNotificationCategoryInput - @join__type(graph: NOTIFICATIONS) -{ - channel: UserNotificationChannel! - category: UserNotificationCategory! -} - -input UserDisableNotificationChannelInput - @join__type(graph: NOTIFICATIONS) -{ - channel: UserNotificationChannel! -} - type UserEmailDeletePayload @join__type(graph: PUBLIC) { @@ -2139,17 +2135,16 @@ type UserEmailRegistrationValidatePayload me: User } -input UserEnableNotificationCategoryInput +input UserInAppNotificationMarkAsReadInput @join__type(graph: NOTIFICATIONS) { - channel: UserNotificationChannel! - category: UserNotificationCategory! + notificationId: ID! } -input UserEnableNotificationChannelInput +type UserInAppNotificationMarkAsReadPayload @join__type(graph: NOTIFICATIONS) { - channel: UserNotificationChannel! + notification: InAppNotification! } input UserLoginInput @@ -2176,36 +2171,6 @@ input UserLogoutInput scalar Username @join__type(graph: PUBLIC) -enum UserNotificationCategory - @join__type(graph: NOTIFICATIONS) -{ - CIRCLES @join__enumValue(graph: NOTIFICATIONS) - PAYMENTS @join__enumValue(graph: NOTIFICATIONS) - ADMIN_NOTIFICATION @join__enumValue(graph: NOTIFICATIONS) - MARKETING @join__enumValue(graph: NOTIFICATIONS) - PRICE @join__enumValue(graph: NOTIFICATIONS) - SECURITY @join__enumValue(graph: NOTIFICATIONS) -} - -enum UserNotificationChannel - @join__type(graph: NOTIFICATIONS) -{ - PUSH @join__enumValue(graph: NOTIFICATIONS) -} - -type UserNotificationChannelSettings - @join__type(graph: NOTIFICATIONS) -{ - enabled: Boolean! - disabledCategories: [UserNotificationCategory!]! -} - -type UserNotificationSettings - @join__type(graph: NOTIFICATIONS) -{ - push: UserNotificationChannelSettings! -} - type UserPhoneDeletePayload @join__type(graph: PUBLIC) { @@ -2286,12 +2251,6 @@ type UserUpdateLanguagePayload user: User } -type UserUpdateNotificationSettingsPayload - @join__type(graph: NOTIFICATIONS) -{ - notificationSettings: UserNotificationSettings! -} - input UserUpdateUsernameInput @join__type(graph: PUBLIC) { diff --git a/charts/galoy/values.yaml b/charts/galoy/values.yaml index 737cdabe48..8996024442 100644 --- a/charts/galoy/values.yaml +++ b/charts/galoy/values.yaml @@ -36,31 +36,31 @@ galoy: repository: us.gcr.io/galoy-org/galoy-api ## Digest of the image ## - digest: "sha256:71bd755092aa4f72d8c57e431b30cce164ed4a2fa5b7e68a0cf3af8c2075f3cc" + digest: "sha256:8817480a5e722eb3e6b20684b48e4752d6c79fbfc14cffc1bbde4f7cd0341e4b" ## Not used by Helm, just used to ref to the source https://github.com/GaloyMoney/galoy.git ## Reference for timestamping the corresponding docker image and used by internal CI. ## - git_ref: "d22642e" + git_ref: "429e9a3" websocket: repository: us.gcr.io/galoy-org/galoy-api-ws-server ## Digest of the image ## - digest: "sha256:506884eb62e3911008f142f25ef7a728538f180281bc576ee29c4f343cb1098d" + digest: "sha256:fe77e858921cff5d2469defc8b4a3e8027506fad8b0f8edfb30d76ec55787942" trigger: repository: us.gcr.io/galoy-org/galoy-api-trigger ## Digest of the image ## - digest: "sha256:92da97dab83c5faf9603643549178b810dcb9b40a89b84bae68fc8cecc7d66f1" + digest: "sha256:5ac36bfe8b26c90cb59108c8ff253896543bb8649c3a9d93a221b493b4df9338" cron: repository: us.gcr.io/galoy-org/galoy-api-cron ## Digest of the image ## - digest: "sha256:42fb72a55d3441a926d97a4fe32d4db541a71581c6172ea9fdf7e5f0c99f2091" + digest: "sha256:c5e13cf62f1f7a5b8b8047e3bedc32eb8fda94ef7838b3c2f8ea5f3378b16337" exporter: repository: us.gcr.io/galoy-org/galoy-api-exporter ## Digest of the image ## - digest: "sha256:3e3ce355d6afe8edf38d61ae8bd93e908f50cc8a829fcfb5fa2169623d59ebdd" + digest: "sha256:c3bed337446e7d3456d434a2530432206b7f4366d78601e661aa1e2ba728818b" consent: repository: us.gcr.io/galoy-org/galoy-consent ## Digest of the image @@ -84,7 +84,7 @@ galoy: repository: us.gcr.io/galoy-org/galoy-api-migrate ## Digest of the image ## - digest: "sha256:cf136e2d26889ca0f383a80d2d36d9aff82cc031751297034a44f98fd6ba9a0b" + digest: "sha256:47fd3f798e2d5d81c0053589ee2b4c5cac064bcc46927a45bed6532bf6eaa569" ## Galoy Application MongoDB Backup Image details ## mongoBackup: