diff --git a/quickstart/dev/config/apollo-federation/supergraph.graphql b/quickstart/dev/config/apollo-federation/supergraph.graphql index 81891fb783..e0a95a74fe 100644 --- a/quickstart/dev/config/apollo-federation/supergraph.graphql +++ b/quickstart/dev/config/apollo-federation/supergraph.graphql @@ -2138,7 +2138,8 @@ type User id: ID! apiKeys: [ApiKey!]! @join__field(graph: API_KEYS) statefulNotifications(first: Int!, after: String): StatefulNotificationConnection! @join__field(graph: NOTIFICATIONS) - unacknowledgedStatefulNotificationsCount: Int! @join__field(graph: NOTIFICATIONS) + statefulNotificationsWithoutBulletinEnabled(first: Int!, after: String): StatefulNotificationConnection! @join__field(graph: NOTIFICATIONS) + unacknowledgedStatefulNotificationsWithoutBulletinEnabledCount: Int! @join__field(graph: NOTIFICATIONS) unacknowledgedStatefulNotificationsWithBulletinEnabled(first: Int!, after: String): StatefulNotificationConnection! @join__field(graph: NOTIFICATIONS) """ diff --git a/quickstart/docker-compose.tmpl.yml b/quickstart/docker-compose.tmpl.yml index 0a4450691b..f8e718c002 100644 --- a/quickstart/docker-compose.tmpl.yml +++ b/quickstart/docker-compose.tmpl.yml @@ -1,8 +1,8 @@ #@ load("@ytt:data", "data") -#@ galoy_api_image_digest = "sha256@2e6cf203b02499e493eb0a6f2124863f359d693274c511c2d9b1313b3b81f87f" -#@ galoy_trigger_image_digest = "sha256@a9966cad1c50434d0697bc0702abb82ab71a49f56df37bef68e6d613d576a097" -#@ mongodb_migrate_image_digest = "sha256@acb76a1f0b6cef30a3cf794cac954422f185096c9450307847316080b25cb665" +#@ galoy_api_image_digest = "sha256@e5b3ec62a4fdb476b44805e0c719e2d12a11c40491e739f825e6efd212b66f5c" +#@ galoy_trigger_image_digest = "sha256@b09562367897e5c01254cac6014d78d35208da7eb771ab27f06e5b854876b757" +#@ mongodb_migrate_image_digest = "sha256@ebd8d58baa3174e6c0fdcb2a915fd0378e73865d8155e3180f383966f75bda63" #@ galoy_notifications_image_digest = "sha256@6538962850fed78a1616fdf3e83dad1035c9ffc4ccd7360c3f50caef40a649ff" #@ core_env = [ diff --git a/quickstart/docker-compose.yml b/quickstart/docker-compose.yml index 40aae97a62..690b641957 100644 --- a/quickstart/docker-compose.yml +++ b/quickstart/docker-compose.yml @@ -98,7 +98,7 @@ services: - POSTGRES_PASSWORD=secret - POSTGRES_DB=hydra galoy: - image: us.gcr.io/galoy-org/galoy-api@sha256:2e6cf203b02499e493eb0a6f2124863f359d693274c511c2d9b1313b3b81f87f + image: us.gcr.io/galoy-org/galoy-api@sha256:e5b3ec62a4fdb476b44805e0c719e2d12a11c40491e739f825e6efd212b66f5c environment: - HELMREVISION=dev - NETWORK=regtest @@ -161,7 +161,7 @@ services: aliases: - bats-tests trigger: - image: us.gcr.io/galoy-org/galoy-api-trigger@sha256:a9966cad1c50434d0697bc0702abb82ab71a49f56df37bef68e6d613d576a097 + image: us.gcr.io/galoy-org/galoy-api-trigger@sha256:b09562367897e5c01254cac6014d78d35208da7eb771ab27f06e5b854876b757 environment: - HELMREVISION=dev - NETWORK=regtest @@ -254,7 +254,7 @@ services: environment: - MONGO_INITDB_DATABASE=galoy mongodb-migrate: - image: us.gcr.io/galoy-org/galoy-api-migrate@sha256:acb76a1f0b6cef30a3cf794cac954422f185096c9450307847316080b25cb665 + image: us.gcr.io/galoy-org/galoy-api-migrate@sha256:ebd8d58baa3174e6c0fdcb2a915fd0378e73865d8155e3180f383966f75bda63 depends_on: - mongodb environment: diff --git a/quickstart/graphql/gql/list-stateful-notifications-without-bulletin-enabled.gql b/quickstart/graphql/gql/list-stateful-notifications-without-bulletin-enabled.gql new file mode 100644 index 0000000000..55145e887e --- /dev/null +++ b/quickstart/graphql/gql/list-stateful-notifications-without-bulletin-enabled.gql @@ -0,0 +1,20 @@ +query listStatefulNotificationsWithoutBulletinEnabled($first: Int = 2, $after: String = null) { + me { + id + statefulNotificationsWithoutBulletinEnabled(first: $first, after: $after) { + pageInfo { + endCursor + hasNextPage + } + nodes { + id + body + title + deepLink + acknowledgedAt + createdAt + bulletinEnabled + } + } + } +} diff --git a/quickstart/graphql/gql/list-stateful-notifications.gql b/quickstart/graphql/gql/list-stateful-notifications.gql index 0278d23a70..3af9a7f90c 100644 --- a/quickstart/graphql/gql/list-stateful-notifications.gql +++ b/quickstart/graphql/gql/list-stateful-notifications.gql @@ -13,6 +13,7 @@ query listStatefulNotifications($first: Int = 2, $after: String = null) { deepLink acknowledgedAt createdAt + bulletinEnabled } } } diff --git a/quickstart/graphql/gql/unacknowledged-stateful-notifications-count.gql b/quickstart/graphql/gql/unacknowledged-stateful-notifications-count.gql deleted file mode 100644 index 43064401e1..0000000000 --- a/quickstart/graphql/gql/unacknowledged-stateful-notifications-count.gql +++ /dev/null @@ -1,6 +0,0 @@ -query unacknowledgedStatefulNotificationsCount { - me { - id - unacknowledgedStatefulNotificationsCount - } -} diff --git a/quickstart/graphql/gql/unacknowledged-stateful-notifications-without-bulletin-enabled-count.gql b/quickstart/graphql/gql/unacknowledged-stateful-notifications-without-bulletin-enabled-count.gql new file mode 100644 index 0000000000..2ca88aa448 --- /dev/null +++ b/quickstart/graphql/gql/unacknowledged-stateful-notifications-without-bulletin-enabled-count.gql @@ -0,0 +1,6 @@ +query unacknowledgedStatefulNotificationsWithoutBulletinEnabledCount { + me { + id + unacknowledgedStatefulNotificationsWithoutBulletinEnabledCount + } +} diff --git a/quickstart/vendir.lock.yml b/quickstart/vendir.lock.yml index 6afc0c34e7..75667f3b76 100644 --- a/quickstart/vendir.lock.yml +++ b/quickstart/vendir.lock.yml @@ -2,24 +2,24 @@ apiVersion: vendir.k14s.io/v1alpha1 directories: - contents: - git: - commitTitle: 'feat(notifications): add icon to stateful notification (#4444)...' - sha: 349a31b6e80df69c481e9a9736b0fe5efb4efce2 + commitTitle: 'feat(notifications): query and counts for non bulletins (#4453)...' + sha: 5e287ae0fc6ca27a30957797035b1de1e2df5d44 tags: - - 0.20.193-4-g349a31b6e + - 0.20.194-1-g5e287ae0f path: . path: dev - contents: - git: - commitTitle: 'feat(notifications): add icon to stateful notification (#4444)...' - sha: 349a31b6e80df69c481e9a9736b0fe5efb4efce2 + commitTitle: 'feat(notifications): query and counts for non bulletins (#4453)...' + sha: 5e287ae0fc6ca27a30957797035b1de1e2df5d44 tags: - - 0.20.193-4-g349a31b6e + - 0.20.194-1-g5e287ae0f path: schemas - git: - commitTitle: 'feat(notifications): add icon to stateful notification (#4444)...' - sha: 349a31b6e80df69c481e9a9736b0fe5efb4efce2 + commitTitle: 'feat(notifications): query and counts for non bulletins (#4453)...' + sha: 5e287ae0fc6ca27a30957797035b1de1e2df5d44 tags: - - 0.20.193-4-g349a31b6e + - 0.20.194-1-g5e287ae0f path: gql path: graphql kind: LockConfig diff --git a/quickstart/vendir.yml b/quickstart/vendir.yml index db895f61a3..2d233b7f6b 100644 --- a/quickstart/vendir.yml +++ b/quickstart/vendir.yml @@ -6,7 +6,7 @@ directories: - path: ./ git: url: https://github.com/GaloyMoney/galoy.git - ref: 349a31b6e80df69c481e9a9736b0fe5efb4efce2 + ref: 5e287ae0fc6ca27a30957797035b1de1e2df5d44 includePaths: - dev/**/* excludePaths: @@ -18,7 +18,7 @@ directories: - path: schemas/ git: url: https://github.com/GaloyMoney/galoy.git - ref: 349a31b6e80df69c481e9a9736b0fe5efb4efce2 + ref: 5e287ae0fc6ca27a30957797035b1de1e2df5d44 includePaths: - core/api/src/graphql/public/schema.graphql - core/api/src/graphql/admin/schema.graphql @@ -26,7 +26,7 @@ directories: - path: gql/ git: url: https://github.com/GaloyMoney/galoy.git - ref: 349a31b6e80df69c481e9a9736b0fe5efb4efce2 + ref: 5e287ae0fc6ca27a30957797035b1de1e2df5d44 includePaths: - bats/gql/**/* newRootPath: bats/gql diff --git a/quickstart/vendir/values.yml b/quickstart/vendir/values.yml index 99a34b75bd..2f4b40a133 100644 --- a/quickstart/vendir/values.yml +++ b/quickstart/vendir/values.yml @@ -1,3 +1,3 @@ #@data/values --- -galoy_git_ref: 349a31b6e80df69c481e9a9736b0fe5efb4efce2 +galoy_git_ref: 5e287ae0fc6ca27a30957797035b1de1e2df5d44