Merge pull request #32 from samagra-comms/main

Prod Deployment

Author: KDwevedi

.gitignore

@@ -35,4 +35,5 @@ lerna-debug.log*
 !.vscode/settings.json
 !.vscode/tasks.json
 !.vscode/launch.json
-!.vscode/extensions.json
+!.vscode/extensions.json
+.prettierrc

package.json

@@ -20,11 +20,12 @@
     "test:e2e": "jest --config ./test/jest-e2e.json"
   },
   "dependencies": {
+    "@nestjs/axios": "^3.0.1",
     "@nestjs/common": "^10.0.0",
     "@nestjs/config": "^3.1.1",
     "@nestjs/core": "^10.0.0",
     "@nestjs/platform-express": "^10.0.0",
-    "@samagra-x/gupshup-whatsapp-adapter": "^1.0.0",
+    "@samagra-x/gupshup-whatsapp-adapter": "1.0.2",
     "@samagra-x/xmessage": "^1.0.1",
     "@supabase/supabase-js": "^2.38.5",
     "axios": "^1.6.2",

src/app.module.ts

@@ -3,6 +3,7 @@ import { AppController } from './app.controller';
 import { AppService } from './app.service';
 import { MessageModule } from './message/message.module';
 import { ConfigModule } from '@nestjs/config';
+import { UserModule } from './user/user.module';
 
 @Module({
   imports: [

src/main.ts

@@ -1,11 +1,5 @@
 import { NestFactory } from '@nestjs/core';
 import { AppModule } from './app.module';
-// import axios from 'axios';
-// import {XMessage, MessageState, MessageType} from "xmessage";
-// import {} from "userservice";
-// import {configService} from "botservice";
-// import {GSWhatsAppMessage, convertXMessageToMsg} from "gupshup-whatsapp-adapter";
-// import { measureMemory } from 'vm';
 
 async function bootstrap() {
   const app = await NestFactory.create(AppModule);

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

@@ -0,0 +1,26 @@
+import { Controller, Get, Post, Body, Logger } from '@nestjs/common';
+import { GSWhatsAppMessage } from '@samagra-x/gupshup-whatsapp-adapter';
+import { ConfigService } from '@nestjs/config';
+import { GupshupWhatsappInboundService } from '../../services/inbound/gupshup.whatsapp.service';
+
+@Controller('/inbound/gupshup/whatsapp')
+export class GupshupWhatsappInboundController {
+    constructor(
+        private configService: ConfigService,
+        private readonly inboundService: GupshupWhatsappInboundService
+    ) {}
+    private readonly logger = new Logger(GupshupWhatsappInboundController.name);
+
+    @Get('/health')
+    async verifyEndpointIsActive(): Promise<string> {
+        return 'Endpoint Active!';
+    }
+
+    @Post()
+    async handleIncomingMessageData(@Body() requestData: GSWhatsAppMessage): Promise<any> {
+		if ("mobile" in requestData){
+            this.logger.log(requestData)
+			await this.inboundService.handleIncomingGsWhatsappMessage(requestData);
+		}
+    }
+}

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

@@ -1,14 +1,19 @@
-import { Body, Controller, Post } from '@nestjs/common';
-import { XMessage } from '@samagra-x/xmessage';
+import { Body, Controller, Logger, Post } from '@nestjs/common';
+import { ConfigService } from '@nestjs/config';
+import { MessageState, XMessage } from '@samagra-x/xmessage';
 import { OutboundService } from 'src/message/services/outbound/outbound.service';
 
 @Controller('/outbound/gupshup/whatsapp')
 export class OutboundMessageController {
-    constructor(private readonly outboundService: OutboundService) {}
+    constructor(private readonly outboundService: OutboundService, private readonly configService: ConfigService,) {}
+    private readonly logger = new Logger(OutboundMessageController.name);
 
     @Post()
     async handleIncomingXMessage(@Body() orchestratorRequest: XMessage): Promise<any> {
-        await this.outboundService.handleOrchestratorRequest(orchestratorRequest)
+        this.logger.log('Orchestrator Request', orchestratorRequest);
+        const botMobileNumber = this.configService.get<string>('BOT_MOBILE_NUMBER')
+        const credentials = await this.outboundService.getAdapterCredentials(botMobileNumber);
+        orchestratorRequest.messageState = MessageState.REPLIED;
+        await this.outboundService.handleOrchestratorResponse(orchestratorRequest, credentials);
     }
-    
 }

src/message/controllers/orchestrator.message.controller.ts

@@ -1,14 +1,6 @@
 import { IsUUID, IsString, IsOptional, IsArray, IsEnum, IsNumber } from 'class-validator';
 import { MessageState } from '@samagra-x/xmessage';
 
-export enum MessageStatus {
-  DEFAULT = 'DEFAULT',
-  DELIVERED = 'DELIVERED',
-  RECEIVED = 'RECEIVED',
-  SENT = 'SENT',
-  PROCESSED = 'PROCESSED',
-}
-
 export class XMessageDbDto {
   @IsOptional()
   @IsUUID()
@@ -29,7 +21,7 @@ export class XMessageDbDto {
   provider?: string;
 
   @IsNumber()
-  timestamp: string;
+  timestamp: number;
 
   @IsOptional()
   @IsString()
@@ -88,7 +80,7 @@ export class XMessageDbDto {
   @IsString()
   remarks?: string;
 
-  // @IsOptional()
-  // @IsEnum(MessageStatus)
-  // status?: MessageStatus;
+  @IsOptional()
+  @IsEnum(MessageState)
+  status?: MessageState;
 }

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

@@ -1,15 +1,17 @@
 import { Module } from '@nestjs/common';
-import { MessageController } from './controllers/inbound.message.controller';
-import { InboundService } from './services/inbound/inbound.service';
+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.service';
+import { FeedbackService } from './services/feedback/feedback.service';
 
 @Module({
-  imports: [ConfigModule.forRoot()],
-  controllers: [MessageController],
-  providers: [ 
-    InboundService,
-    OutboundService
-  ],
+    imports: [ConfigModule.forRoot(), UserModule],
+    controllers: [GupshupWhatsappInboundController, OutboundMessageController],
+    providers: [GupshupWhatsappInboundService, OutboundService, CredentialService, SupabaseService, FeedbackService]
 })
-export class MessageModule {}
+export class MessageModule {}

src/message/dto/xmessage.dto.ts

@@ -0,0 +1,20 @@
+import { Injectable, Logger } from '@nestjs/common';
+import axios from 'axios';
+
+@Injectable()
+export class CredentialService {
+    private readonly logger = new Logger(CredentialService.name);
+    async getCredentialsFromVault(
+        baseUrl: string,
+        secretPath: string,
+        headers: Record<string, string>
+    ) {
+        const webClient = axios.create({
+            baseURL: baseUrl,
+            headers: headers
+        });
+
+        const response = await webClient.get(`${secretPath}`);
+        return response.data
+    }
+}

src/message/message.module.ts

@@ -0,0 +1,24 @@
+import { Injectable, Logger } from '@nestjs/common';
+import { ConfigService } from '@nestjs/config';
+import axios from 'axios';
+
+@Injectable()
+export class FeedbackService {
+    private readonly logger = new Logger(FeedbackService.name);
+
+    constructor(private readonly configService: ConfigService) {}
+
+    async givePositiveFeedback(messageId) {
+        const orchestratorUrl = this.configService.get<string>('ORCHESTRATOR_API_ENDPOINT');
+        const feedbackUrl = `${orchestratorUrl}/feedback/query/like/${messageId}`;
+
+        await axios.get(feedbackUrl);
+    }
+    
+    async giveNegativeFeedback(messageId) {
+        const orchestratorUrl = this.configService.get<string>('ORCHESTRATOR_API_ENDPOINT');
+        const feedbackUrl = `${orchestratorUrl}/feedback/query/dislike/${messageId}`;
+
+        await axios.get(feedbackUrl)
+    }
+}