fix: correct the enum postiion and add validation

Author: sourcecode71

src/config/notification.config.ts

@@ -11,3 +11,15 @@ export const AppNotificationConfig = {
     (process.env.NOTIFY_CHANNEL as NotificationChannel) ||
     NotificationChannel.AWS,
 };
+
+export enum NotificationType {
+  ADMISSION_ID = 'admission-id',
+  EMAIL_VERIFICATION = 'email-verification',
+  FORM_PAYMENT = 'form-payment',
+  ADMISSION_REFERENCE = 'admission-reference',
+  REGISTRATION_DATE = 'registration-date',
+  REGISTRATION_COMPLETED = 'registration-completed',
+  PAYMENT_REMINDER = 'payment-reminder',
+  ATTENDANCE_ABSENCE = 'attendance-absence',
+  COURSE_WITHDRAWAL_OTP = 'course-withdrawal-otp',
+}

src/notification/application/use-cases/send-notification.use-case.ts

@@ -5,7 +5,7 @@ import { NotificationFactory } from '../../infrastructure/factories/notification
 import { NotificationChannel } from '../../../config/notification.config';
 import { NotificationRepository } from '../../infrastructure/repositories/notification.repository';
 import { NotificationValidator } from '../validators/notification.validator';
-import { NotificationType } from '../../presentation/dtos/send-notification.dto';
+import { NotificationType } from '../../../config/notification.config';
 
 @Injectable()
 export class SendNotificationUseCase {

src/notification/application/validators/notification.validator.ts

@@ -1,9 +1,7 @@
 import * as Joi from 'joi';
 import { NotificationChannel } from '../../../config/notification.config';
-import {
-  SendNotificationDto,
-  NotificationType,
-} from '../../presentation/dtos/send-notification.dto';
+import { SendNotificationDto } from '../../presentation/dtos/send-notification.dto';
+import { NotificationType } from '../../../config/notification.config';
 
 export class NotificationValidator {
   static createNotificationSchema = Joi.object<SendNotificationDto>({

src/notification/infrastructure/persistence/mongoose/notification.schema.ts

@@ -1,22 +1,97 @@
-import { Schema, Prop, SchemaFactory } from '@nestjs/mongoose';
+import { Prop, Schema, SchemaFactory } from '@nestjs/mongoose';
 import { Document } from 'mongoose';
+import * as Joi from 'joi';
+import { NotificationChannel } from '../../../../config/notification.config';
+import { NotificationType } from '../../../../config/notification.config';
+
+export type NotificationDocument = Notification & Document;
 
 @Schema({ timestamps: true })
-export class NotificationDocument extends Document {
-  @Prop({ required: true, minlength: 1, maxlength: 100 })
+export class Notification {
+  @Prop({ required: true })
   recipient: string;
 
-  @Prop({ required: true, minlength: 1, maxlength: 100 })
+  @Prop({ required: true })
   subject: string;
 
-  @Prop({ required: true, minlength: 1, maxlength: 1000 })
+  @Prop({ required: true })
   body: string;
 
-  @Prop({ required: true })
-  mediaType: string;
+  @Prop({ required: true, enum: NotificationChannel })
+  mediaType: NotificationChannel;
 
-  @Prop()
-  sentAt?: Date;
+  @Prop({ required: true, enum: NotificationType })
+  notificationType: NotificationType;
+
+  @Prop({ default: Date.now })
+  sentAt: Date;
 }
-export const NotificationSchema =
-  SchemaFactory.createForClass(NotificationDocument);
+
+export const NotificationSchema = SchemaFactory.createForClass(Notification);
+
+const NotificationJoiSchema = Joi.object({
+  recipient: Joi.string().required().messages({
+    'string.empty': 'Recipient is required',
+  }),
+  subject: Joi.string().min(3).max(100).required().messages({
+    'string.min': 'Subject must be at least 3 characters',
+    'string.max': 'Subject must not exceed 100 characters',
+    'string.empty': 'Subject is required',
+  }),
+  body: Joi.string().min(10).max(1000).required().messages({
+    'string.min': 'Body must be at least 10 characters',
+    'string.max': 'Body must not exceed 1000 characters',
+    'string.empty': 'Body is required',
+  }),
+  mediaType: Joi.string()
+    .valid(...Object.values(NotificationChannel))
+    .required()
+    .messages({
+      'any.only': 'Invalid mediaType, must be one of: EMAIL, SMS',
+      'string.empty': 'mediaType is required',
+    }),
+  notificationType: Joi.string()
+    .valid(...Object.values(NotificationType))
+    .required()
+    .messages({
+      'any.only': 'Invalid notificationType',
+      'string.empty': 'notificationType is required',
+    }),
+  sentAt: Joi.date().default(Date.now),
+}).custom(
+  (value: { recipient: string; mediaType: NotificationChannel }, helpers) => {
+    if (
+      value.mediaType === NotificationChannel.EMAIL &&
+      !Joi.string().email().validate(value.recipient).value
+    ) {
+      return helpers.message({
+        custom: 'Recipient must be a valid email for EMAIL channel',
+      });
+    }
+    if (
+      value.mediaType === NotificationChannel.SMS &&
+      !Joi.string()
+        .pattern(/^\+?[1-9]\d{1,14}$/)
+        .validate(value.recipient).value
+    ) {
+      return helpers.message({
+        custom: 'Recipient must be a valid phone number for SMS channel',
+      });
+    }
+    return value;
+  },
+);
+
+NotificationSchema.pre('save', function (next) {
+  const { error } = NotificationJoiSchema.validate(this.toObject(), {
+    abortEarly: false,
+  });
+  if (error) {
+    return next(
+      new Error(
+        'Validation failed: ' + error.details.map((d) => d.message).join(', '),
+      ),
+    );
+  }
+  next();
+});

src/notification/presentation/dtos/send-notification.dto.ts

@@ -1,18 +1,7 @@
 import { ApiProperty } from '@nestjs/swagger';
 import * as Joi from 'joi';
 import { NotificationChannel } from '../../../config/notification.config';
-
-export enum NotificationType {
-  ADMISSION_ID = 'admission-id',
-  EMAIL_VERIFICATION = 'email-verification',
-  FORM_PAYMENT = 'form-payment',
-  ADMISSION_REFERENCE = 'admission-reference',
-  REGISTRATION_DATE = 'registration-date',
-  REGISTRATION_COMPLETED = 'registration-completed',
-  PAYMENT_REMINDER = 'payment-reminder',
-  ATTENDANCE_ABSENCE = 'attendance-absence',
-  COURSE_WITHDRAWAL_OTP = 'course-withdrawal-otp',
-}
+import { NotificationType } from '../../../config/notification.config';
 
 export class SendNotificationDto {
   @ApiProperty({