feat(notifications): finish migrating gql functionality (#3821)

- move settings ownership from account to user - complete notification mutations migration - add notification settings to user
GaloyMoney · Jan 12, 2024 · 93a01a0 · 93a01a0
1 parent ac43ce0
commit 93a01a0
Show file tree

Hide file tree

Showing 27 changed files with 694 additions and 424 deletions.
diff --git a/bats/core/notifications/notifications.bats b/bats/core/notifications/notifications.bats
@@ -16,7 +16,36 @@ setup_file() {
     jq -n \
       '{input: { channel: "PUSH" }}')
 
-    exec_graphql "$token_name" 'account-disable-notification-channel-alt' "$variables"
-    channel_enabled="$(graphql_output '.data.accountDisableNotificationChannelAlt.notificationSettings.push.enabled')"
+    exec_graphql "$token_name" 'user-disable-notification-channel' "$variables"
+    channel_enabled="$(graphql_output '.data.userDisableNotificationChannel.notificationSettings.push.enabled')"
+
   [[ "$channel_enabled" == "false" ]] || exit 1
+
+    # Ensure notification settings exist on user
+    exec_graphql "$token_name" 'user-notification-settings'
+    user_channel_enabled="$(graphql_output '.data.me.notificationSettings.push.enabled')"
+
+    [[ "$user_channel_enabled" == "false" ]] || exit 1
+
+
+    exec_graphql "$token_name" 'user-enable-notification-channel' "$variables"
+    channel_enabled="$(graphql_output '.data.userEnableNotificationChannel.notificationSettings.push.enabled')"
+  [[ "$channel_enabled" == "true" ]] || exit 1
+}
+
+@test "notifications: disable/enable notification category" {
+    token_name='alice' 
+
+    variables=$( 
+    jq -n \
+      '{input: { channel: "PUSH", category: "CIRCLES" }}')
+
+    exec_graphql "$token_name" 'user-disable-notification-category' "$variables"
+    disabled_category="$(graphql_output '.data.userDisableNotificationCategory.notificationSettings.push.disabledCategories[0]')"
+
+  [[ "$disabled_category" == "CIRCLES" ]] || exit 1
+
+    exec_graphql "$token_name" 'user-enable-notification-category' "$variables"
+    disabled_length="$(graphql_output '.data.userEnableNotificationCategory.notificationSettings.push.disabledCategories | length')"
+  [[ "$disabled_length" == "0" ]] || exit 1
 }
diff --git a/bats/gql/account-disable-notification-channel-alt.gql b/bats/gql/account-disable-notification-channel-alt.gql
diff --git a/bats/gql/user-disable-notification-category.gql b/bats/gql/user-disable-notification-category.gql
@@ -0,0 +1,12 @@
+mutation userDisableNotificationCategory(
+  $input: UserDisableNotificationCategoryInput!
+) {
+  userDisableNotificationCategory(input: $input) {
+    notificationSettings {
+      push {
+        enabled
+        disabledCategories
+      }
+    }
+  }
+}
diff --git a/bats/gql/user-disable-notification-channel.gql b/bats/gql/user-disable-notification-channel.gql
@@ -0,0 +1,12 @@
+mutation userDisableNotificationChannel(
+  $input: UserDisableNotificationChannelInput!
+) {
+  userDisableNotificationChannel(input: $input) {
+    notificationSettings {
+      push {
+        enabled
+        disabledCategories
+      }
+    }
+  }
+}
diff --git a/bats/gql/user-enable-notification-category.gql b/bats/gql/user-enable-notification-category.gql
@@ -0,0 +1,12 @@
+mutation userEnableNotificationCategory(
+  $input: UserEnableNotificationCategoryInput!
+) {
+  userEnableNotificationCategory(input: $input) {
+    notificationSettings {
+      push {
+        enabled
+        disabledCategories
+      }
+    }
+  }
+}
diff --git a/bats/gql/user-enable-notification-channel.gql b/bats/gql/user-enable-notification-channel.gql
@@ -0,0 +1,12 @@
+mutation userEnableNotificationChannel(
+  $input: UserEnableNotificationChannelInput!
+) {
+  userEnableNotificationChannel(input: $input) {
+    notificationSettings {
+      push {
+        enabled
+        disabledCategories
+      }
+    }
+  }
+}
diff --git a/bats/gql/user-notification-settings.gql b/bats/gql/user-notification-settings.gql
@@ -0,0 +1,10 @@
+query userNotificationSettings {
+  me {
+    id
+    notificationSettings {
+      push {
+        enabled
+      }
+    }
+  }
+}
diff --git a/...cations/.sqlx/query-0d5f56e2f99fb2d8e60e63d1bc16342b53b6aff5793ea99caac3c7cb09139762.json b/...cations/.sqlx/query-0d5f56e2f99fb2d8e60e63d1bc16342b53b6aff5793ea99caac3c7cb09139762.json
diff --git a/...3f3a3ef55c10681f8d4e0606e4c24c8259f4.json → ...8610b5278cb86bd649474d4eb663e98f4497.json b/...3f3a3ef55c10681f8d4e0606e4c24c8259f4.json → ...8610b5278cb86bd649474d4eb663e98f4497.json
diff --git a/...cations/.sqlx/query-529104c49014a0c003388fb84a45073a1b9178a3da720708b860c2c3a626bd8b.json b/...cations/.sqlx/query-529104c49014a0c003388fb84a45073a1b9178a3da720708b860c2c3a626bd8b.json
diff --git a/core/notifications/migrations/20240111102028_notifications_setup.sql b/core/notifications/migrations/20240111102028_notifications_setup.sql
@@ -1,11 +1,11 @@
-CREATE TABLE account_notification_settings (
+CREATE TABLE user_notification_settings (
     id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
-    galoy_account_id VARCHAR UNIQUE NOT NULL,
+    galoy_user_id VARCHAR UNIQUE NOT NULL,
     created_at TIMESTAMPTZ NOT NULL DEFAULT NOW()
 );
 
-CREATE TABLE account_notification_settings_events (
-  id UUID REFERENCES account_notification_settings(id) NOT NULL,
+CREATE TABLE user_notification_settings_events (
+  id UUID REFERENCES user_notification_settings(id) NOT NULL,
   sequence INT NOT NULL,
   event_type VARCHAR NOT NULL,
   event JSONB NOT NULL,