Develop merge

Dockerfile

@@ -20,4 +20,4 @@ COPY --from=build /app/package*.json ./
 COPY --from=build /app/prisma ./prisma
 COPY --from=build /app/node_modules ./node_modules
 EXPOSE 3002
-CMD [ "npm", "run", "start:prod" ]
+CMD [ "npm", "run", "start:migrate:prod" ]

prisma/migrations/20220822130634_bot_add_image/migration.sql

@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "Bot" ADD COLUMN     "botImage" TEXT;

prisma/migrations/20240226082219_add_pinned_status_to_bot_status/migration.sql

@@ -0,0 +1,2 @@
+-- AlterEnum
+ALTER TYPE "BotStatus" ADD VALUE 'PINNED';

prisma/schema.prisma

@@ -15,6 +15,7 @@ enum BotStatus {
   ENABLED
   DISABLED
   DRAFT
+  PINNED
 }
 
 model Adapter {

src/auth/auth.guard.ts

@@ -3,6 +3,8 @@ import { AuthGuard, IAuthGuard } from '@nestjs/passport';
 import { User } from './user.entity';
 import { ConfigService } from '@nestjs/config';
 import { JwtService } from '@nestjs/jwt';
+import { Reflector } from '@nestjs/core';
+import { IS_PUBLIC_KEY } from './public.decorator';
 
 @Injectable()
 export class JwtAuthGuard extends AuthGuard('jwt') implements IAuthGuard {
@@ -12,6 +14,7 @@ export class JwtAuthGuard extends AuthGuard('jwt') implements IAuthGuard {
   constructor(
     private readonly configService: ConfigService,
     private readonly jwtService: JwtService,
+    private readonly reflector: Reflector,
   ) {
     super();
     this.adminToken = configService.get<string>('ADMIN_TOKEN');
@@ -23,6 +26,13 @@ export class JwtAuthGuard extends AuthGuard('jwt') implements IAuthGuard {
   }
 
   public async canActivate(context: ExecutionContext): Promise<boolean> {
+    const isPublic = this.reflector.getAllAndOverride<boolean>(
+      IS_PUBLIC_KEY,
+      [context.getHandler(), context.getClass()],
+    );
+    if (isPublic) {
+      return true;
+    }
     await super.canActivate(context);
     const request: Request = context.switchToHttp().getRequest();
     let token = "";

src/auth/public.decorator.ts

@@ -0,0 +1,4 @@
+import { SetMetadata } from '@nestjs/common';
+
+export const IS_PUBLIC_KEY = 'isPublic';
+export const Public = () => SetMetadata(IS_PUBLIC_KEY, true);

src/health/health.controller.ts

@@ -1,18 +1,21 @@
 import { Body, Controller, Get } from '@nestjs/common';
 import { HealthService } from './health.service';
 import { HealthCheckResult } from '@nestjs/terminus';
+import { Public } from '../auth/public.decorator';
 
 @Controller('health')
 export class HealthController {
     constructor(
         private readonly healthService: HealthService
     ) {}
 
+    @Public() 
     @Get()
     async checkHealth(@Body() body: any): Promise<HealthCheckResult> {
         return this.healthService.checkHealth();
     }
 
+    @Public() 
     @Get('/ping')
     async getServiceHealth(): Promise<HealthCheckResult> {
         const resp: HealthCheckResult = {

src/modules/bot/bot.controller.spec.ts

@@ -57,6 +57,12 @@ const mockBotService = {
     if (id == 'disabled') {
       mockBotDataCopy['status'] = BotStatus.DISABLED;
     }
+    else if (id == 'enabled') {
+      mockBotDataCopy['status'] = BotStatus.ENABLED;
+    }
+    else if (id == 'pinned') {
+      mockBotDataCopy['status'] = BotStatus.PINNED;
+    }
     if (id == 'noUser') {
       mockBotDataCopy['users'] = []
     }
@@ -85,7 +91,9 @@ const mockBotService = {
     };
   }),
 
-  getBroadcastReport: jest.fn()
+  getBroadcastReport: jest.fn(),
+
+  start: jest.fn(),
 }
 
 const mockBotData: Prisma.BotGetPayload<{
@@ -265,6 +273,11 @@ describe('BotController', () => {
     await expect(() => botController.startOne('disabled', {})).rejects.toThrowError(ServiceUnavailableException);
   });
 
+  it('only disabled bot returns unavailable error',async () => {
+    expect(botController.startOne('pinned', {})).resolves;
+    expect(botController.startOne('enabled', {})).resolves;
+  });
+
   it('update only passes relevant bot data to bot service', async () => {
     updateParametersPassed = [
       'status',

src/modules/bot/bot.controller.ts

@@ -225,7 +225,7 @@ export class BotController {
       throw new BadRequestException('Bot does not contain user segment data');
     }
     console.log(bot?.users[0].all);
-    if (bot?.status != BotStatus.ENABLED) {
+    if (bot?.status == BotStatus.DISABLED) {
       throw new ServiceUnavailableException("Bot is not enabled!");
     }
     const res = await this.botService.start(id, bot?.users[0].all?.config, headers['conversation-authorization']);

src/modules/bot/bot.service.spec.ts

@@ -10,6 +10,7 @@ import { CacheModule } from '@nestjs/common';
 import { BotStatus } from '../../../prisma/generated/prisma-client-js';
 import { UserSegmentService } from '../user-segment/user-segment.service';
 import { ConversationLogicService } from '../conversation-logic/conversation-logic.service';
+import { assert } from 'console';
 
 
 const MockPrismaService = {
@@ -20,6 +21,8 @@ const MockPrismaService = {
         mockBotsDbCopy.purpose = createData.data.purpose;
       if (createData.data.description)
         mockBotsDbCopy.description = createData.data.description;
+      if (createData.data.status)
+        mockBotsDbCopy.status = createData.data.status;
       return mockBotsDbCopy;
     },
     findUnique: (filter) => {
@@ -367,6 +370,7 @@ let deletedIds: any[] = []
 describe('BotService', () => {
   let botService: BotService;
   let configService: ConfigService;
+  jest.setTimeout(15000);
 
   beforeEach(async () => {
     const module: TestingModule = await Test.createTestingModule({
@@ -758,4 +762,18 @@ describe('BotService', () => {
     mockCreateBotDtoCopy.logic = ['NonExisting'];
     expect(botService.create(mockCreateBotDtoCopy, mockFile)).rejects.toThrowError('Converstaion Logic does not exist!');
   });
+
+  it('bot status pinned is passed to db', async () => {
+    fetchMock.postOnce(`${configService.get<string>('MINIO_MEDIA_UPLOAD_URL')}`, {
+      fileName: 'testFileName'
+    });
+    const mockCreateBotDtoCopy: CreateBotDto & { ownerID: string; ownerOrgID: string } = { ...mockCreateBotDto };
+    mockCreateBotDtoCopy.status = 'PINNED';
+    mockCreateBotDtoCopy.name = 'testBotNotExisting';
+    mockCreateBotDtoCopy.startingMessage = 'testBotStartingMessageNotExisting';
+    const response = await botService.create(mockCreateBotDtoCopy, mockFile);
+    assert(response != null);
+    expect(response!['status']).toStrictEqual('PINNED');
+    fetchMock.restore();
+  });
 });

src/modules/bot/bot.service.ts

@@ -229,8 +229,7 @@ export class BotService {
           name: data.name,
           ownerID: data.ownerid,
           ownerOrgID: data.ownerorgid,
-          status:
-            data.status && data.status.toLocaleLowerCase() === 'enabled' ? BotStatus.ENABLED : BotStatus.DISABLED,
+          status: this.getBotStatus(data.status),
           startDate: this.getDateFromString(data.startDate),
           endDate: this.getDateFromString(data.endDate),
           tags: data.tags,
@@ -269,6 +268,20 @@ export class BotService {
     }
   }
 
+  private getBotStatus(status: string): BotStatus {
+    status = status.toLocaleLowerCase();
+    switch (status) {
+      case 'enabled':
+        return BotStatus.ENABLED;
+      case 'disabled':
+        return BotStatus.DISABLED;
+      case 'pinned':
+        return BotStatus.PINNED;
+      default:
+        return BotStatus.ENABLED;
+    }
+  }
+
   async findAllUnresolved(): Promise<Prisma.BotGetPayload<{
     include: {
       users: {
@@ -574,6 +587,9 @@ export class BotService {
       }
       updateBotDto.endDate = new Date(updateBotDto.endDate);
     }
+    if (updateBotDto.status) {
+      updateBotDto.status = this.getBotStatus(updateBotDto.status);
+    }
     const updatedBot = await this.prisma.bot.update({
       where: {
         id,