From 3a5126670ff71398c9141b8e6896b84711ff85ae Mon Sep 17 00:00:00 2001
From: ghost2023 <nathnaelwonisha@gmail.com>
Date: Tue, 4 Aug 2026 15:32:49 +0300
Subject: [PATCH] fix: centralized on rabbitmq for sms

---
 .../strategies/notification.sms.strategy.ts   | 58 +++----------------
 .../src/modules/otp/otp.service.ts            |  8 +--
 2 files changed, 13 insertions(+), 53 deletions(-)

diff --git a/apps/edr-freight-api/src/modules/notifications/strategies/notification.sms.strategy.ts b/apps/edr-freight-api/src/modules/notifications/strategies/notification.sms.strategy.ts
index cddc67b2d..ac021c322 100644
--- a/apps/edr-freight-api/src/modules/notifications/strategies/notification.sms.strategy.ts
+++ b/apps/edr-freight-api/src/modules/notifications/strategies/notification.sms.strategy.ts
@@ -1,62 +1,22 @@
 import { Injectable, Logger } from "@nestjs/common";
-import { ConfigService } from "@nestjs/config";
-import axios, { isAxiosError } from "axios";
 
 import { NotificationStrategy } from "./notification.strategy";
+import { SmsClientService } from "../sms-client.service";
 
 @Injectable()
 export class SmsNotificationStrategy implements NotificationStrategy {
   private readonly logger = new Logger(SmsNotificationStrategy.name);
 
-  constructor(private readonly configService: ConfigService) {}
+  constructor(private readonly smsClient: SmsClientService) {}
 
   async send(recipient: string, message: string): Promise<boolean> {
-    const url =
-      this.configService.get<string>("OZIKING_SMS_URL") ??
-      "https://notification-dev.license.aafda.gov.et/api/sms-services/ozeking/sms";
-
-    const appKey = this.configService.get<string>("OZIKING_APP_KEY") ?? "";
-    if (!appKey) {
-      this.logger.warn("OZIKING_APP_KEY is not set — SMS may be rejected by the API");
-    }
-
-    this.logger.debug(`Sending SMS to ${recipient} via ${url}`);
-
-    // axios defaults to no timeout — a hanging gateway would block the caller
-    // (and any transaction it sits in) indefinitely. Always bound the wait.
-    const timeout = Number(this.configService.get<string>("SMS_TIMEOUT_MS") ?? 8000);
-
-    try {
-      const response = await axios.post(
-        url,
-        {
-          to: recipient,
-          sourceId: this.configService.get<string>("OZIKING_SOURCE_ID") ?? "EDR",
-          sourceName: this.configService.get<string>("OZIKING_SOURCE_NAME") ?? "EDR Freight",
-          appKey,
-          text: message,
-          callbackUrl: "",
-        },
-        {
-          timeout,
-          headers: {
-            accept: "*/*",
-            "Content-Type": "application/json",
-          },
-        },
-      );
-
-      this.logger.debug(`SMS API response: ${response.status} ${JSON.stringify(response.data)}`);
-      return true;
-    } catch (err) {
-      if (isAxiosError(err)) {
-        this.logger.error(
-          `SMS API error: ${err.message} | status=${err.response?.status} | body=${JSON.stringify(err.response?.data)}`,
-        );
-      } else {
-        this.logger.error(`SMS send failed: ${String(err)}`);
-      }
-      throw err;
+    const { queued } = await this.smsClient.sendSms({
+      to: recipient,
+      message,
+    });
+    if (!queued) {
+      this.logger.error(`SMS to ${recipient} was not queued to RabbitMQ`);
     }
+    return queued;
   }
 }
diff --git a/apps/edr-freight-api/src/modules/otp/otp.service.ts b/apps/edr-freight-api/src/modules/otp/otp.service.ts
index d5688e1c2..a7361fbdd 100644
--- a/apps/edr-freight-api/src/modules/otp/otp.service.ts
+++ b/apps/edr-freight-api/src/modules/otp/otp.service.ts
@@ -265,10 +265,10 @@ export class OtpService {
 
   /**
    * SMS half of {@link dispatchEmail}; same swallow-and-report contract. Sent
-   * via NotificationsService's direct-HTTP Ozeking strategy — the same
-   * transport the notification system uses — rather than the RabbitMQ
-   * `SMS_SERVICE` queue, so `queued: true` here means the gateway accepted the
-   * request, not just that a broker took ownership of the message.
+   * via NotificationsService's `directSend`, which now routes through the
+   * same RabbitMQ `SMS_SERVICE` queue as every other SMS in freight-api, so
+   * `queued: true` here means the broker confirmed ownership of the message,
+   * not that the carrier delivered it.
    */
   private async dispatchSms(
     phone: string,