@solidstarters/solid-core 1.2.156 → 1.2.157

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solidstarters/solid-core",
-  "version": "1.2.156",
+  "version": "1.2.157",
   "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/common.config.ts

@@ -3,6 +3,7 @@ import { registerAs } from '@nestjs/config';
 export default registerAs('common', () => {
     return {
         emailProvider: process.env.COMMON_EMAIL_PROVIDER ?? "SMTPEMailService",
+        whatsappProvider: process.env.COMMON_WHATSAPP_PROVIDER,
         emailTemplateSeederFiles: process.env.COMMON_EMAIL_TEMPLATE_SEEDER_FILES,
         smsProvider: process.env.COMMON_SMS_PROVIDER,
         smsTemplateSeederFiles: process.env.COMMON_SMS_TEMPLATE_SEEDER_FILES,

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

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

package/src/factories/whatsapp.factory.ts

@@ -0,0 +1,41 @@
+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 { IWhatsAppTransport } 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 WhatsAppFactory {
+    private readonly logger = new Logger(this.constructor.name);
+    constructor(
+        private readonly moduleRef: ModuleRef, // Use the module ref to dynamically resolve the mail service
+        private readonly solidRegistry: SolidRegistry,
+        @Inject(commonConfig.KEY)
+        private readonly commonConfiguration: ConfigType<typeof commonConfig>,
+    ) { }
+
+    getWhatsappService(name: string = null): IWhatsAppTransport {
+        // This is the default provider
+        const whatsappServiceName = this.commonConfiguration.whatsappProvider || name;
+        if (!whatsappServiceName) {
+            throw new Error("Unable to resolve whatsapp provider")
+        }
+        const whatsappProviders = this.solidRegistry.getWhatsappProviders();
+        // Return the instance which matches the whatsappServiceName
+        if (!whatsappProviders.length) {
+            // throw new Error("No mail providers are registered.");
+            this.logger.error("No whatsapp providers are registered.");
+        }
+
+        const whatsappServiceProvider = whatsappProviders.find(provider => provider.name === whatsappServiceName);
+
+        return whatsappServiceProvider.instance as IWhatsAppTransport;
+    }
+
+}

package/src/helpers/solid-registry.ts

@@ -66,6 +66,11 @@ export class SolidRegistry {
   private dashboardVariableSelectionProviders: Set<InstanceWrapper> = new Set();
   private dashboardQuestionDataProviders: Set<InstanceWrapper> = new Set();
   private mailProviders: Set<InstanceWrapper> = new Set();
+  private whatsappProviders: Set<InstanceWrapper> = new Set();
+
+  registerWhatsappProvider(whatsappProvider: InstanceWrapper): void {
+    this.whatsappProviders.add(whatsappProvider);
+  }
 
   registerMailProvider(mailProvider: InstanceWrapper): void {
     this.mailProviders.add(mailProvider);
@@ -115,6 +120,10 @@ export class SolidRegistry {
     return Array.from(this.mailProviders);
   }
 
+  getWhatsappProviders(): Array<InstanceWrapper> {
+    return Array.from(this.whatsappProviders);
+  }
+
   getSeeders(): Array<InstanceWrapper> {
     return Array.from(this.seeders);
   }

package/src/index.ts

@@ -193,9 +193,9 @@ 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/whatsapp-publisher.service'
-export * from './jobs/whatsapp-queue-options'
-export * from './jobs/whatsapp-subscriber.service'
+export * from './jobs/msg91-whatsapp-publisher.service'
+export * from './jobs/msg91-whatsapp-queue-options'
+export * from './jobs/msg91-whatsapp-subscriber.service'
 
 export * from './listeners/user-registration.listener'
 

package/src/interfaces.ts

@@ -134,7 +134,7 @@ export interface IEntityComputedFieldProvider {
   name(): string;
 }
 
-export interface IEntityPreComputeFieldProvider<TTriggerEntity, TContext, TValue=void> extends IEntityComputedFieldProvider {
+export interface IEntityPreComputeFieldProvider<TTriggerEntity, TContext, TValue = void> extends IEntityComputedFieldProvider {
   preComputeValue(triggerEntity: TTriggerEntity, computedFieldMetadata: ComputedFieldMetadata<TContext>): Promise<TValue>;
 }
 
@@ -159,7 +159,7 @@ export class EventDetails<T> {
   ) { }
 }
 
-export interface IMail<TResponse=unknown> {
+export interface IMail<TResponse = unknown> {
   sendEmail(
     to: string,
     subject: string,
@@ -200,6 +200,16 @@ export interface ISMS {
   ): Promise<any>;
 }
 
+export interface IWhatsAppTransport {
+  sendWhatsAppMessage(
+    to: string,
+    templateId: string,
+    parameters: any,
+    parentEntity?: any,
+    parentEntityId?: any
+  ): Promise<any>;
+}
+
 export interface MailAttachmentWrapper {
   relativePath?: string;
   attachment?: MailAttachment;

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

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

package/src/jobs/database/{whatsapp-queue-options-database.ts → msg91-whatsapp-queue-options-database.ts}

@@ -1,6 +1,6 @@
 import { BrokerType } from "src/interfaces";
 
-const WHATSAPP_QUEUE_NAME = 'whatsapp_queue_database';
+const WHATSAPP_QUEUE_NAME = 'msg91_whatsapp_queue_database';
 
 export default {
     name: 'whatsappInstance',

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

@@ -1,8 +1,7 @@
 import { Injectable } from '@nestjs/common';
 
-import { RabbitMqSubscriber } from 'src/services/queues/rabbitmq-subscriber.service';
 import { QueueMessage } from 'src/interfaces/mq';
-import whatsappQueueOptions from './whatsapp-queue-options-database';
+import whatsappQueueOptions from './msg91-whatsapp-queue-options-database';
 import { MqMessageService } from 'src/services/mq-message.service';
 import { MqMessageQueueService } from 'src/services/mq-message-queue.service';
 import { Msg91WhatsappService } from 'src/services/whatsapp/Msg91WhatsappService';
@@ -11,7 +10,7 @@ import { DatabaseSubscriber } from 'src/services/queues/database-subscriber.serv
 import { PollerService } from 'src/services/poller.service';
 
 @Injectable()
-export class WhatsappQueueSubscriberDatabase extends DatabaseSubscriber<any> {
+export class Msg91WhatsappQueueSubscriberDatabase extends DatabaseSubscriber<any> {
     constructor(
         private readonly whatsappService: Msg91WhatsappService,
         readonly mqMessageService: MqMessageService,
@@ -28,6 +27,6 @@ export class WhatsappQueueSubscriberDatabase extends DatabaseSubscriber<any> {
     }
 
     subscribe(message: QueueMessage<any>) {
-        this.whatsappService.sendSMSSynchronously(message);
+        this.whatsappService.sendWhatsAppMessageSynchronously(message);
     }
 }

package/src/jobs/database/three60-whatsapp-publisher-database.service.ts

@@ -0,0 +1,23 @@
+import { Injectable } from '@nestjs/common';
+
+import whatsappQueueOptions from './msg91-whatsapp-queue-options-database';
+import { MqMessageService } from 'src/services/mq-message.service';
+import { MqMessageQueueService } from 'src/services/mq-message-queue.service';
+import { QueuesModuleOptions } from 'src/interfaces';
+import { DatabasePublisher } from 'src/services/queues/database-publisher.service';
+
+@Injectable()
+export class Three60WhatsappQueuePublisherDatabase extends DatabasePublisher<any> {
+    constructor(
+        protected readonly mqMessageService: MqMessageService,
+        protected readonly mqMessageQueueService: MqMessageQueueService,
+    ) {
+        super(mqMessageService, mqMessageQueueService);
+    }
+
+    options(): QueuesModuleOptions {
+        return {
+            ...whatsappQueueOptions
+        }
+    }
+}

package/src/jobs/database/three60-whatsapp-queue-options-database.ts

@@ -0,0 +1,9 @@
+import { BrokerType } from "src/interfaces";
+
+const WHATSAPP_QUEUE_NAME = 'three60_whatsapp_queue_database';
+
+export default {
+    name: 'whatsappInstance',
+    type: BrokerType.Database,
+    queueName: WHATSAPP_QUEUE_NAME,
+};

package/src/jobs/database/three60-whatsapp-subscriber-database.service.ts

@@ -0,0 +1,32 @@
+import { Injectable } from '@nestjs/common';
+
+import { QueueMessage } from 'src/interfaces/mq';
+import whatsappQueueOptions from './msg91-whatsapp-queue-options-database';
+import { MqMessageService } from 'src/services/mq-message.service';
+import { MqMessageQueueService } from 'src/services/mq-message-queue.service';
+import { QueuesModuleOptions } from 'src/interfaces';
+import { DatabaseSubscriber } from 'src/services/queues/database-subscriber.service';
+import { PollerService } from 'src/services/poller.service';
+import { Three60WhatsappService } from 'src/services/whatsapp/Three60WhatsappService';
+
+@Injectable()
+export class Three60WhatsappQueueSubscriberDatabase extends DatabaseSubscriber<any> {
+    constructor(
+        private readonly whatsappService: Three60WhatsappService,
+        readonly mqMessageService: MqMessageService,
+        readonly mqMessageQueueService: MqMessageQueueService,
+        readonly poller: PollerService,
+    ) {
+        super(mqMessageService, mqMessageQueueService, poller);
+    }
+
+    options(): QueuesModuleOptions {
+        return {
+            ...whatsappQueueOptions
+        }
+    }
+
+    subscribe(message: QueueMessage<any>) {
+        this.whatsappService.sendWhatsAppMessageSynchronously(message);
+    }
+}

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

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

package/src/jobs/msg91-whatsapp-queue-options.ts

@@ -0,0 +1,12 @@
+import { BrokerType } from "../interfaces";
+
+const MSG91_WHATSAPP_QUEUE_NAME = 'mag_91_whatsapp_queue';
+export default {
+    name: 'whatsappInstance',
+    type: BrokerType.RabbitMQ,
+    queueName: MSG91_WHATSAPP_QUEUE_NAME,
+    // receive: async (message: QueueMessage<any>) => { // Default receive handler
+    //     console.log(`Received message: ${JSON.stringify(message)} from queue ${SMS_QUEUE_NAME}`);
+    //     return 'Received';
+    // },
+};

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

@@ -2,14 +2,14 @@ import { Injectable } from '@nestjs/common';
 
 import { RabbitMqSubscriber } from 'src/services/queues/rabbitmq-subscriber.service';
 import { QueueMessage } from 'src/interfaces/mq';
-import whatsappQueueOptions from './whatsapp-queue-options';
+import whatsappQueueOptions from './msg91-whatsapp-queue-options';
 import { Msg91WhatsappService } from '../services/whatsapp/Msg91WhatsappService';
 import { MqMessageService } from 'src/services/mq-message.service';
 import { MqMessageQueueService } from 'src/services/mq-message-queue.service';
 import { QueuesModuleOptions } from "../interfaces";
 
 @Injectable()
-export class WhatsappQueueSubscriber extends RabbitMqSubscriber<any> {
+export class Msg91WhatsappQueueSubscriber extends RabbitMqSubscriber<any> {
     constructor(
         private readonly whatsappService: Msg91WhatsappService,
         readonly mqMessageService: MqMessageService,
@@ -25,6 +25,6 @@ export class WhatsappQueueSubscriber extends RabbitMqSubscriber<any> {
     }
 
     subscribe(message: QueueMessage<any>) {
-        this.whatsappService.sendSMSSynchronously(message);
+        this.whatsappService.sendWhatsAppMessageSynchronously(message);
     }
 }

package/src/jobs/three60-whatsapp-publisher.service.ts

@@ -0,0 +1,23 @@
+import { Injectable } from '@nestjs/common';
+
+import { RabbitMqPublisher } from 'src/services/queues/rabbitmq-publisher.service';
+import whatsappQueueOptions from './msg91-whatsapp-queue-options';
+import { MqMessageService } from 'src/services/mq-message.service';
+import { MqMessageQueueService } from 'src/services/mq-message-queue.service';
+import { QueuesModuleOptions } from "../interfaces";
+
+@Injectable()
+export class Three60WhatsappQueuePublisher extends RabbitMqPublisher<any> {
+    constructor(
+        protected readonly mqMessageService: MqMessageService,
+        protected readonly mqMessageQueueService: MqMessageQueueService,
+    ) {
+        super(mqMessageService, mqMessageQueueService);
+    }
+
+    options(): QueuesModuleOptions {
+        return {
+            ...whatsappQueueOptions
+        }
+    }
+}

package/src/jobs/{whatsapp-queue-options.ts → three60-whatsapp-queue-options.ts}

@@ -1,10 +1,10 @@
 import { BrokerType } from "../interfaces";
 
-const WHATSAPP_QUEUE_NAME = 'whatsapp_queue';
+const _WHATSAPP_QUEUE_NAME = 'three60_whatsapp_queue';
 export default {
     name: 'whatsappInstance',
     type: BrokerType.RabbitMQ,
-    queueName: WHATSAPP_QUEUE_NAME,
+    queueName: _WHATSAPP_QUEUE_NAME,
     // receive: async (message: QueueMessage<any>) => { // Default receive handler
     //     console.log(`Received message: ${JSON.stringify(message)} from queue ${SMS_QUEUE_NAME}`);
     //     return 'Received';

package/src/jobs/three60-whatsapp-subscriber.service.ts

@@ -0,0 +1,30 @@
+import { Injectable } from '@nestjs/common';
+
+import { RabbitMqSubscriber } from 'src/services/queues/rabbitmq-subscriber.service';
+import { QueueMessage } from 'src/interfaces/mq';
+import whatsappQueueOptions from './msg91-whatsapp-queue-options';
+import { MqMessageService } from 'src/services/mq-message.service';
+import { MqMessageQueueService } from 'src/services/mq-message-queue.service';
+import { QueuesModuleOptions } from "../interfaces";
+import { Three60WhatsappService } from 'src/services/whatsapp/Three60WhatsappService';
+
+@Injectable()
+export class Three60WhatsappQueueSubscriber extends RabbitMqSubscriber<any> {
+    constructor(
+        private readonly whatsappService: Three60WhatsappService,
+        readonly mqMessageService: MqMessageService,
+        readonly mqMessageQueueService: MqMessageQueueService,
+    ) {
+        super(mqMessageService, mqMessageQueueService);
+    }
+
+    options(): QueuesModuleOptions {
+        return {
+            ...whatsappQueueOptions
+        }
+    }
+
+    subscribe(message: QueueMessage<any>) {
+        this.whatsappService.sendWhatsAppMessageSynchronously(message);
+    }
+}

package/src/services/chatter-message.service.ts

@@ -86,6 +86,9 @@ export class ChatterMessageService extends CRUDService<ChatterMessage>{
  }
 
  async postAuditMessageOnInsert(entity: any, metadata: EntityMetadata, messageQueue: boolean = false) {
+    if(!entity){
+        return;
+    }
     const model = await this.modelMetadataRepo.findOne({
         where: {
             displayName: metadata.name
@@ -140,6 +143,9 @@ export class ChatterMessageService extends CRUDService<ChatterMessage>{
 }
 
 async postAuditMessageOnUpdate(entity: any, metadata: EntityMetadata, databaseEntity: any, messageQueue: boolean = false) {
+    if(!databaseEntity || !entity){
+        return;
+    }
     const model = await this.modelMetadataRepo.findOne({
         where: {
             displayName: metadata.name

package/src/services/solid-introspect.service.ts

@@ -11,6 +11,7 @@ import { IS_SCHEDULED_JOB_PROVIDER } from 'src/decorators/scheduled-job-provider
 import { IS_DASHBOARD_VARIABLE_SELECTION_PROVIDER } from 'src/decorators/dashboard-selection-provider.decorator';
 import { IS_DASHBOARD_QUESTION_DATA_PROVIDER } from 'src/decorators/dashboard-question-data-provider.decorator';
 import { IS_MAIL_PROVIDER } from 'src/decorators/mail-provider.decorator';
+import { IS_WA_PROVIDER } from 'src/decorators/whatsapp-provider.decorator';
 
 @Injectable()
 export class SolidIntrospectService implements OnApplicationBootstrap {
@@ -118,6 +119,15 @@ export class SolidIntrospectService implements OnApplicationBootstrap {
     mailProviders.forEach((mailProvider) => {
       this.solidRegistry.registerMailProvider(mailProvider);
     });
+
+    // Register all IMail implementations
+    const whatsappProviders = this.discoveryService
+      .getProviders()
+      .filter((provider) => this.isWhatsappProvider(provider));
+
+    whatsappProviders.forEach((whatsappProvider) => {
+      this.solidRegistry.registerWhatsappProvider(whatsappProvider);
+    });
   }
 
   isDashboardQuestionDataProvider(providerWrapper: InstanceWrapper<any>) {
@@ -212,6 +222,18 @@ export class SolidIntrospectService implements OnApplicationBootstrap {
     return !!isMailProvider;
   }
 
+  private isWhatsappProvider(provider: InstanceWrapper) {
+    const { instance } = provider;
+    if (!instance) return false;
+
+    const isWhatsappProvider = this.reflector.get<boolean>(
+      IS_WA_PROVIDER,
+      instance.constructor,
+    );
+
+    return !!isWhatsappProvider;
+  }
+
   private isModule(provider: InstanceWrapper): boolean {
     const metatype = provider.metatype;
     // Check if it's a Static Module (Class-Based)

package/src/services/whatsapp/Msg91WhatsappService.ts

@@ -3,10 +3,9 @@ import { Inject, Injectable, Logger } from '@nestjs/common';
 import { ConfigType } from '@nestjs/config';
 import commonConfig from 'src/config/common.config';
 import { QueueMessage } from 'src/interfaces/mq';
-import { SmsTemplateService } from '../sms-template.service';
-import { Msg91BaseSMSService } from '../sms/Msg91BaseSMSService';
-import { ISMS } from "../../interfaces";
+import { IWhatsAppTransport } from "../../interfaces";
 import { PublisherFactory } from '../queues/publisher-factory.service';
+import { WhatsAppProvider } from 'src/decorators/whatsapp-provider.decorator';
 
 enum Msg91WhatsappParameterHeaderType {
   image,
@@ -51,21 +50,46 @@ interface WhatsappToAndComponents {
 }
 
 @Injectable()
-export class Msg91WhatsappService extends Msg91BaseSMSService implements ISMS {
+@WhatsAppProvider()
+export class Msg91WhatsappService implements IWhatsAppTransport {
   readonly logger = new Logger(Msg91WhatsappService.name);
 
   constructor(
     @Inject(commonConfig.KEY)
-    commonConfiguration: ConfigType<typeof commonConfig>,
+    private readonly commonConfiguration: ConfigType<typeof commonConfig>,
     // whatsappPublisher: WhatsappQueuePublisher,
-    publisherFactory: PublisherFactory<any>,
-    smsTemplateService: SmsTemplateService,
+    private readonly publisherFactory: PublisherFactory<any>,
     private readonly httpService: HttpService,
-  ) {
-    super(commonConfiguration, 'WhatsappQueuePublisher', publisherFactory, smsTemplateService);
+  ) {}
+
+  async sendWhatsAppMessage(
+    to: string,
+    templateId: string,
+    parameters: any,
+    parentEntity?: any,
+    parentEntityId?: any
+  ): Promise<any> {
+    const message = {
+      payload: {
+        to,
+        templateId,
+        ...parameters,
+      },
+      parentEntity,
+      parentEntityId,
+    };
+
+    // All messages are always queued as per requirement
+    return this.sendWhatsAppMessageAsynchronously(message);
+  }
+
+  private async sendWhatsAppMessageAsynchronously(message: any): Promise<any> {
+    const { to, templateId } = message.payload;
+    this.logger.debug(`Queueing WhatsApp message to ${to} with template ${templateId}`);
+    return this.publisherFactory.publish(message, 'Msg91WhatsappQueuePublisher');
   }
 
-  async sendSMSSynchronously(message: QueueMessage<any>): Promise<void> {
+  async sendWhatsAppMessageSynchronously(message: QueueMessage<any>): Promise<void> {
     const body = this.createWhatsappRequest(message);
     const headers = { authkey: this.commonConfiguration.msg91Whatsapp.apiKey };
     await this.httpService.axiosRef.post(

package/src/services/whatsapp/Three60WhatsappService.ts

@@ -0,0 +1,52 @@
+import { HttpService } from '@nestjs/axios';
+import { Inject, Injectable, Logger } from '@nestjs/common';
+import { ConfigType } from '@nestjs/config';
+import commonConfig from 'src/config/common.config';
+import { QueueMessage } from 'src/interfaces/mq';
+import { IWhatsAppTransport } from "../../interfaces";
+import { PublisherFactory } from '../queues/publisher-factory.service';
+import { WhatsAppProvider } from 'src/decorators/whatsapp-provider.decorator';
+
+@Injectable()
+@WhatsAppProvider()
+export class Three60WhatsappService implements IWhatsAppTransport {
+  readonly logger = new Logger(Three60WhatsappService.name);
+
+  constructor(
+    @Inject(commonConfig.KEY)
+    private readonly commonConfiguration: ConfigType<typeof commonConfig>,
+    private readonly publisherFactory: PublisherFactory<any>,
+    private readonly httpService: HttpService,
+  ) { }
+
+  async sendWhatsAppMessage(
+    to: string,
+    templateId: string,
+    parameters: any,
+    parentEntity?: any,
+    parentEntityId?: any
+  ): Promise<any> {
+    const message = {
+      payload: {
+        to,
+        templateId,
+        ...parameters,
+      },
+      parentEntity,
+      parentEntityId,
+    };
+
+    // All messages are always queued as per requirement
+    return this.sendWhatsAppMessageAsynchronously(message);
+  }
+
+  private async sendWhatsAppMessageAsynchronously(message: any): Promise<any> {
+    const { to, templateId } = message.payload;
+    this.logger.debug(`Queueing WhatsApp message to ${to} with template ${templateId}`);
+    return this.publisherFactory.publish(message, 'Three60WhatsappQueuePublisher');
+  }
+
+  async sendWhatsAppMessageSynchronously(message: QueueMessage<any>): Promise<void> {
+    throw new Error(`Currently not implemented.`);
+  }
+}

package/src/solid-core.module.ts

@@ -94,8 +94,8 @@ import { SmsQueuePublisher } from './jobs/sms-publisher.service';
 import { SmsQueueSubscriber } from './jobs/sms-subscriber.service';
 import { TestQueuePublisher } from './jobs/test-queue-publisher.service';
 import { TestQueueSubscriber } from './jobs/test-queue-subscriber.service';
-import { WhatsappQueuePublisher } from './jobs/whatsapp-publisher.service';
-import { WhatsappQueueSubscriber } from './jobs/whatsapp-subscriber.service';
+import { Msg91WhatsappQueuePublisher } from './jobs/msg91-whatsapp-publisher.service';
+import { Msg91WhatsappQueueSubscriber } from './jobs/msg91-whatsapp-subscriber.service';
 import { UserRegistrationListener } from './listeners/user-registration.listener';
 import { GoogleOauthStrategy } from './passport-strategies/google-oauth.strategy';
 import { LocalStrategy } from './passport-strategies/local.strategy';
@@ -193,8 +193,8 @@ import { TwilioSmsQueueSubscriberDatabase } from './jobs/database/twilio-sms-sub
 
 import { TriggerMcpClientPublisherDatabase } from './jobs/database/trigger-mcp-client-publisher-database.service';
 import { TriggerMcpClientSubscriberDatabase } from './jobs/database/trigger-mcp-client-subscriber-database.service';
-import { WhatsappQueuePublisherDatabase } from './jobs/database/whatsapp-publisher-database.service';
-import { WhatsappQueueSubscriberDatabase } from './jobs/database/whatsapp-subscriber-database.service';
+import { Msg91WhatsappQueuePublisherDatabase } from './jobs/database/msg91-whatsapp-publisher-database.service';
+import { Msg91WhatsappQueueSubscriberDatabase } from './jobs/database/msg91-whatsapp-subscriber-database.service';
 import { DashboardMapper } from './mappers/dashboard-mapper';
 import { DashboardRepository } from './repository/dashboard.repository';
 import { FieldMetadataRepository } from './repository/field-metadata.repository';
@@ -276,6 +276,11 @@ import { TextractService } from './services/textract.service';
 import { seconds, ThrottlerModule } from '@nestjs/throttler';
 import { ChatterMessageRepository } from './repository/chatter-message.repository';
 import { ChatterMessageDetailsRepository } from './repository/chatter-message-details.repository';
+import { Three60WhatsappQueuePublisher } from './jobs/three60-whatsapp-publisher.service';
+import { Three60WhatsappQueueSubscriber } from './jobs/three60-whatsapp-subscriber.service';
+import { Three60WhatsappQueuePublisherDatabase } from './jobs/database/three60-whatsapp-publisher-database.service';
+import { Three60WhatsappQueueSubscriberDatabase } from './jobs/database/three60-whatsapp-subscriber-database.service';
+import { Three60WhatsappService } from './services/whatsapp/Three60WhatsappService';
 
 
 @Global()
@@ -492,10 +497,17 @@ import { ChatterMessageDetailsRepository } from './repository/chatter-message-de
     OTPQueueSubscriber,
     OTPQueuePublisherDatabase,
     OTPQueueSubscriberDatabase,
-    WhatsappQueuePublisher,
-    WhatsappQueueSubscriber,
-    WhatsappQueuePublisherDatabase,
-    WhatsappQueueSubscriberDatabase,
+    Msg91WhatsappQueuePublisher,
+    Msg91WhatsappQueueSubscriber,
+    Msg91WhatsappQueuePublisherDatabase,
+    Msg91WhatsappQueueSubscriberDatabase,
+    Three60WhatsappQueuePublisher,
+    Three60WhatsappQueueSubscriber,
+    Three60WhatsappQueuePublisherDatabase,
+    Three60WhatsappQueueSubscriberDatabase,
+    Three60WhatsappService,
+    MqMessageService,
+    MqMessageQueueService,
     EmailTemplateSeederService,
     SmsTemplateSeederService,
     TinyUrlService,

package/dist/jobs/database/whatsapp-publisher-database.service.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"whatsapp-publisher-database.service.d.ts","sourceRoot":"","sources":["../../../src/jobs/database/whatsapp-publisher-database.service.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AACnE,OAAO,EAAE,qBAAqB,EAAE,MAAM,uCAAuC,CAAC;AAC9E,OAAO,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AACrD,OAAO,EAAE,iBAAiB,EAAE,MAAM,gDAAgD,CAAC;AAEnF,qBACa,8BAA+B,SAAQ,iBAAiB,CAAC,GAAG,CAAC;IAElE,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,gBAAgB;IACrD,SAAS,CAAC,QAAQ,CAAC,qBAAqB,EAAE,qBAAqB;gBAD5C,gBAAgB,EAAE,gBAAgB,EAClC,qBAAqB,EAAE,qBAAqB;IAKnE,OAAO,IAAI,mBAAmB;CAKjC"}

package/dist/jobs/database/whatsapp-publisher-database.service.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"whatsapp-publisher-database.service.js","sourceRoot":"","sources":["../../../src/jobs/database/whatsapp-publisher-database.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAA4C;AAE5C,wGAAqE;AACrE,0EAAmE;AACnE,sFAA8E;AAE9E,iGAAmF;AAG5E,IAAM,8BAA8B,GAApC,MAAM,8BAA+B,SAAQ,8CAAsB;IACtE,YACuB,gBAAkC,EAClC,qBAA4C;QAE/D,KAAK,CAAC,gBAAgB,EAAE,qBAAqB,CAAC,CAAC;QAH5B,qBAAgB,GAAhB,gBAAgB,CAAkB;QAClC,0BAAqB,GAArB,qBAAqB,CAAuB;IAGnE,CAAC;IAED,OAAO;QACH,OAAO;YACH,GAAG,yCAAoB;SAC1B,CAAA;IACL,CAAC;CACJ,CAAA;AAbY,wEAA8B;yCAA9B,8BAA8B;IAD1C,IAAA,mBAAU,GAAE;qCAGgC,qCAAgB;QACX,gDAAqB;GAH1D,8BAA8B,CAa1C","sourcesContent":["import { Injectable } from '@nestjs/common';\n\nimport whatsappQueueOptions from './whatsapp-queue-options-database';\nimport { MqMessageService } from 'src/services/mq-message.service';\nimport { MqMessageQueueService } from 'src/services/mq-message-queue.service';\nimport { QueuesModuleOptions } from 'src/interfaces';\nimport { DatabasePublisher } from 'src/services/queues/database-publisher.service';\n\n@Injectable()\nexport class WhatsappQueuePublisherDatabase extends DatabasePublisher<any> {\n    constructor(\n        protected readonly mqMessageService: MqMessageService,\n        protected readonly mqMessageQueueService: MqMessageQueueService,\n    ) {\n        super(mqMessageService, mqMessageQueueService);\n    }\n\n    options(): QueuesModuleOptions {\n        return {\n            ...whatsappQueueOptions\n        }\n    }\n}\n"]}

package/dist/jobs/database/whatsapp-queue-options-database.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"whatsapp-queue-options-database.d.ts","sourceRoot":"","sources":["../../../src/jobs/database/whatsapp-queue-options-database.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;;;;;;AAI5C,wBAIE"}

package/dist/jobs/database/whatsapp-queue-options-database.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"whatsapp-queue-options-database.js","sourceRoot":"","sources":["../../../src/jobs/database/whatsapp-queue-options-database.ts"],"names":[],"mappings":";;AAAA,iDAA4C;AAE5C,MAAM,mBAAmB,GAAG,yBAAyB,CAAC;AAEtD,kBAAe;IACX,IAAI,EAAE,kBAAkB;IACxB,IAAI,EAAE,uBAAU,CAAC,QAAQ;IACzB,SAAS,EAAE,mBAAmB;CACjC,CAAC","sourcesContent":["import { BrokerType } from \"src/interfaces\";\n\nconst WHATSAPP_QUEUE_NAME = 'whatsapp_queue_database';\n\nexport default {\n    name: 'whatsappInstance',\n    type: BrokerType.Database,\n    queueName: WHATSAPP_QUEUE_NAME,\n};"]}