refactor(mail.service): changes to use env var instead of const

opengovsg · Jul 14, 2021 · 876e096 · 876e096
1 parent 9a7ca5e
commit 876e096
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/src/app/modules/form/admin-form/__tests__/admin-form.service.spec.ts b/src/app/modules/form/admin-form/__tests__/admin-form.service.spec.ts
@@ -54,7 +54,7 @@ import {
 
 import { generateDefaultField } from 'tests/unit/backend/helpers/generate-form-data'
 
-import { SMS_VERIFICATION_LIMIT } from '../../../../../shared/util/verification'
+import { smsConfig } from '../../../../config/features/sms.config'
 import * as SmsService from '../../../../services/sms/sms.service'
 import {
   FormNotFoundError,
@@ -2266,7 +2266,7 @@ describe('admin-form.service', () => {
 
     it('should return the form when admin is under the limit', async () => {
       // Arrange
-      countSpy.mockReturnValueOnce(okAsync(SMS_VERIFICATION_LIMIT))
+      countSpy.mockReturnValueOnce(okAsync(smsConfig.smsVerificationLimit))
 
       // Act
       const actual = await shouldUpdateFormField(
@@ -2320,7 +2320,7 @@ describe('admin-form.service', () => {
 
     it('should return sms retrieval error when sms limit exceeded and admin is attempting to toggle sms verification for mobile field on', async () => {
       // Arrange
-      countSpy.mockReturnValueOnce(okAsync(SMS_VERIFICATION_LIMIT + 1))
+      countSpy.mockReturnValueOnce(okAsync(smsConfig.smsVerificationLimit + 1))
 
       // Act
       const actual = await shouldUpdateFormField(

diff --git a/src/app/modules/verification/verification.util.ts b/src/app/modules/verification/verification.util.ts
@@ -2,7 +2,6 @@ import { StatusCodes } from 'http-status-codes'
 
 import {
   HASH_EXPIRE_AFTER_SECONDS,
-  SMS_VERIFICATION_LIMIT,
   VERIFIED_FIELDTYPES,
   WAIT_FOR_OTP_SECONDS,
   WAIT_FOR_OTP_TOLERANCE_SECONDS,
@@ -12,6 +11,7 @@ import {
   IVerificationSchema,
   MapRouteError,
 } from '../../../types'
+import { smsConfig } from '../../config/features/sms.config'
 import { createLoggerWithLabel } from '../../config/logger'
 import { MailSendError } from '../../services/mail/mail.errors'
 import { InvalidNumberError, SmsSendError } from '../../services/sms/sms.errors'
@@ -213,5 +213,5 @@ export const mapRouteError: MapRouteError = (
 }
 
 export const hasAdminExceededFreeSmsLimit = (smsCount: number): boolean => {
-  return smsCount > SMS_VERIFICATION_LIMIT
+  return smsCount > smsConfig.smsVerificationLimit
 }
diff --git a/src/shared/util/verification.ts b/src/shared/util/verification.ts
@@ -21,5 +21,3 @@ export enum VfnErrors {
   TransactionNotFound = 'TRANSACTION_NOT_FOUND',
   InvalidMobileNumber = 'INVALID_MOBILE_NUMBER',
 }
-
-export const SMS_VERIFICATION_LIMIT = 10000