chore(notifications): complete initial use case e2e

GaloyMoney · Jan 11, 2024 · af3c498 · af3c498
1 parent a62bd40
commit af3c498
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 5 deletions.
diff --git a/core/api/dev/apollo-federation/supergraph.graphql b/core/api/dev/apollo-federation/supergraph.graphql
@@ -1227,6 +1227,7 @@ enum NotificationCategoryAlt
   @join__type(graph: NOTIFICATIONS)
 {
   CIRCLES @join__enumValue(graph: NOTIFICATIONS)
+  PAYMENTS @join__enumValue(graph: NOTIFICATIONS)
 }
 
 enum NotificationChannel

diff --git a/core/notifications/src/account_notification_settings/entity.rs b/core/notifications/src/account_notification_settings/entity.rs
@@ -49,6 +49,18 @@ impl EsEntity for AccountNotificationSettings {
 }
 
 impl AccountNotificationSettings {
+    pub fn new(galoy_account_id: GaloyAccountId) -> Self {
+        let id = AccountNotificationSettingsId::new();
+        Self::try_from(EntityEvents::init(
+            id,
+            [AccountNotificationSettingsEvent::Initialized {
+                id,
+                galoy_account_id,
+            }],
+        ))
+        .expect("Could not create default")
+    }
+
     pub fn disable_channel(&mut self, channel: NotificationChannel) {
         if !self.is_channel_enabled(channel) {
             return;

diff --git a/core/notifications/src/account_notification_settings/repo.rs b/core/notifications/src/account_notification_settings/repo.rs
@@ -17,7 +17,7 @@ impl AccountNotificationSettingsRepo {
 
     pub async fn find_for_account_id(
         &self,
-        account_id: GaloyAccountId,
+        account_id: &GaloyAccountId,
     ) -> Result<Option<AccountNotificationSettings>, AccountNotificationSettingsError> {
         let rows = sqlx::query_as!(
             GenericEvent,

diff --git a/core/notifications/src/app/mod.rs b/core/notifications/src/app/mod.rs
@@ -31,11 +31,10 @@ impl NotificationsApp {
         channel: NotificationChannel,
     ) -> Result<AccountNotificationSettings, ApplicationError> {
         let mut account_settings =
-            if let Some(settings) = self.settings.find_for_account_id(account_id).await? {
+            if let Some(settings) = self.settings.find_for_account_id(&account_id).await? {
                 settings
             } else {
-                unimplemented!()
-                // AccountNotificationSettings::default()
+                AccountNotificationSettings::new(account_id)
             };
         account_settings.disable_channel(channel);
         self.settings.persist(&mut account_settings).await?;

diff --git a/core/notifications/src/cli/db.rs b/core/notifications/src/cli/db.rs
@@ -14,7 +14,7 @@ pub async fn init_pool(config: &DbConfig) -> anyhow::Result<sqlx::PgPool> {
         .connect(&config.pg_con)
         .await?;
 
-    // sqlx::migrate!().run(&pool).await?;
+    sqlx::migrate!().run(&pool).await?;
 
     Ok(pool)
 }

diff --git a/core/notifications/subgraph/schema.graphql b/core/notifications/subgraph/schema.graphql
@@ -20,6 +20,7 @@ type Mutation {
 
 enum NotificationCategoryAlt {
 	CIRCLES
+	PAYMENTS
 }
 
 enum NotificationChannelAlt {

diff --git a/dev/config/apollo-federation/supergraph.graphql b/dev/config/apollo-federation/supergraph.graphql
@@ -1227,6 +1227,7 @@ enum NotificationCategoryAlt
   @join__type(graph: NOTIFICATIONS)
 {
   CIRCLES @join__enumValue(graph: NOTIFICATIONS)
+  PAYMENTS @join__enumValue(graph: NOTIFICATIONS)
 }
 
 enum NotificationChannel
-Original file line number
+Diff line change
@@ Expand Up / @@ -20,6 +20,7 @@ type Mutation { @@
     enum NotificationCategoryAlt {
     	CIRCLES
+    	PAYMENTS
     }
     enum NotificationChannelAlt {
@@ Expand Down @@