feat(core): proxy notification settings operations

GaloyMoney · Jan 16, 2024 · 73546ba · 73546ba
1 parent ca5f796
commit 73546ba
Show file tree

Hide file tree

Showing 23 changed files with 3,840 additions and 348 deletions.
diff --git a/core/api/package.json b/core/api/package.json
@@ -5,7 +5,7 @@
     "eslint-check": "eslint src test --ext .ts",
     "eslint-fix": "eslint src test --ext .ts --fix",
     "circular-deps-check": "madge --circular --extensions ts src",
-    "build": "tsc -p tsconfig-build.json && cp -R src/services/price/protos dist/services/price/ && cp -R src/services/dealer-price/proto dist/services/dealer-price/ && cp -R src/services/loopd/protos dist/services/loopd/ && cp -R src/services/bria/proto dist/services/bria/ && tscpaths --silent -p tsconfig.json -s ./src -o ./dist",
+    "build": "tsc -p tsconfig-build.json && cp -R src/services/price/protos dist/services/price/ && cp -R src/services/dealer-price/proto dist/services/dealer-price/ && cp -R src/services/loopd/protos dist/services/loopd/ && cp -R src/services/bria/proto dist/services/bria/ && cp -R src/services/notifications/proto dist/services/notifications/ && tscpaths --silent -p tsconfig.json -s ./src -o ./dist",
     "trigger": "pnpm run build && node dist/servers/trigger.js | pino-pretty -c -l",
     "ws": "pnpm run build && node dist/servers/ws-server.js | pino-pretty -c -l",
     "watch": "nodemon -V -e ts,graphql -w ./src -x pnpm run start",

diff --git a/core/api/src/app/accounts/disable-notification-category.ts b/core/api/src/app/accounts/disable-notification-category.ts
@@ -1,8 +1,9 @@
 import {
+  NotificationChannel,
   checkedToNotificationCategory,
-  disableNotificationCategory as domainDisableNotificationCategory,
 } from "@/domain/notifications"
 import { AccountsRepository } from "@/services/mongoose"
+import { NotificationsService } from "@/services/notifications"
 
 export const disableNotificationCategory = async ({
   accountId,
@@ -19,13 +20,15 @@ export const disableNotificationCategory = async ({
   const account = await AccountsRepository().findById(accountId)
   if (account instanceof Error) return account
 
-  const newNotificationSettings = domainDisableNotificationCategory({
-    notificationSettings: account.notificationSettings,
-    notificationChannel,
+  const notificationsService = NotificationsService()
+
+  const newNotificationSettings = await notificationsService.disableNotificationCategory({
+    userId: account.kratosUserId,
+    notificationChannel: notificationChannel || NotificationChannel.Push,
     notificationCategory: checkedNotificationCategory,
   })
 
-  account.notificationSettings = newNotificationSettings
+  if (newNotificationSettings instanceof Error) return newNotificationSettings
 
-  return AccountsRepository().update(account)
+  return account
 }
diff --git a/core/api/src/app/accounts/disable-notification-channel.ts b/core/api/src/app/accounts/disable-notification-channel.ts
@@ -1,5 +1,5 @@
-import { disableNotificationChannel as domainDisableNotificationChannel } from "@/domain/notifications"
 import { AccountsRepository } from "@/services/mongoose"
+import { NotificationsService } from "@/services/notifications"
 
 export const disableNotificationChannel = async ({
   accountId,
@@ -11,12 +11,14 @@ export const disableNotificationChannel = async ({
   const account = await AccountsRepository().findById(accountId)
   if (account instanceof Error) return account
 
-  const newNotificationSettings = domainDisableNotificationChannel({
-    notificationSettings: account.notificationSettings,
+  const notificationsService = NotificationsService()
+
+  const newNotificationSettings = await notificationsService.disableNotificationChannel({
+    userId: account.kratosUserId,
     notificationChannel,
   })
 
-  account.notificationSettings = newNotificationSettings
+  if (newNotificationSettings instanceof Error) return newNotificationSettings
 
-  return AccountsRepository().update(account)
+  return account
 }
diff --git a/core/api/src/app/accounts/enable-notification-category.ts b/core/api/src/app/accounts/enable-notification-category.ts
@@ -1,8 +1,9 @@
 import {
+  NotificationChannel,
   checkedToNotificationCategory,
-  enableNotificationCategory as domainEnableNotificationCategory,
 } from "@/domain/notifications"
 import { AccountsRepository } from "@/services/mongoose"
+import { NotificationsService } from "@/services/notifications"
 
 export const enableNotificationCategory = async ({
   accountId,
@@ -19,13 +20,15 @@ export const enableNotificationCategory = async ({
   const account = await AccountsRepository().findById(accountId)
   if (account instanceof Error) return account
 
-  const newNotificationSettings = domainEnableNotificationCategory({
-    notificationSettings: account.notificationSettings,
-    notificationChannel,
+  const notificationsService = NotificationsService()
+
+  const newNotificationSettings = await notificationsService.enableNotificationCategory({
+    userId: account.kratosUserId,
+    notificationChannel: notificationChannel || NotificationChannel.Push,
     notificationCategory: checkedNotificationCategory,
   })
 
-  account.notificationSettings = newNotificationSettings
+  if (newNotificationSettings instanceof Error) return newNotificationSettings
 
-  return AccountsRepository().update(account)
+  return account
 }
diff --git a/core/api/src/app/accounts/enable-notification-channel.ts b/core/api/src/app/accounts/enable-notification-channel.ts
@@ -1,5 +1,5 @@
-import { enableNotificationChannel as domainEnableNotificationChannel } from "@/domain/notifications"
 import { AccountsRepository } from "@/services/mongoose"
+import { NotificationsService } from "@/services/notifications"
 
 export const enableNotificationChannel = async ({
   accountId,
@@ -11,12 +11,14 @@ export const enableNotificationChannel = async ({
   const account = await AccountsRepository().findById(accountId)
   if (account instanceof Error) return account
 
-  const newNotificationSettings = domainEnableNotificationChannel({
-    notificationSettings: account.notificationSettings,
+  const notificationsService = NotificationsService()
+
+  const newNotificationSettings = await notificationsService.enableNotificationChannel({
+    userId: account.kratosUserId,
     notificationChannel,
   })
 
-  account.notificationSettings = newNotificationSettings
+  if (newNotificationSettings instanceof Error) return newNotificationSettings
 
-  return AccountsRepository().update(account)
+  return account
 }
diff --git a/core/api/src/app/accounts/get-notification-settings-for-account.ts b/core/api/src/app/accounts/get-notification-settings-for-account.ts
@@ -0,0 +1,11 @@
+import { NotificationsService } from "@/services/notifications"
+
+export const getNotificationSettingsForAccount = ({
+  account,
+}: {
+  account: Account
+}): Promise<NotificationSettings | ApplicationError> => {
+  const notificationsService = NotificationsService()
+
+  return notificationsService.getUserNotificationSettings(account.kratosUserId)
+}
diff --git a/core/api/src/app/accounts/index.ts b/core/api/src/app/accounts/index.ts
@@ -26,6 +26,7 @@ export * from "./enable-notification-channel"
 export * from "./disable-notification-channel"
 export * from "./get-pending-incoming-on-chain-transactions-for-account"
 export * from "./get-invoices-for-account"
+export * from "./get-notification-settings-for-account"
 
 const accounts = AccountsRepository()
 

diff --git a/core/api/src/config/env.ts b/core/api/src/config/env.ts
@@ -50,6 +50,14 @@ export const env = createEnv({
     BRIA_PORT: z.number().min(1).or(z.string()).pipe(z.coerce.number()).default(2742),
     BRIA_API_KEY: z.string().min(1),
 
+    NOTIFICATIONS_HOST: z.string().min(1),
+    NOTIFICATIONS_PORT: z
+      .number()
+      .min(1)
+      .or(z.string())
+      .pipe(z.coerce.number())
+      .default(6685),
+
     GEETEST_ID: z.string().min(1).optional(),
     GEETEST_KEY: z.string().min(1).optional(),
 
@@ -168,6 +176,9 @@ export const env = createEnv({
     BRIA_PORT: process.env.BRIA_PORT,
     BRIA_API_KEY: process.env.BRIA_API_KEY,
 
+    NOTIFICATIONS_HOST: process.env.NOTIFICATIONS_HOST,
+    NOTIFICATIONS_PORT: process.env.NOTIFICATIONS_PORT,
+
     GEETEST_ID: process.env.GEETEST_ID,
     GEETEST_KEY: process.env.GEETEST_KEY,
 

diff --git a/core/api/src/config/index.ts b/core/api/src/config/index.ts
@@ -121,6 +121,8 @@ export const KRATOS_CALLBACK_API_KEY = env.KRATOS_CALLBACK_API_KEY
 export const BRIA_HOST = env.BRIA_HOST
 export const BRIA_PORT = env.BRIA_PORT
 export const BRIA_API_KEY = env.BRIA_API_KEY
+export const NOTIFICATIONS_HOST = env.NOTIFICATIONS_HOST
+export const NOTIFICATIONS_PORT = env.NOTIFICATIONS_PORT
 export const GEETEST_ID = env.GEETEST_ID
 export const GEETEST_KEY = env.GEETEST_KEY
 export const MONGODB_CON = env.MONGODB_CON

diff --git a/core/api/src/domain/notifications/index.ts b/core/api/src/domain/notifications/index.ts
@@ -1,6 +1,5 @@
-import { InvalidPushNotificationSettingError as InvalidNotificationSettingsError } from "./errors"
-
 export * from "./errors"
+import { InvalidPushNotificationSettingError } from "./errors"
 
 export const NotificationType = {
   IntraLedgerReceipt: "intra_ledger_receipt",
@@ -12,164 +11,23 @@ export const NotificationType = {
   LigtningPayment: "lightning_payment",
 } as const
 
-export const NotificationChannel = {
-  Push: "push",
-} as const
-
-export const GaloyNotificationCategories = {
-  Payments: "Payments" as NotificationCategory,
-  Balance: "Balance" as NotificationCategory,
-  AdminPushNotification: "AdminPushNotification" as NotificationCategory,
-} as const
-
 export const checkedToNotificationCategory = (
   notificationCategory: string,
 ): NotificationCategory | ValidationError => {
   // TODO: add validation
   if (!notificationCategory) {
-    return new InvalidNotificationSettingsError("Invalid notification category")
+    return new InvalidPushNotificationSettingError("Invalid notification category")
   }
 
   return notificationCategory as NotificationCategory
 }
 
-export const enableNotificationChannel = ({
-  notificationSettings,
-  notificationChannel,
-}: {
-  notificationSettings: NotificationSettings
-  notificationChannel: NotificationChannel
-}): NotificationSettings => {
-  return setNotificationChannelIsEnabled({
-    notificationSettings,
-    notificationChannel,
-    enabled: true,
-  })
-}
-
-export const disableNotificationChannel = ({
-  notificationSettings,
-  notificationChannel,
-}: {
-  notificationSettings: NotificationSettings
-  notificationChannel: NotificationChannel
-}): NotificationSettings => {
-  return setNotificationChannelIsEnabled({
-    notificationSettings,
-    notificationChannel,
-    enabled: false,
-  })
-}
-
-const setNotificationChannelIsEnabled = ({
-  notificationSettings,
-  notificationChannel,
-  enabled,
-}: {
-  notificationSettings: NotificationSettings
-  notificationChannel: NotificationChannel
-  enabled: boolean
-}): NotificationSettings => {
-  const notificationChannelSettings = notificationSettings[notificationChannel]
-  const enabledChanged = notificationChannelSettings.enabled !== enabled
-
-  const newNotificationSettings = {
-    enabled,
-    disabledCategories: enabledChanged
-      ? []
-      : notificationChannelSettings.disabledCategories,
-  }
-
-  return {
-    ...notificationSettings,
-    [notificationChannel]: newNotificationSettings,
-  }
-}
-
-export const enableNotificationCategory = ({
-  notificationSettings,
-  notificationChannel,
-  notificationCategory,
-}: {
-  notificationSettings: NotificationSettings
-  notificationChannel?: NotificationChannel
-  notificationCategory: NotificationCategory
-}): NotificationSettings => {
-  const notificationChannelsToUpdate: NotificationChannel[] = notificationChannel
-    ? [notificationChannel]
-    : Object.values(NotificationChannel)
-
-  let newNotificationSettings = notificationSettings
-
-  for (const notificationChannel of notificationChannelsToUpdate) {
-    const notificationChannelSettings = notificationSettings[notificationChannel]
-    const disabledCategories = notificationChannelSettings.disabledCategories
-
-    const newNotificationChannelSettings = {
-      enabled: notificationChannelSettings.enabled,
-      disabledCategories: disabledCategories.filter(
-        (category) => category !== notificationCategory,
-      ),
-    }
-
-    newNotificationSettings = {
-      ...notificationSettings,
-      [notificationChannel]: newNotificationChannelSettings,
-    }
-  }
-
-  return newNotificationSettings
-}
-
-export const disableNotificationCategory = ({
-  notificationSettings,
-  notificationChannel,
-  notificationCategory,
-}: {
-  notificationSettings: NotificationSettings
-  notificationChannel?: NotificationChannel
-  notificationCategory: NotificationCategory
-}): NotificationSettings => {
-  const notificationChannelsToUpdate: NotificationChannel[] = notificationChannel
-    ? [notificationChannel]
-    : Object.values(NotificationChannel)
-
-  let newNotificationSettings = notificationSettings
-
-  for (const notificationChannel of notificationChannelsToUpdate) {
-    const notificationChannelSettings = notificationSettings[notificationChannel]
-    const disabledCategories = notificationChannelSettings.disabledCategories
-    disabledCategories.push(notificationCategory)
-    const uniqueDisabledCategories = [...new Set(disabledCategories)]
-
-    const newNotificationChannelSettings = {
-      enabled: notificationChannelSettings.enabled,
-      disabledCategories: uniqueDisabledCategories,
-    }
-
-    newNotificationSettings = {
-      ...notificationSettings,
-      [notificationChannel]: newNotificationChannelSettings,
-    }
-  }
-
-  return newNotificationSettings
-}
-
-export const shouldSendNotification = ({
-  notificationChannel,
-  notificationSettings,
-  notificationCategory,
-}: {
-  notificationChannel: NotificationChannel
-  notificationSettings: NotificationSettings
-  notificationCategory: NotificationCategory
-}): boolean => {
-  const channelNotificationSettings = notificationSettings[notificationChannel]
-
-  if (channelNotificationSettings.enabled) {
-    return !channelNotificationSettings.disabledCategories.includes(notificationCategory)
-  }
+export const NotificationChannel = {
+  Push: "push",
+} as const
 
-  return false
-}
+export const GaloyNotificationCategories = {
+  Payments: "Payments" as NotificationCategory,
+  Balance: "Balance" as NotificationCategory,
+  AdminPushNotification: "AdminPushNotification" as NotificationCategory,
+} as const
diff --git a/core/api/src/domain/notifications/index.types.d.ts b/core/api/src/domain/notifications/index.types.d.ts
@@ -53,4 +53,30 @@ interface INotificationsService {
   adminPushNotificationFilteredSend(
     args: SendFilteredPushNotificationArgs,
   ): Promise<true | NotificationsServiceError>
+
+  getUserNotificationSettings(
+    userId: UserId,
+  ): Promise<NotificationSettings | NotificationsServiceError>
+
+  enableNotificationChannel(args: {
+    userId: UserId
+    notificationChannel: NotificationChannel
+  }): Promise<NotificationSettings | NotificationsServiceError>
+
+  disableNotificationChannel(args: {
+    userId: UserId
+    notificationChannel: NotificationChannel
+  }): Promise<NotificationSettings | NotificationsServiceError>
+
+  enableNotificationCategory(args: {
+    userId: UserId
+    notificationChannel: NotificationChannel
+    notificationCategory: NotificationCategory
+  }): Promise<NotificationSettings | NotificationsServiceError>
+
+  disableNotificationCategory(args: {
+    userId: UserId
+    notificationChannel: NotificationChannel
+    notificationCategory: NotificationCategory
+  }): Promise<NotificationSettings | NotificationsServiceError>
 }