migrate non-mop smses to use postman sms service

opengovsg · May 29, 2024 · 5a2e6eb · 5a2e6eb
1 parent 6a68b77
commit 5a2e6eb
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/src/app/modules/bounce/bounce.service.ts b/src/app/modules/bounce/bounce.service.ts
@@ -17,7 +17,6 @@ import {
 import { EMAIL_HEADERS, EmailType } from '../../services/mail/mail.constants'
 import MailService from '../../services/mail/mail.service'
 import PostmanSmsService from '../../services/postman-sms/postman-sms.service'
-import { SmsFactory } from '../../services/sms/sms.factory'
 import { transformMongoError } from '../../utils/handle-mongo-error'
 import { PossibleDatabaseError } from '../core/core.errors'
 import { getCollabEmailsWithPermission } from '../form/form.utils'
@@ -369,14 +368,14 @@ export const notifyAdminsOfDeactivation = (
   // Best-effort attempt to send SMSes, don't propagate error upwards
 ): ResultAsync<true, never> => {
   const smsResults = possibleSmsRecipients.map((recipient) =>
-    SmsFactory.sendFormDeactivatedSms({
-      adminEmail: form.admin.email,
-      adminId: String(form.admin._id),
-      formId: form._id,
-      formTitle: form.title,
-      recipient: recipient.contact,
-      recipientEmail: recipient.email,
-    }),
+    PostmanSmsService.sendFormDeactivatedSms(
+      form.admin.email,
+      String(form.admin._id),
+      form._id,
+      form.title,
+      recipient.contact,
+      recipient.email,
+    ),
   )
   return ResultAsync.combineWithAllErrors(smsResults)
     .map(() => true as const)

diff --git a/src/app/modules/user/user.controller.ts b/src/app/modules/user/user.controller.ts
@@ -6,7 +6,7 @@ import {
 } from '../../../../shared/types'
 import { IPopulatedUser } from '../../../types'
 import { createLoggerWithLabel } from '../../config/logger'
-import { SmsFactory } from '../../services/sms/sms.factory'
+import PostmanSmsService from '../../services/postman-sms/postman-sms.service'
 import { getRequestIp } from '../../utils/request'
 import { getUserIdFromSession } from '../auth/auth.utils'
 import { ControllerHandler } from '../core/core.types'
@@ -68,7 +68,7 @@ export const _handleContactSendOtp: ControllerHandler<
 
   // Step 2: No error, send verification OTP to contact.
   const otp = createResult.value
-  const sendOtpResult = await SmsFactory.sendAdminContactOtp(
+  const sendOtpResult = await PostmanSmsService.sendAdminContactOtp(
     contact,
     otp,
     userId,

diff --git a/src/app/modules/user/user.utils.ts b/src/app/modules/user/user.utils.ts
@@ -2,7 +2,7 @@ import { StatusCodes } from 'http-status-codes'
 
 import { UserContactView } from '../../../types'
 import { createLoggerWithLabel } from '../../config/logger'
-import * as SmsErrors from '../../services/sms/sms.errors'
+import * as SmsErrors from '../../services/postman-sms/postman-sms.errors'
 import { HashingError } from '../../utils/hash'
 import * as CoreErrors from '../core/core.errors'
 import { ErrorResponseData } from '../core/core.types'

diff --git a/src/app/modules/verification/verification.service.ts b/src/app/modules/verification/verification.service.ts
@@ -22,6 +22,7 @@ import {
   SmsSendError,
 } from '../../services/postman-sms/postman-sms.errors'
 import PostmanSmsService from '../../services/postman-sms/postman-sms.service'
+import { SmsFactory } from '../../services/sms/sms.factory'
 import { transformMongoError } from '../../utils/handle-mongo-error'
 import { compareHash, HashingError } from '../../utils/hash'
 import {