Update booking summary page layout and update notification service

apps/edr-passenger-api/src/modules/notifications/dtos/email.dto.ts

@@ -1,8 +1,57 @@
+import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger';
+import { IsEmail, IsNotEmpty, IsOptional, IsString } from 'class-validator';
+
 export class SendEmail {
+  @ApiProperty()
+  @IsEmail()
+  @IsNotEmpty()
   to: string;
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsString()
+  sourceId?: string;
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsString()
+  sourceName?: string;
+
+  @ApiProperty()
+  @IsNotEmpty()
+  @IsString()
   subject: string;
-  body: string;
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsString()
   html?: string;
-  templateKey?: string;
-  context?: Record<string, unknown>;
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsString()
+  text?: string;
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  body?: string;
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  context?: Record<string, any>;
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsString()
+  templateName?: string;
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsEmail()
+  from?: string;
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsEmail()
+  replyTo?: string;
 }

apps/edr-passenger-api/src/modules/notifications/dtos/sms.dto.ts

@@ -1,9 +1,28 @@
+import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger';
+import { IsArray, IsNotEmpty, IsOptional, IsString, ValidateNested } from 'class-validator';
+import { Type } from 'class-transformer';
+
 export class SendMessage {
+  @ApiProperty()
+  @IsNotEmpty()
+  @IsString()
   to: string;
+
+  @ApiProperty()
+  @IsNotEmpty()
+  @IsString()
   message: string;
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsString()
   from?: string;
 }
 
 export class BulkMessagesDto {
+  @ApiProperty({ type: [SendMessage] })
+  @IsArray()
+  @ValidateNested({ each: true })
+  @Type(() => SendMessage)
   messages: SendMessage[];
 }

apps/edr-passenger-api/src/modules/notifications/notifications.controller.ts

@@ -7,7 +7,7 @@ import { TestNotificationDto } from './notifications.dto';
 import { EmailClientService } from './email-client.service';
 import { SmsClientService } from './sms-client.service';
 import { SendEmail } from './dtos/email.dto';
-import { SendMessage } from './dtos/sms.dto';
+import { BulkMessagesDto, SendMessage } from './dtos/sms.dto';
 
 @ApiTags('Notifications')
 @Controller('notifications')
@@ -56,6 +56,15 @@ export class NotificationsController {
     return this.smsClient.sendSms(dto);
   }
 
+  @Post('send/sms/bulk')
+  @UseGuards(IamGuard)
+  @IamRoles('ADMIN', 'STAFF')
+  @ApiOperation({ summary: 'Send bulk SMS messages via the SMS microservice' })
+  @ApiBody({ type: BulkMessagesDto })
+  sendBulkSms(@Body() dto: BulkMessagesDto) {
+    return this.smsClient.sendBulkMessages(dto);
+  }
+
   @Post('test')
   @UseGuards(IamGuard)
   @IamRoles('ADMIN', 'STAFF')

apps/edr-passenger-api/src/modules/notifications/notifications.module.ts

@@ -1,6 +1,5 @@
 import { Module } from '@nestjs/common';
 import { HttpModule } from '@nestjs/axios';
-import { ConfigModule, ConfigService } from '@nestjs/config';
 import { ClientsModule, Transport } from '@nestjs/microservices';
 import { NotificationsController } from './notifications.controller';
 import { NotificationsService } from './notifications.service';
@@ -11,34 +10,33 @@ import { SmsClientService } from './sms-client.service';
 @Module({
   imports: [
     HttpModule.register({ timeout: 10_000 }),
-    ClientsModule.registerAsync([
-      {
-        name: 'EMAIL_SERVICE',
-        imports: [ConfigModule],
-        inject: [ConfigService],
-        useFactory: (config: ConfigService) => ({
-          transport: Transport.RMQ,
-          options: {
-            urls: [config.get<string>('RABBITMQ_URL') ?? 'amqp://localhost:5672'],
-            queue: config.get<string>('EMAIL_QUEUE') ?? 'email_queue',
-            queueOptions: { durable: true },
-            noAck: true,
-          },
-        }),
-      },
+    ClientsModule.register([
       {
         name: 'SMS_SERVICE',
-        imports: [ConfigModule],
-        inject: [ConfigService],
-        useFactory: (config: ConfigService) => ({
-          transport: Transport.RMQ,
-          options: {
-            urls: [config.get<string>('RABBITMQ_URL') ?? 'amqp://localhost:5672'],
-            queue: config.get<string>('SMS_QUEUE') ?? 'sms_queue',
-            queueOptions: { durable: true },
-            noAck: true,
-          },
-        }),
+        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',
+          queueOptions: { durable: true },
+        },
+      },
+      {
+        name: 'NOTIFICATION_SERVICE',
+        transport: Transport.RMQ,
+        options: {
+          urls: [process.env.RABBITMQ_URL as string],
+          queue: 'notification_queue',
+          queueOptions: { durable: true },
+        },
       },
     ]),
   ],

apps/edr-passenger-api/src/modules/notifications/notifications.service.ts

@@ -20,7 +20,7 @@ export class NotificationsService {
     private pushAdapter: PushAdapter,
   ) {
     this.channels = new Map<NotificationChannelType, NotificationChannel>([
-      ['EMAIL', { send: (to, subject, body) => this.emailClient.sendEmail({ to, subject, body }).then(() => true) }],
+      ['EMAIL', { send: (to, subject, body) => this.emailClient.sendEmail({ to, subject, text: body }).then(() => true) }],
       ['SMS', { send: (to, _subject, body) => this.smsClient.sendSms({ to, message: body }).then(() => true) }],
       ['PUSH', this.pushAdapter as NotificationChannel],
     ]);
@@ -107,7 +107,7 @@ export class NotificationsService {
       await this.emailClient.sendEmail({
         to: passenger.user.email,
         subject: this.sanitize(dto.title),
-        body: this.sanitize(dto.body),
+        text: this.sanitize(dto.body),
       });
     }
 

apps/edr-passenger-api/src/modules/notifications/sms-client.service.ts

@@ -1,4 +1,9 @@
-import { Inject, Injectable, Logger, OnApplicationBootstrap } from '@nestjs/common';
+import {
+  Inject,
+  Injectable,
+  Logger,
+  OnApplicationBootstrap,
+} from '@nestjs/common';
 import { ClientProxy } from '@nestjs/microservices';
 import { BulkMessagesDto, SendMessage } from './dtos/sms.dto';
 
@@ -8,14 +13,18 @@ export class SmsClientService implements OnApplicationBootstrap {
 
   constructor(
     @Inject('SMS_SERVICE')
-    private readonly smsClient: ClientProxy,
+    private smsClient: ClientProxy,
   ) {}
 
   async onApplicationBootstrap() {
     this.smsClient
       .connect()
-      .then(() => this.logger.log('Connected to SMS service'))
-      .catch((err) => this.logger.error('Error connecting to SMS service', err));
+      .then(() => {
+        this.logger.log('connected to SMS service');
+      })
+      .catch((err) => {
+        console.error('Error happened at SMS service', err);
+      });
   }
 
   async sendSms(dto: SendMessage) {