Refactored inbound to unify endpoints.

Author: chinmoy12c

package.json

@@ -25,10 +25,7 @@
     "@nestjs/config": "^3.1.1",
     "@nestjs/core": "^10.0.0",
     "@nestjs/platform-express": "^10.0.0",
-    "@samagra-x/uci-adapters-gupshup-whatsapp-adapter": "1.0.7",
-    "@samagra-x/uci-adapters-telegram-bot": "1.0.2",
-    "@samagra-x/uci-adapters-pwa": "1.0.2",
-    "@samagra-x/xmessage": "^1.0.10",
+    "@samagra-x/xmessage": "^1.0.11",
     "@samagra-x/uci-adapters-factory": "^1.0.4",
     "@supabase/supabase-js": "^2.38.5",
     "axios": "^1.6.2",

src/message/controllers/inbound/gupshup.whatsapp.controller.spec.ts

@@ -1,14 +1,14 @@
 import { Controller, Get, Post, Body, Logger, Param, NotFoundException } from '@nestjs/common';
-import { PwaBotService } from 'src/message/services/inbound/pwa.bot.service';
+import { InboundService } from 'src/message/services/inbound/inbound.bot.service';
 import { WebClientProvider } from 'src/message/services/webclient/webclient.provider';
 
-@Controller('/inbound/pwa/bot')
-export class PwaBotController {
+@Controller('/inbound/bot')
+export class InboundBotController {
     constructor(
-        private readonly pwaBotService: PwaBotService,
+        private readonly inboundBotService: InboundService,
         private readonly webclientProvider: WebClientProvider,
     ) {}
-    private readonly logger = new Logger(PwaBotController.name);
+    private readonly logger = new Logger(InboundBotController.name);
 
     @Get('/health')
     async verifyEndpointIsActive(): Promise<string> {
@@ -20,14 +20,14 @@ export class PwaBotController {
         @Param('botId') botId: string,
         @Body() updateObject
     ): Promise<any> {
-        this.logger.log("Received whatsapp message from user.");
+        this.logger.log("Received message on inbound.");
         const botFetchRequest = await this.webclientProvider.getUciApiWebClient().get(
             `/admin/bot/${botId}`
         );
         if (botFetchRequest.status != 200 || !botFetchRequest.data || !botFetchRequest.data.result) {
             this.logger.error(botFetchRequest);
             throw new NotFoundException('Bot Not Found!');
         }
-        this.pwaBotService.handleIncomingMessage(botFetchRequest.data.result, updateObject);
+        this.inboundBotService.handleIncomingMessage(botFetchRequest.data.result, updateObject);
     }
 }

src/message/controllers/inbound/gupshup.whatsapp.controller.ts

@@ -3,7 +3,7 @@ import { MessageState, XMessage } from '@samagra-x/xmessage';
 import { CredentialService } from 'src/message/services/credentials/credentials.service';
 import { OutboundService } from 'src/message/services/outbound/outbound.service';
 
-@Controller('/outbound/gupshup/whatsapp')
+@Controller('/outbound')
 export class OutboundMessageController {
     constructor(
         private readonly outboundService: OutboundService,

src/message/controllers/inbound/pwa.bot.controller.ts renamed to src/message/controllers/inbound/inbound.bot.controller.ts

@@ -1,36 +1,28 @@
 import { Module } from '@nestjs/common';
-import { GupshupWhatsappInboundController } from './controllers/inbound/gupshup.whatsapp.controller';
-import { GupshupWhatsappInboundService } from './services/inbound/gupshup.whatsapp.service';
 import { ConfigModule } from '@nestjs/config';
 import { OutboundService } from './services/outbound/outbound.service';
 import { CredentialService } from './services/credentials/credentials.service';
 import { OutboundMessageController } from './controllers/outbound/outbound.controller';
 import { UserModule } from 'src/user/user.module';
 import { SupabaseService } from './services/supabase/supabase.service';
 import { FeedbackService } from './services/feedback/feedback.service';
-import { TelegramBotController } from './controllers/inbound/telegram.bot.controller';
+import { InboundBotController } from './controllers/inbound/inbound.bot.controller';
 import { WebClientProvider } from './services/webclient/webclient.provider';
-import { TelegramBotService } from './services/inbound/telegram.bot.service';
-import { PwaBotController } from './controllers/inbound/pwa.bot.controller';
-import { PwaBotService } from './services/inbound/pwa.bot.service';
+import { InboundService } from './services/inbound/inbound.bot.service';
 
 @Module({
     imports: [ConfigModule.forRoot(), UserModule],
     controllers: [
-        GupshupWhatsappInboundController,
-        TelegramBotController,
-        PwaBotController,
+        InboundBotController,
         OutboundMessageController
     ],
     providers: [
-        GupshupWhatsappInboundService,
-        TelegramBotService,
+        InboundService,
         OutboundService,
         CredentialService,
         SupabaseService,
         FeedbackService,
         WebClientProvider,
-        PwaBotService,
     ]
 })
 export class MessageModule {}

src/message/controllers/inbound/telegram.bot.controller.ts

@@ -30,7 +30,7 @@ export class CredentialService {
         }
     }
 
-    private async getCredentialsFromVault(
+    async getCredentialsFromVault(
         variableName: string,
     ): Promise<any> {
         const response = await this.webClientProvider.getUciApiWebClient({

src/message/controllers/outbound/outbound.controller.ts

@@ -8,17 +8,21 @@ export class FeedbackService {
 
     constructor(private readonly configService: ConfigService) {}
 
-    async givePositiveFeedback(messageId) {
+    async givePositiveFeedback(messageId: string) {
         const orchestratorUrl = this.configService.get<string>('ORCHESTRATOR_API_ENDPOINT');
         const feedbackUrl = `${orchestratorUrl}/feedback/query/like/${messageId}`;
 
         await axios.get(feedbackUrl);
     }
 
-    async giveNegativeFeedback(messageId) {
+    async giveNegativeFeedback(messageId: string) {
         const orchestratorUrl = this.configService.get<string>('ORCHESTRATOR_API_ENDPOINT');
         const feedbackUrl = `${orchestratorUrl}/feedback/query/dislike/${messageId}`;
 
         await axios.get(feedbackUrl)
     }
+
+    async giveNeutralFeedback(messageId: string) {
+        console.warn("Neutral Feedback not implemented!");
+    }
 }