chore(notifications): remove Email from UserNotificationChannel

GaloyMoney · Feb 15, 2024 · 5d78fb1 · 5d78fb1
1 parent c39a046
commit 5d78fb1
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 8 deletions.
diff --git a/core/notifications/proto/notifications.proto b/core/notifications/proto/notifications.proto
@@ -19,7 +19,6 @@ service NotificationsService {
 
 enum NotificationChannel {
   PUSH = 0;
-  EMAIL = 1;
 }
 
 enum NotificationCategory {

diff --git a/core/notifications/src/app/mod.rs b/core/notifications/src/app/mod.rs
@@ -26,7 +26,8 @@ pub struct NotificationsApp {
 impl NotificationsApp {
     pub async fn init(pool: Pool<Postgres>, config: AppConfig) -> Result<Self, ApplicationError> {
         let settings = UserNotificationSettingsRepo::new(&pool);
-        let executor = Executor::init(config.executor.clone(), settings.clone()).await?;
+        let executor = PushExecutor::init(config.executor.clone(), settings.clone()).await?;
+
         let _email_executor = EmailExecutor::init(config.email_executor.clone(), settings.clone())?;
         let runner = job::start_job_runner(&pool, executor).await?;
         Ok(Self {

diff --git a/core/notifications/src/email_executor/mod.rs b/core/notifications/src/email_executor/mod.rs
@@ -2,7 +2,7 @@ mod config;
 pub mod error;
 mod smtp;
 
-use crate::{notification_event::*, primitives::*, user_notification_settings::*};
+use crate::{notification_event::*, user_notification_settings::*};
 
 pub use config::*;
 use error::*;
@@ -30,9 +30,6 @@ impl EmailExecutor {
 
     pub async fn notify<T: NotificationEvent>(&self, event: &T) -> Result<(), EmailExecutorError> {
         let settings = self.settings.find_for_user_id(event.user_id()).await?;
-        if !settings.should_send_notification(UserNotificationChannel::Email, event.category()) {
-            return Ok(());
-        }
         let msg = event.to_localized_msg(settings.locale().unwrap_or_default());
 
         self.smtp.send_email(msg).await?;

diff --git a/core/notifications/src/grpc/server/convert.rs b/core/notifications/src/grpc/server/convert.rs
@@ -20,7 +20,6 @@ impl From<proto::NotificationChannel> for UserNotificationChannel {
     fn from(channel: proto::NotificationChannel) -> Self {
         match channel {
             proto::NotificationChannel::Push => UserNotificationChannel::Push,
-            proto::NotificationChannel::Email => UserNotificationChannel::Email,
         }
     }
 }

diff --git a/core/notifications/src/primitives.rs b/core/notifications/src/primitives.rs
@@ -84,7 +84,6 @@ impl std::fmt::Display for PushDeviceToken {
 #[graphql(name = "UserNotificationChannel")]
 pub enum UserNotificationChannel {
     Push,
-    Email,
 }
 
 #[derive(async_graphql::Enum, Debug, Hash, Copy, Clone, Eq, PartialEq, Deserialize, Serialize)]
-Original file line number
+Diff line change
@@ Expand Up / @@ -84,7 +84,6 @@ impl std::fmt::Display for PushDeviceToken { @@
     #[graphql(name = "UserNotificationChannel")]
     pub enum UserNotificationChannel {
         Push,
-        Email,
     }
     #[derive(async_graphql::Enum, Debug, Hash, Copy, Clone, Eq, PartialEq, Deserialize, Serialize)]
@@ Expand Down @@