From 2e269d390e63f52a3f95aebb37426d22a8f24729 Mon Sep 17 00:00:00 2001
From: yassinedorbozgithub <yassine.dorboz.2022@gmail.com>
Date: Mon, 13 Jan 2025 15:37:55 +0100
Subject: [PATCH] fix: update Chat module unit tests

---
 api/src/chat/dto/block.dto.ts        |  2 +-
 api/src/chat/schemas/block.schema.ts | 12 +++++++-----
 api/src/chat/services/bot.service.ts |  2 +-
 api/src/utils/test/fixtures/block.ts |  1 -
 api/src/utils/test/mocks/block.ts    |  2 +-
 5 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/api/src/chat/dto/block.dto.ts b/api/src/chat/dto/block.dto.ts
index 68793f24..b7564714 100644
--- a/api/src/chat/dto/block.dto.ts
+++ b/api/src/chat/dto/block.dto.ts
@@ -84,7 +84,7 @@ export class BlockCreateDto {
   @IsObjectId({
     message: 'Attached block must be a valid objectId',
   })
-  attachedBlock?: string;
+  attachedBlock?: string | null;
 
   @ApiProperty({ description: 'Block category', type: String })
   @IsNotEmpty()
diff --git a/api/src/chat/schemas/block.schema.ts b/api/src/chat/schemas/block.schema.ts
index e7482124..9f155d0e 100644
--- a/api/src/chat/schemas/block.schema.ts
+++ b/api/src/chat/schemas/block.schema.ts
@@ -139,10 +139,12 @@ export class Block extends BlockStub {
   @Transform(({ obj }) => obj.nextBlocks.map((elem) => elem.toString()))
   nextBlocks: string[];
 
-  @Transform(({ obj }) => obj.attachedBlock?.toString() || null)
-  attachedBlock: string;
+  @Transform(({ obj }) =>
+    obj.attachedBlock ? obj.attachedBlock.toString() : null,
+  )
+  attachedBlock: string | null;
 
-  @Transform(({ obj }) => obj.category.toString())
+  @Transform(({ obj }) => (obj.category ? obj.category.toString() : null))
   category: string | null;
 
   @Exclude()
@@ -164,10 +166,10 @@ export class BlockFull extends BlockStub {
   nextBlocks: Block[];
 
   @Type(() => Block)
-  attachedBlock: Block;
+  attachedBlock: Block | null;
 
   @Type(() => Category)
-  category: Category;
+  category: Category | null;
 
   @Type(() => Block)
   previousBlocks?: Block[];
diff --git a/api/src/chat/services/bot.service.ts b/api/src/chat/services/bot.service.ts
index 6926b2ad..e04ad08a 100644
--- a/api/src/chat/services/bot.service.ts
+++ b/api/src/chat/services/bot.service.ts
@@ -251,7 +251,7 @@ export class BotService {
           // If there's labels, they should be already have been assigned
           assign_labels: [],
           trigger_labels: [],
-          attachedBlock: undefined,
+          attachedBlock: null,
           category: undefined as any,
           previousBlocks: [],
         };
diff --git a/api/src/utils/test/fixtures/block.ts b/api/src/utils/test/fixtures/block.ts
index 100aaae8..ed7c3e29 100644
--- a/api/src/utils/test/fixtures/block.ts
+++ b/api/src/utils/test/fixtures/block.ts
@@ -29,7 +29,6 @@ export const blockDefaultValues: TBlockFixtures['defaultValues'] = {
   trigger_channels: [],
   builtin: false,
   starts_conversation: false,
-  attachedBlock: null,
 };
 
 export const blocks: TBlockFixtures['values'][] = [
diff --git a/api/src/utils/test/mocks/block.ts b/api/src/utils/test/mocks/block.ts
index 864a39ee..392455e6 100644
--- a/api/src/utils/test/mocks/block.ts
+++ b/api/src/utils/test/mocks/block.ts
@@ -105,7 +105,7 @@ export const blockEmpty = {
   patterns: [],
   message: [''],
   nextBlocks: [],
-};
+} as unknown as BlockFull;
 
 // Translation Data
 export const textResult = ['Hi back !'];