From a74a9232f23bd64612882bae8f80ac846c5e3255 Mon Sep 17 00:00:00 2001
From: Roba Boru <robab@ethiopianairines.com>
Date: Wed, 17 Jun 2026 16:54:16 +0300
Subject: [PATCH] Fix build error

---
 apps/edr-passenger-api/src/app.module.ts      |  2 +-
 .../notifications/notifications.module.ts     | 65 +++++--------------
 2 files changed, 19 insertions(+), 48 deletions(-)

diff --git a/apps/edr-passenger-api/src/app.module.ts b/apps/edr-passenger-api/src/app.module.ts
index f0edd6cba..757432c3b 100644
--- a/apps/edr-passenger-api/src/app.module.ts
+++ b/apps/edr-passenger-api/src/app.module.ts
@@ -75,7 +75,7 @@ import { CurrenciesModule } from './modules/currencies/currencies.module';
     PaymentsModule,
     TicketsModule,
     PassengersModule,
-    NotificationsModule.register(),
+    NotificationsModule,
     LoyaltyModule,
     WalletModule,
     PromosModule,
diff --git a/apps/edr-passenger-api/src/modules/notifications/notifications.module.ts b/apps/edr-passenger-api/src/modules/notifications/notifications.module.ts
index 8578a47e8..c72552015 100644
--- a/apps/edr-passenger-api/src/modules/notifications/notifications.module.ts
+++ b/apps/edr-passenger-api/src/modules/notifications/notifications.module.ts
@@ -1,4 +1,4 @@
-import { DynamicModule, Module } from '@nestjs/common';
+import { Module } from '@nestjs/common';
 import { HttpModule } from '@nestjs/axios';
 import { ClientsModule, Transport } from '@nestjs/microservices';
 import { NotificationsController } from './notifications.controller';
@@ -11,64 +11,35 @@ import { SmsClientService } from './sms-client.service';
   imports: [
     HttpModule.register({ timeout: 10_000 }),
     ClientsModule.register([
-      {
-        name: 'SMS_SERVICE',
-        transport: Transport.RMQ,
-        options: {
-          urls: [process.env.RABBITMQ_URL as string],
-          queue: 'sms_queue',
-          queueOptions: { durable: true },
-        },
-      },
       {
         name: 'EMAIL_SERVICE',
         transport: Transport.RMQ,
         options: {
           urls: [process.env.RABBITMQ_URL as string],
-          queue: 'email_queue',
+          queue: process.env.EMAIL_QUEUE ?? 'email_queue',
           queueOptions: { durable: true },
         },
       },
       {
-        name: 'NOTIFICATION_SERVICE',
+        name: 'SMS_SERVICE',
         transport: Transport.RMQ,
         options: {
           urls: [process.env.RABBITMQ_URL as string],
-          queue: 'notification_queue',
+          queue: process.env.SMS_QUEUE ?? 'sms_queue',
           queueOptions: { durable: true },
         },
       },
-    }),
-  },
-]);
-
-@Module({})
-export class NotificationsModule {
-  static register(): DynamicModule {
-    const rmqEnabled = process.env.RABBITMQ_ENABLED !== 'false';
-
-    return {
-      module: NotificationsModule,
-      imports: [
-        HttpModule.register({ timeout: 10_000 }),
-        ...(rmqEnabled ? [rmqClientsModule] : []),
-      ],
-      controllers: [NotificationsController],
-      providers: [
-        NotificationsService,
-        EmailAdapter,
-        SmsAdapter,
-        PushAdapter,
-        ...(rmqEnabled
-          ? [EmailClientService, SmsClientService]
-          : [
-              { provide: 'EMAIL_SERVICE', useValue: null },
-              { provide: 'SMS_SERVICE', useValue: null },
-              EmailClientService,
-              SmsClientService,
-            ]),
-      ],
-      exports: [NotificationsService, EmailClientService, SmsClientService],
-    };
-  }
-}
+    ]),
+  ],
+  controllers: [NotificationsController],
+  providers: [
+    NotificationsService,
+    EmailAdapter,
+    SmsAdapter,
+    PushAdapter,
+    EmailClientService,
+    SmsClientService,
+  ],
+  exports: [NotificationsService, EmailClientService, SmsClientService],
+})
+export class NotificationsModule {}