phone

src/modules/notifications/services/notification.service.ts

@@ -50,6 +50,7 @@ export class NotificationService {
         })),
       );
     }
+
     // add sms notifications to queue
     if (preference?.channels?.includes(NotifChannelEnum.SMS)) {
       await this.queueService.addBulkSmsNotifications(
@@ -140,6 +141,7 @@ export class NotificationService {
       },
     );
   }
+
   async findByAdminAndRestaurant(adminId: string, restaurantId: string, limit = 50): Promise<Notification[]> {
     return this.em.find(
       Notification,

src/modules/utils/sms.service.ts

@@ -32,10 +32,11 @@ export class SmsService {
       name,
       value: value.toString(),
     }));
+    const cleanedPhone = this.formatPhone(phone);
 
     const smsData: ISmsBodyParameters = {
       Parameters: parametersArray,
-      Mobile: phone,
+      Mobile: cleanedPhone,
       TemplateId: templateId,
     };
 
@@ -57,4 +58,22 @@ export class SmsService {
       throw new HttpException('The SMS was not sent. Please try again later.', HttpStatus.BAD_GATEWAY);
     }
   }
+  formatPhone(phone: string): string {
+    // remove spaces, dashes, parentheses
+    phone = phone.replace(/[^\d+]/g, '');
+
+    if (phone.startsWith('+98')) {
+      return phone;
+    }
+
+    if (phone.startsWith('98')) {
+      return `+${phone}`;
+    }
+
+    if (phone.startsWith('0')) {
+      return `+98${phone.slice(1)}`;
+    }
+
+    return `+98${phone}`;
+  }
 }