@solidstarters/solid-core 1.2.201 → 1.2.202

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solidstarters/solid-core",
-  "version": "1.2.201",
+  "version": "1.2.202",
   "description": "This module is a NestJS module containing all the required core providers required by a Solid application",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/config/cache.options.ts

@@ -3,15 +3,19 @@ import { ConfigModule, ConfigService } from '@nestjs/config';
 import { redisStore } from 'cache-manager-redis-store';
 import { isRedisConfigured } from 'src/helpers/environment.helper';
 
-export const RedisOptions: CacheModuleAsyncOptions = {
+export const CacheManagerOptions: CacheModuleAsyncOptions = {
     isGlobal: true,
     imports: [ConfigModule],
     useFactory: async (configService: ConfigService) => {
+
+        // This defaults to in-memory cache
         if (!isRedisConfigured(configService)) {
             return {
                 ttl: 0
-            } // This defaults to in-memory cache
+            }
         }
+
+        // If redis is configured we use that...
         const store = await createRedisStore(configService);
         return {
             store: () => store,
@@ -28,4 +32,3 @@ async function createRedisStore(configService: ConfigService<Record<string, unkn
         },
     });
 }
-

package/src/config/iam.config.ts

@@ -26,6 +26,7 @@ export const iamConfig = registerAs('iam', () => {
         iamAutoGeneratedPassword:process.env.IAM_AUTOGENERATED_PASSWORD || true,
         passwordPepper: process.env.IAM_PASSWORD_PEPPER || '', // Adding a pepper to the password hashing process for extra security,
         showNameFieldsForRegistration:process.env.IAM_SHOW_NAME_FIELDS_FOR_REGISTRATION === 'true' ? true : false,
+        sendWelcomeEmailOnSignup: (process.env.IAM_SEND_WELCOME_EMAIL_ON_SIGNUP ?? 'false').toLowerCase() === 'true',
+        sendWelcomeSmsOnSignup: (process.env.IAM_SEND_WELCOME_SMS_ON_SIGNUP ?? 'false').toLowerCase() === 'true',
     };
 })
-

package/src/controllers/model-metadata.controller.ts

@@ -5,6 +5,7 @@ import { BasicFilterDto } from '../dtos/basic-filters.dto';
 import { CreateModelMetadataDto } from '../dtos/create-model-metadata.dto';
 import { UpdateModelMetaDataDto } from '../dtos/update-model-metadata.dto';
 import { ModelMetadataService } from '../services/model-metadata.service';
+import { NavigationDto } from 'src/dtos/navigation.dto';
 
 @Controller('model-metadata')
 @ApiTags("Solid Core")
@@ -43,13 +44,31 @@ export class ModelMetadataController {
             offset: 0,
             filters: [],
             groupBy: [],
-            populate: [],   
+            populate: [],
             populateMedia: [],
             sort: []
         }
         return this.modelMetadataService.findMany(basicFilterDto);
     }
 
+    @ApiBearerAuth("jwt")
+    @ApiQuery({ name: 'modelName', required: true, type: String })
+    @ApiQuery({ name: 'recordId', required: true, type: Number })
+    @ApiQuery({ name: 'limit', required: false, type: Number })
+    @ApiQuery({ name: 'offset', required: false, type: Number })
+    @ApiQuery({ name: 'fields', required: false, type: Array })
+    @ApiQuery({ name: 'sort', required: false, type: Array })
+    @ApiQuery({ name: 'groupBy', required: false, type: Array })
+    @ApiQuery({ name: 'populate', required: false, type: Array })
+    @ApiQuery({ name: 'populateMedia', required: false, type: Array })
+    @ApiQuery({ name: 'filters', required: false, type: Array })
+    @Get("/navigation")
+    async navigation(
+        @Query() navigationDto: NavigationDto
+    ) {
+        return this.modelMetadataService.navigation(navigationDto);
+    }
+
     @ApiBearerAuth("jwt")
     @Get(':id')
     findOne(@Param('id', ParseIntPipe) id: number, @Query() query: any) {
@@ -94,4 +113,5 @@ export class ModelMetadataController {
         return this.modelMetadataService.remove(id);
     }
 
+
 }

package/src/controllers/setting.controller.ts

@@ -27,6 +27,26 @@ export class SettingController {
     return this.service.insertMany(createDtos, filesArray, solidRequestContext);
   }
 
+  /**
+   * Important to keep this method just above the @Put(':id') definition that follows as otherwise it will conflict. 
+   * 
+   * @param body 
+   * @param files 
+   * @returns 
+   */
+  @ApiBearerAuth("jwt")
+  @Put('/bulk')
+  @UseInterceptors(AnyFilesInterceptor())
+  async updateSettings(@Body() body: any, @UploadedFiles() files: Array<Express.Multer.File>) {
+    let settings: CreateSettingDto[] = [];
+
+    try {
+      settings = typeof body.settings === 'string' ? JSON.parse(body.settings) : body.settings;
+    } catch (e) {
+      throw new BadRequestException('Invalid settings payload');
+    }
+    return this.service.updateSettings(settings, files);
+  }
 
   @ApiBearerAuth("jwt")
   @Put(':id')
@@ -54,7 +74,6 @@ export class SettingController {
     return this.service.getAllSettings();
   }
 
-
   @ApiBearerAuth("jwt")
   @ApiQuery({ name: 'showHeader', required: false, type: String })
   @ApiQuery({ name: 'inListView', required: false, type: String })
@@ -97,40 +116,17 @@ export class SettingController {
     return this.service.delete(id, solidRequestContext);
   }
 
-  @ApiBearerAuth("jwt")
-  @Post('/bulk-update')
-  @UseInterceptors(AnyFilesInterceptor())
-  async updateSettings(
-    @Body() body: any,
-    @UploadedFiles() files: Array<Express.Multer.File>
-  ) {
-    let settings: CreateSettingDto[] = [];
-
-    try {
-      settings = typeof body.settings === 'string' ? JSON.parse(body.settings) : body.settings;
-    } catch (e) {
-      throw new BadRequestException('Invalid settings payload');
-    }
-    return this.service.updateSettings(settings, files);
-  }
-
-
-  @ApiBearerAuth("jwt")
-  @Post('/bulk/user')
-  @UseInterceptors(AnyFilesInterceptor())
-  async updateUserSettings(
-    @Body() body: any,
-    @UploadedFiles() files: Array<Express.Multer.File>
-  ) {
-    let settings: CreateSettingDto[] = [];
-
-    try {
-      settings = typeof body.settings === 'string' ? JSON.parse(body.settings) : body.settings;
-    } catch (e) {
-      throw new BadRequestException('Invalid settings payload');
-    }
-    return this.service.updateSettings(settings, files);
-  }
-
+  // @ApiBearerAuth("jwt")
+  // @Post('/bulk/user')
+  // @UseInterceptors(AnyFilesInterceptor())
+  // async updateUserSettings(@Body() body: any, @UploadedFiles() files: Array<Express.Multer.File>) {
+  //   let settings: CreateSettingDto[] = [];
+  //   try {
+  //     settings = typeof body.settings === 'string' ? JSON.parse(body.settings) : body.settings;
+  //   } catch (e) {
+  //     throw new BadRequestException('Invalid settings payload');
+  //   }
+  //   return this.service.updateSettings(settings, files);
+  // }
 
 }

package/src/decorators/sms-provider.decorator.ts

@@ -0,0 +1,7 @@
+export const IS_SMS_PROVIDER = 'IS_SMS_PROVIDER';
+
+export const SmsProvider = () => {
+    return (target: Function) => {
+        Reflect.defineMetadata(IS_SMS_PROVIDER, true, target);
+    };
+};

package/src/dtos/navigation.dto.ts

@@ -0,0 +1,14 @@
+import { Type } from "class-transformer";
+import { IsNumber, IsOptional, IsString } from "class-validator";
+import { BasicFilterDto } from "./basic-filters.dto";
+
+export class NavigationDto extends BasicFilterDto {
+  
+  @IsString()
+  modelName: string;
+
+  @Type(() => Number)
+  @IsNumber()
+  @IsOptional()
+  recordId: number;
+}

package/src/dtos/sign-in.dto.ts

@@ -3,19 +3,19 @@ import { IsEmail, IsNotEmpty, IsOptional, IsString, MinLength } from 'class-vali
 
 export class SignInDto {
 
-    @ApiProperty({ default: 'admin@example.service.com' })
+    @ApiProperty({ default: 'sa@solidxai.com' })
     @IsEmail()
     // @IsNotEmpty()
     @IsOptional()
     email: string;
     
-    @ApiProperty({ default: 'admin@example.service.com' })
+    @ApiProperty({ default: 'sa' })
     @IsString()
     // @IsNotEmpty()
     @IsOptional()
     username: string;
 
-    @ApiProperty({ default: 'Admin@3214$' })
+    @ApiProperty({ default: '' })
     @IsOptional()
     password: string;
 }

package/src/entities/common.entity.ts

@@ -1,6 +1,6 @@
-import { Column, CreateDateColumn, DeleteDateColumn, Index, ManyToOne, PrimaryGeneratedColumn, UpdateDateColumn } from "typeorm";
-import type { User } from "./user.entity";
-import { Exclude, Expose, Type } from "class-transformer";
+import { Column, CreateDateColumn, DeleteDateColumn, Index, PrimaryGeneratedColumn, UpdateDateColumn } from "typeorm";
+import { Exclude, Expose } from "class-transformer";
+import { LocalDateTimeTransformer } from "src/transformers/typeorm/local-date-time-transformer";
 
 @Exclude()
 export abstract class CommonEntity {
@@ -8,13 +8,13 @@ export abstract class CommonEntity {
     @PrimaryGeneratedColumn({ type: 'integer' })
     id: number
 
-    @CreateDateColumn({ name: "created_at" })
+    @CreateDateColumn({ name: "created_at", transformer: LocalDateTimeTransformer })
     createdAt: Date;
 
-    @UpdateDateColumn({ name: "updated_at" })
+    @UpdateDateColumn({ name: "updated_at", transformer: LocalDateTimeTransformer })
     updatedAt: Date;
 
-    @DeleteDateColumn({ name: "deleted_at" })
+    @DeleteDateColumn({ name: "deleted_at", transformer: LocalDateTimeTransformer })
     @Index()
     deletedAt: Date;
 
@@ -22,7 +22,7 @@ export abstract class CommonEntity {
     deletedTracker: string;
 
     @Expose()
-    @Column({ name: 'published_at', default: null, nullable: true })
+    @Column({ name: 'published_at', default: null, nullable: true, transformer: LocalDateTimeTransformer })
     publishedAt: Date;
 
     @Expose()

package/src/entities/field-metadata.entity.ts

@@ -159,7 +159,7 @@ export class FieldMetadata extends CommonEntity {
     relationJoinTableName: string;
 
     @Column({ name: 'enable_audit_tracking', default: false })
-    enableAuditTracking: boolean;
+    enableAuditTracking: boolean = false;
 
     @Column({ name: "is_multiSelect", default: false })
     isMultiSelect: boolean;

package/src/entities/legacy-common.entity.ts

@@ -1,6 +1,7 @@
 import { Exclude, Expose, Type } from "class-transformer";
 import { Column, CreateDateColumn, DeleteDateColumn, Index, JoinColumn, ManyToOne, UpdateDateColumn } from "typeorm";
 import type { User } from "./user.entity";
+import { LocalDateTimeTransformer } from "src/transformers/typeorm/local-date-time-transformer";
 
 export const LEGACY_TABLE_FIELDS_PREFIX = 'ss';
 
@@ -11,13 +12,13 @@ export abstract class LegacyCommonEntity {
     // @Generated("increment")
     // id: number
 
-    @CreateDateColumn({ name: `${LEGACY_TABLE_FIELDS_PREFIX}_created_at` })
+    @CreateDateColumn({ name: `${LEGACY_TABLE_FIELDS_PREFIX}_created_at`, transformer: LocalDateTimeTransformer })
     createdAt: Date;
 
-    @UpdateDateColumn({ name: `${LEGACY_TABLE_FIELDS_PREFIX}_updated_at` })
+    @UpdateDateColumn({ name: `${LEGACY_TABLE_FIELDS_PREFIX}_updated_at`, transformer: LocalDateTimeTransformer })
     updatedAt: Date;
 
-    @DeleteDateColumn({ name: `${LEGACY_TABLE_FIELDS_PREFIX}_deleted_at` })
+    @DeleteDateColumn({ name: `${LEGACY_TABLE_FIELDS_PREFIX}_deleted_at`, transformer: LocalDateTimeTransformer })
     @Index()
     deletedAt: Date;
 
@@ -25,7 +26,7 @@ export abstract class LegacyCommonEntity {
     deletedTracker: string;
 
     @Expose()
-    @Column({ name: `${LEGACY_TABLE_FIELDS_PREFIX}_published_at`, default: null ,nullable: true})
+    @Column({ name: `${LEGACY_TABLE_FIELDS_PREFIX}_published_at`, default: null, nullable: true, transformer: LocalDateTimeTransformer })
     publishedAt: Date;
 
     @Expose()
@@ -51,7 +52,7 @@ export abstract class LegacyCommonEntity {
     @Expose()
     @Column({ name: `${LEGACY_TABLE_FIELDS_PREFIX}_created_by_id`, nullable: true })
     createdBy: number;
-    
+
     @Expose()
     @Column({ name: `${LEGACY_TABLE_FIELDS_PREFIX}_updated_by_id`, nullable: true })
     updatedBy: number;

package/src/entities/model-metadata.entity.ts

@@ -34,7 +34,7 @@ export class ModelMetadata extends CommonEntity {
     enableSoftDelete: boolean;
 
     @Column({ name: "enable_audit_tracking", default: false })
-    enableAuditTracking: boolean;
+    enableAuditTracking: boolean = false;
 
     @Column({ name: "internationalisation", default: false })
     internationalisation: boolean;

package/src/factories/mail.factory.ts

@@ -20,7 +20,6 @@ export class MailFactory {
         private readonly commonConfiguration: ConfigType<typeof commonConfig>,
     ) { }
 
-
     getMailService(): IMail {
         const mailServiceName = this.commonConfiguration.emailProvider;
         const mailProviders = this.solidRegistry.getMailProviders();

package/src/factories/sms.factory.ts

@@ -0,0 +1,43 @@
+import { Inject, Injectable, Logger } from "@nestjs/common";
+import { ConfigType } from "@nestjs/config";
+import { ModuleRef } from "@nestjs/core";
+import commonConfig from "src/config/common.config";
+import { SolidRegistry } from "src/helpers/solid-registry";
+import { ISMS } from "src/interfaces";
+
+function norm(s?: string) {
+    return s?.trim().toLowerCase();
+}
+
+// This factory will be use to return a mail service instance, using the configured environment variables
+@Injectable()
+export class SmsFactory {
+    private readonly logger = new Logger(this.constructor.name);
+
+    constructor(
+        private readonly moduleRef: ModuleRef,
+        private readonly solidRegistry: SolidRegistry,
+        @Inject(commonConfig.KEY)
+        private readonly commonConfiguration: ConfigType<typeof commonConfig>,
+    ) { }
+
+    getSmsService(name: string = null): ISMS {
+        // This is the default provider
+        const smsServiceName = name || this.commonConfiguration.smsProvider;
+        if (!smsServiceName) {
+            throw new Error("Unable to resolve sms provider")
+        }
+        const smsProviders = this.solidRegistry.getSmsProviders();
+
+        // Return the instance which matches the smsServicename
+        if (!smsProviders.length) {
+            // throw new Error("No mail providers are registered.");
+            this.logger.error("No sms providers are registered.");
+        }
+
+        const smsServiceProvider = smsProviders.find(provider => provider.name === smsServiceName);
+
+        return smsServiceProvider.instance as ISMS;
+    }
+
+}

package/src/helpers/date.helper.ts

@@ -1,34 +1,63 @@
 import dayjs from 'dayjs';
 import customParseFormat from 'dayjs/plugin/customParseFormat';
+
 dayjs.extend(customParseFormat);
 
 export function parseFlexibleDate(value: any): Date | null {
   if (!value) return null;
+
+  // Already a valid Date (ExcelJS often gives this)
   if (value instanceof Date && !isNaN(value.getTime())) {
     return value;
   }
+
+  // Excel serial number
   if (typeof value === 'number') {
     const excelEpoch = new Date(Date.UTC(1899, 11, 30));
     const d = new Date(excelEpoch.getTime() + value * 86400000);
     return isNaN(d.getTime()) ? null : d;
   }
-  const str = value.toString().trim();
+
+  let str = value.toString().trim();
+
+  // STRIP "(British Summer Time)" or any "(...)" suffix
+  str = str.replace(/\s*\(.*\)$/, '');
+
   const formats = [
+    // strict business formats
     'DD-MM-YYYY',
+
+    // common alternates
     'YYYY-MM-DD',
     'DD/MM/YYYY',
     'MM/DD/YYYY',
     'D-M-YYYY',
     'YYYY/MM/DD',
+
+    // JS Date.toString() (without timezone name)
+    // (handle single-digit day + different offset shapes)
+    'ddd MMM D YYYY HH:mm:ss [GMT]ZZ', // GMT+0100
+    'ddd MMM DD YYYY HH:mm:ss [GMT]ZZ',
+    'ddd MMM D YYYY HH:mm:ss [GMT]Z',  // GMT+01:00
+    'ddd MMM DD YYYY HH:mm:ss [GMT]Z',
+
+    // ISO variants
     'YYYY-MM-DD HH:mm:ss',
-    'YYYY-MM-DDTHH:mm:ss',       // ISO without Z
-    'YYYY-MM-DDTHH:mm:ss.SSS',   // ISO with millis
-    'YYYY-MM-DDTHH:mm:ssZ',      // ISO with timezone
+    'YYYY-MM-DDTHH:mm:ss',
+    'YYYY-MM-DDTHH:mm:ss.SSS',
+    'YYYY-MM-DDTHH:mm:ssZ',
   ];
-  const parsed = dayjs(str, formats, true); // true = strict parsing
-  if (!parsed.isValid()) {
-    return null;
+
+  const parsed = dayjs(str, formats, true); // strict
+  if (parsed.isValid()) {
+    return parsed.toDate();
+  }
+
+  // Fallback: native Date can parse this JS format very reliably
+  const native = new Date(str);
+  if (!isNaN(native.getTime())) {
+    return native;
   }
-  return parsed.toDate();
-}
 
+  return null;
+}

package/src/helpers/solid-registry.ts

@@ -81,6 +81,7 @@ export class SolidRegistry {
   private dashboardQuestionDataProviders: Set<InstanceWrapper> = new Set();
   private mailProviders: Set<InstanceWrapper> = new Set();
   private whatsappProviders: Set<InstanceWrapper> = new Set();
+  private smsProviders: Set<InstanceWrapper> = new Set();
   private securityRuleConfigProviders: Set<InstanceWrapper> = new Set();
   private errorCodeProviders: Set<InstanceWrapper> = new Set();
 
@@ -92,6 +93,10 @@ export class SolidRegistry {
     this.whatsappProviders.add(whatsappProvider);
   }
 
+  registerSmsProvider(smsProvider: InstanceWrapper): void {
+    this.smsProviders.add(smsProvider);
+  }
+
   registerSecurityRuleConfigProvider(securityRuleConfigProvider: InstanceWrapper): void {
     this.securityRuleConfigProviders.add(securityRuleConfigProvider);
   }
@@ -148,6 +153,10 @@ export class SolidRegistry {
     return Array.from(this.whatsappProviders);
   }
 
+  getSmsProviders(): Array<InstanceWrapper> {
+    return Array.from(this.smsProviders);
+  }
+
   getSecurityRuleConfigProviders(): Array<InstanceWrapper> {
     return Array.from(this.securityRuleConfigProviders);
   }

package/src/index.ts

@@ -24,6 +24,7 @@ export * from './decorators/solid-database-module.decorator'
 export * from './decorators/solid-service.decorator'
 export * from './decorators/mail-provider.decorator'
 export * from './decorators/security-rule-config-provider.decorator'
+export * from './decorators/sms-provider.decorator'
 
 export * from './dtos/post-chatter-message.dto'
 export * from './dtos/security-rule-config.dto'
@@ -194,12 +195,12 @@ export * from './jobs/api-email-subscriber.service'
 export { SmtpEmailQueuePublisherRabbitmq, SmtpEmailQueuePublisherRabbitmq as EmailQueuePublisher } from './jobs/smtp-email-publisher.service' // alias for backward compatibility
 export * from './jobs/smtp-email-queue-options'
 export { SmtpEmailQueueSubscriberRabbitmq, SmtpEmailQueueSubscriberRabbitmq as EmailQueueSubscriber } from './jobs/smtp-email-subscriber.service' // alias for backward compatibility
-export * from './jobs/otp-publisher.service'
-export * from './jobs/otp-queue-options'
-export * from './jobs/otp-subscriber.service'
-export * from './jobs/sms-publisher.service'
-export * from './jobs/sms-queue-options'
-export * from './jobs/sms-subscriber.service'
+export * from './jobs/msg91-otp-publisher.service'
+export * from './jobs/msg91-otp-queue-options'
+export * from './jobs/msg91-otp-subscriber.service'
+export * from './jobs/msg91-sms-publisher.service'
+export * from './jobs/msg91-sms-queue-options'
+export * from './jobs/msg91-sms-subscriber.service'
 export * from './jobs/msg91-whatsapp-publisher.service'
 export * from './jobs/msg91-whatsapp-queue-options'
 export * from './jobs/msg91-whatsapp-subscriber.service'
@@ -281,6 +282,8 @@ export * from './services/ai-interaction.service'
 
 // Factories
 export * from './factories/mail.factory'
+export * from './factories/sms.factory'
+export * from './factories/whatsapp.factory'
 
 // Repositories
 export * from './repository/solid-base.repository'

package/src/jobs/database/{sms-publisher-database.service.ts → msg91-sms-publisher-database.service.ts}

@@ -1,13 +1,13 @@
 import { Injectable } from '@nestjs/common';
 
-import smsQueueOptions from './sms-queue-database-options';
+import smsQueueOptions from './msg91-sms-queue-database-options';
 import { MqMessageQueueService } from 'src/services/mq-message-queue.service';
 import { MqMessageService } from 'src/services/mq-message.service';
 import { QueuesModuleOptions } from 'src/interfaces';
 import { DatabasePublisher } from 'src/services/queues/database-publisher.service';
 
 @Injectable()
-export class SmsQueuePublisherDatabase extends DatabasePublisher<any> {
+export class Msg91SmsQueuePublisherDatabase extends DatabasePublisher<any> {
     constructor(
         protected readonly mqMessageService: MqMessageService,
         protected readonly mqMessageQueueService: MqMessageQueueService,

package/src/jobs/database/{sms-subscriber-database.service.ts → msg91-sms-subscriber-database.service.ts}

@@ -1,18 +1,20 @@
 import { Injectable } from '@nestjs/common';
 
 import { QueueMessage } from 'src/interfaces/mq';
-import smsQueueOptions from './sms-queue-database-options';
+import smsQueueOptions from './msg91-sms-queue-database-options';
 import { MqMessageService } from 'src/services/mq-message.service';
 import { MqMessageQueueService } from 'src/services/mq-message-queue.service';
 import { Msg91SMSService } from 'src/services/sms/Msg91SMSService';
 import { QueuesModuleOptions } from 'src/interfaces';
 import { DatabaseSubscriber } from 'src/services/queues/database-subscriber.service';
 import { PollerService } from 'src/services/poller.service';
+import { SmsFactory } from 'src/factories/sms.factory';
 
 @Injectable()
-export class SmsQueueSubscriberDatabase extends DatabaseSubscriber<any> {
+export class Msg91SmsQueueSubscriberDatabase extends DatabaseSubscriber<any> {
     constructor(
-        private readonly smsService: Msg91SMSService,
+        // private readonly smsService: Msg91SMSService,
+        private readonly smsFactory: SmsFactory,
         readonly mqMessageService: MqMessageService,
         readonly mqMessageQueueService: MqMessageQueueService,
         readonly poller: PollerService,
@@ -27,6 +29,9 @@ export class SmsQueueSubscriberDatabase extends DatabaseSubscriber<any> {
     }
 
     subscribe(message: QueueMessage<any>) {
-        return this.smsService.sendSMSSynchronously(message);
+        const smsService: Msg91SMSService = this.smsFactory.getSmsService(Msg91SMSService.name) as Msg91SMSService;
+        return smsService.sendSMSSynchronously(message);
+
+        // return this.smsService.sendSMSSynchronously(message);
     }
 }

package/src/jobs/database/otp-subscriber-database.service.ts

@@ -8,11 +8,14 @@ import { DatabaseSubscriber } from 'src/services/queues/database-subscriber.serv
 import { Msg91OTPService } from 'src/services/sms/Msg91OTPService';
 import { QueuesModuleOptions } from 'src/interfaces';
 import { PollerService } from 'src/services/poller.service';
+import { SmsFactory } from 'src/factories/sms.factory';
 
 @Injectable()
 export class OTPQueueSubscriberDatabase extends DatabaseSubscriber<any> {
     constructor(
-        private readonly otpService: Msg91OTPService,
+        // private readonly otpService: Msg91OTPService,
+        private readonly smsFactory: SmsFactory,
+
         readonly mqMessageService: MqMessageService,
         readonly poller: PollerService,
         readonly mqMessageQueueService: MqMessageQueueService,
@@ -27,6 +30,9 @@ export class OTPQueueSubscriberDatabase extends DatabaseSubscriber<any> {
     }
 
     subscribe(message: QueueMessage<any>) {
-        this.otpService.sendSMSSynchronously(message);
+        const otpService: Msg91OTPService = this.smsFactory.getSmsService(Msg91OTPService.name) as Msg91OTPService;
+        return otpService.sendSMSSynchronously(message);
+
+        // this.otpService.sendSMSSynchronously(message);
     }
 }

package/src/jobs/database/twilio-sms-subscriber-database.service.ts

@@ -8,11 +8,13 @@ import { QueuesModuleOptions } from 'src/interfaces';
 import { DatabaseSubscriber } from 'src/services/queues/database-subscriber.service';
 import { TwilioSMSService } from 'src/services/sms/TwilioSMSService';
 import { PollerService } from 'src/services/poller.service';
+import { SmsFactory } from 'src/factories/sms.factory';
 
 @Injectable()
 export class TwilioSmsQueueSubscriberDatabase extends DatabaseSubscriber<any> {
     constructor(
-        private readonly smsService: TwilioSMSService,
+        // private readonly smsService: TwilioSMSService,
+        private readonly smsFactory: SmsFactory,
         readonly mqMessageService: MqMessageService,
         readonly mqMessageQueueService: MqMessageQueueService,
         readonly poller: PollerService,
@@ -27,6 +29,7 @@ export class TwilioSmsQueueSubscriberDatabase extends DatabaseSubscriber<any> {
     }
 
     subscribe(message: QueueMessage<any>) {
-        return this.smsService.sendSMSSynchronously(message);
+        const smsService: TwilioSMSService = this.smsFactory.getSmsService(TwilioSMSService.name) as TwilioSMSService;
+        return smsService.sendSMSSynchronously(message);
     }
 }

package/src/jobs/{otp-publisher.service.ts → msg91-otp-publisher.service.ts}

@@ -1,13 +1,13 @@
 import { Injectable } from '@nestjs/common';
 
 import { RabbitMqPublisher } from 'src/services/queues/rabbitmq-publisher.service';
-import otpQueueOptions from './otp-queue-options';
+import otpQueueOptions from './msg91-otp-queue-options';
 import { MqMessageQueueService } from 'src/services/mq-message-queue.service';
 import { MqMessageService } from 'src/services/mq-message.service';
 import { QueuesModuleOptions } from "../interfaces";
 
 @Injectable()
-export class OTPQueuePublisher extends RabbitMqPublisher<any> {
+export class Msg91OTPQueuePublisher extends RabbitMqPublisher<any> {
     constructor(
         protected readonly mqMessageService: MqMessageService,
         protected readonly mqMessageQueueService: MqMessageQueueService,