fix: 선택지에 description 제거

Gwonyeong · Gwonyeong · commit 8df5660268c7 · 2025-02-05T21:20:27.000+09:00
diff --git a/prisma/migrations/20250205113529_delete_choice_description/migration.sql b/prisma/migrations/20250205113529_delete_choice_description/migration.sql
@@ -0,0 +1,8 @@
+/*
+  Warnings:
+
+  - You are about to drop the column `description` on the `ChoicePage` table. All the data in the column will be lost.
+
+*/
+-- AlterTable
+ALTER TABLE "ChoicePage" DROP COLUMN "description";
diff --git a/prisma/schema.prisma b/prisma/schema.prisma
@@ -151,9 +151,9 @@ model ChoicePage {
   game   Game @relation(fields: [gameId], references: [id])
   gameId Int  @default(1)
 
-  title       String
-  description String
-  order       Int
+  title String
+
+  order Int
 
   UserChoice UserChoice[]
   createdAt  DateTime     @default(now())
diff --git a/src/common/kafka/chat-gpt/port/input/chat-gpt.service.interface.ts b/src/common/kafka/chat-gpt/port/input/chat-gpt.service.interface.ts
@@ -6,7 +6,6 @@ export interface IChatGPTKafkaPort {
     }[];
     choices: {
       title: string;
-      description: string;
     }[];
   }): Promise<void>;
 }
diff --git a/src/game-builder/choice/applications/controllers/choice.controller.ts b/src/game-builder/choice/applications/controllers/choice.controller.ts
@@ -48,7 +48,6 @@ export class ChoiceController {
     @Param('gameId', ParseIntPipe) gameId: number,
     @Body() body: CreateChoiceReqDto,
   ): Promise<CreateChoiceResDto> {
-    console.log(body);
     return await this.createChoiceUsecase.execute(gameId, body);
   }
 
diff --git a/src/game-builder/choice/applications/controllers/dto/update-choice.dto.ts b/src/game-builder/choice/applications/controllers/dto/update-choice.dto.ts
@@ -9,9 +9,6 @@ export class UpdateChoiceReqDto {
   @IsNotEmpty()
   title: string;
 
-  @IsString()
-  description: string;
-
   @IsNumber()
   @IsNotEmpty()
   parentPageId: number;
@@ -24,7 +21,7 @@ export class UpdateChoiceReqDto {
 export class UpdateChoiceResDto {
   id: number;
   title: string;
-  description: string;
+
   parentPageId: number;
   childPageId: number | null;
 }
diff --git a/src/game-builder/choice/applications/usecases/update-choice.usecase.ts b/src/game-builder/choice/applications/usecases/update-choice.usecase.ts
@@ -46,7 +46,7 @@ export class UpdateChoiceUseCase {
 
     const pageChoice = await this.choiceService.getAllByToPageId(parentPage.id);
 
-    if (pageChoice.length < 1) {
+    if (pageChoice.length < 1 && !parentPage.isStarting) {
       throw new ConflictException(
         '부모 페이지가 없으면 선택지를 만들 수 없습니다.',
       );
@@ -80,7 +80,6 @@ export class UpdateChoiceUseCase {
     return {
       id: newChoice.id,
       title: newChoice.title,
-      description: newChoice.description,
       parentPageId: newChoice.parentPageId,
       childPageId: newChoice.childPageId,
     };
diff --git a/src/game-builder/choice/domain/choice.service.ts b/src/game-builder/choice/domain/choice.service.ts
@@ -44,9 +44,11 @@ export class ChoiceService implements IChoiceService {
   async create(
     gameId: number,
     createChoiceReqDto: CreateChoiceReqDto,
+    transaction?: Prisma.TransactionClient,
   ): Promise<ChoiceDomainEntity> {
     const fromPage = await this.pageService.getOneById(
       createChoiceReqDto.parentPageId,
+      transaction,
     );
 
     if (!fromPage) {
@@ -57,6 +59,7 @@ export class ChoiceService implements IChoiceService {
     if (createChoiceReqDto.childPageId) {
       const childPage = await this.pageService.getOneById(
         createChoiceReqDto.childPageId,
+        transaction,
       );
       if (!childPage) {
         throw new NotFoundException('해당 페이지가 존재하지 않습니다.');
@@ -65,6 +68,7 @@ export class ChoiceService implements IChoiceService {
 
     const pageChoices = await this.choiceRepository.getAllByFromPageId(
       createChoiceReqDto.parentPageId,
+      transaction,
     );
 
     const pageChoice = new PageChoice(
@@ -79,13 +83,15 @@ export class ChoiceService implements IChoiceService {
       pageChoices.length + 1,
       createChoiceReqDto,
       fromPage.version,
+      transaction,
     );
     return choice;
   }
 
   async update(
     choiceId: number,
     updateChoiceReqDto: UpdateChoiceReqDto,
+    transaction?: Prisma.TransactionClient,
   ): Promise<ChoiceDomainEntity> {
     const choice = await this.choiceRepository.getOneById(choiceId);
     if (!choice) {
@@ -94,7 +100,7 @@ export class ChoiceService implements IChoiceService {
 
     choice.updateChoice(updateChoiceReqDto);
 
-    return this.choiceRepository.update(choiceId, choice);
+    return this.choiceRepository.update(choiceId, choice, transaction);
   }
 
   async updateOrder(
diff --git a/src/game-builder/choice/domain/entities/choice.entity.ts b/src/game-builder/choice/domain/entities/choice.entity.ts
@@ -4,7 +4,6 @@ export class ChoiceDomainEntity {
   constructor(
     public id: number,
     public title: string,
-    public description: string,
     public parentPageId: number,
     public childPageId: number | null,
     public order: number,
@@ -16,10 +15,6 @@ export class ChoiceDomainEntity {
     this.title = title;
   }
 
-  setDescription(description: string) {
-    this.description = description;
-  }
-
   setParentPageId(parentPageId: number) {
     this.parentPageId = parentPageId;
   }
@@ -34,8 +29,6 @@ export class ChoiceDomainEntity {
 
   updateChoice(updateChoiceReqDto: UpdateChoiceReqDto) {
     this.setTitle(updateChoiceReqDto.title);
-    this.setDescription(updateChoiceReqDto.description);
-    this.setParentPageId(updateChoiceReqDto.parentPageId);
     this.setChildPageId(updateChoiceReqDto.childPageId);
   }
 }
diff --git a/src/game-builder/choice/domain/port/input/choice.service.interface.ts b/src/game-builder/choice/domain/port/input/choice.service.interface.ts
@@ -23,10 +23,12 @@ export interface IChoiceService {
   create(
     gameId: number,
     createChoiceReqDto: CreateChoiceReqDto,
+    transaction?: Prisma.TransactionClient,
   ): Promise<ChoiceDomainEntity>;
   update(
     choiceId: number,
     updateChoiceReqDto: UpdateChoiceReqDto,
+    transaction?: Prisma.TransactionClient,
   ): Promise<ChoiceDomainEntity>;
   delete(
     choiceId: number,
diff --git a/src/game-builder/choice/infrastructure/mapper/choice.mapper.ts b/src/game-builder/choice/infrastructure/mapper/choice.mapper.ts
@@ -5,7 +5,6 @@ export const toDomain = (choice: ChoicePage): ChoiceDomainEntity => {
   return new ChoiceDomainEntity(
     choice.id,
     choice.title,
-    choice.description,
     choice.fromPageId,
     choice.toPageId,
     choice.order,
@@ -21,7 +20,6 @@ export const toEntity = (
   return {
     id: choice.id,
     title: choice.title,
-    description: choice.description,
     fromPageId: choice.parentPageId,
     toPageId: choice.childPageId,
     order: choice.order,
diff --git a/src/game-builder/choice/infrastructure/repositories/choice.repository.ts b/src/game-builder/choice/infrastructure/repositories/choice.repository.ts
@@ -95,7 +95,6 @@ export class ChoiceRepository implements IChoiceRepository {
           gameId,
           toPageId: createChoiceReqDto.childPageId ?? null,
           title: createChoiceReqDto.title,
-          description: '',
           order,
           fromPageId: createChoiceReqDto.parentPageId,
         },
@@ -131,8 +130,6 @@ export class ChoiceRepository implements IChoiceRepository {
     const updatedChoice = await (transaction ?? this.prisma).choicePage.update({
       data: {
         title: choice.title,
-        description: choice.description,
-        fromPageId: choice.parentPageId,
         toPageId: choice.childPageId,
         order: choice.order,
       },
diff --git a/src/game-builder/game/application/usecases/mapper/to-get-all-res.mapper.ts b/src/game-builder/game/application/usecases/mapper/to-get-all-res.mapper.ts
@@ -17,7 +17,6 @@ export const toGetAllResMapper = (
     fromPageId: choice.parentPageId,
     toPageId: choice.childPageId,
     title: choice.title,
-    description: choice.description,
     createdAt: choice.createdAt,
   }));
 
diff --git a/src/game-builder/page/application/controllers/dto/update-page.dto.ts b/src/game-builder/page/application/controllers/dto/update-page.dto.ts
@@ -1,5 +1,17 @@
 import { Transform, Type } from 'class-transformer';
-import { IsBoolean, IsString, Length } from 'class-validator';
+import {
+  IsArray,
+  IsBoolean,
+  IsString,
+  Length,
+  ValidateNested,
+} from 'class-validator';
+
+interface Choice {
+  id: number;
+  title: string;
+  childPageId: number | null;
+}
 
 export class UpdatePageReqDto {
   @IsString()
@@ -17,6 +29,10 @@ export class UpdatePageReqDto {
     return JSON.parse(value) == true;
   })
   isEnding: boolean;
+
+  @ValidateNested({ each: true })
+  @Transform(({ value }) => JSON.parse(value))
+  choices: Choice[];
 }
 
 export class UpdatePageResDto {
diff --git a/src/game-builder/page/application/usecases/get-recomment-choice.usecase.ts b/src/game-builder/page/application/usecases/get-recomment-choice.usecase.ts
@@ -26,7 +26,7 @@ export class GetRecommentChoiceUsecase {
       title: title,
       contents: page.contents,
       choices: choices.map((choice) => {
-        return { title: choice.title, description: choice.description };
+        return { title: choice.title };
       }),
     });
 
diff --git a/src/game-builder/page/application/usecases/update-page.usecase.ts b/src/game-builder/page/application/usecases/update-page.usecase.ts
@@ -12,6 +12,7 @@ import {
 import { IGameService } from '@@src/game-builder/game/domain/ports/input/game.service.interface';
 import { IChoiceService } from '@@src/game-builder/choice/domain/port/input/choice.service.interface';
 import { IImageService } from '@@src/game-builder/images/domain/port/input/image.service.interface';
+import { PrismaService } from '@@prisma/prisma.service';
 
 @Injectable()
 export class UpdatePageUsecase {
@@ -20,6 +21,7 @@ export class UpdatePageUsecase {
     @Inject('IGameService') private readonly gameService: IGameService,
     @Inject('IChoiceService') private readonly choiceService: IChoiceService,
     @Inject('IImageService') private readonly imageService: IImageService,
+    private readonly prisma: PrismaService,
   ) {}
 
   async excute(
@@ -28,45 +30,92 @@ export class UpdatePageUsecase {
     body: UpdatePageReqDto,
     file: Express.Multer.File,
   ): Promise<UpdatePageResDto> {
-    const game = await this.gameService.getById(gameId);
-    if (!game) {
-      throw new NotFoundException('게임을 찾을 수 없습니다.');
-    }
+    return await this.prisma.$transaction(async (transaction) => {
+      const game = await this.gameService.getById(gameId, transaction);
+      if (!game) {
+        throw new NotFoundException('게임을 찾을 수 없습니다.');
+      }
 
-    let backgroundImageId: number | null = null;
+      let backgroundImageId: number | null = null;
 
-    if (file) {
-      const uploadedImages = await this.imageService.uploadImageForPage({
-        url: `/${file.path}`,
-      });
-      backgroundImageId = uploadedImages.id;
-    }
+      if (file) {
+        const uploadedImages = await this.imageService.uploadImageForPage({
+          url: `/${file.path}`,
+        });
+        backgroundImageId = uploadedImages.id;
+      }
 
-    const page = await this.pageService.getOneById(pageId);
-    if (!page) {
-      throw new NotFoundException('페이지를 찾을 수 없습니다.');
-    }
+      const page = await this.pageService.getOneById(pageId, transaction);
+      if (!page) {
+        throw new NotFoundException('페이지를 찾을 수 없습니다.');
+      }
 
-    if (page.gameId !== gameId) {
-      throw new BadRequestException('게임과 페이지가 일치하지 않습니다.');
-    }
+      if (page.gameId !== gameId) {
+        throw new BadRequestException('게임과 페이지가 일치하지 않습니다.');
+      }
 
-    if (page.isStarting && body.isEnding) {
-      throw new BadRequestException(
-        '시작 페이지는 종료 페이지가 될 수 없습니다.',
+      if (page.isStarting && body.isEnding) {
+        throw new BadRequestException(
+          '시작 페이지는 종료 페이지가 될 수 없습니다.',
+        );
+      }
+
+      const updatedPage = await this.pageService.update(
+        pageId,
+        body,
+        backgroundImageId,
+        transaction,
+      );
+
+      const choices = await this.choiceService.getAllByFromPageId(
+        pageId,
+        transaction,
+      );
+
+      // 선택지 제거 먼저
+      const deleteChoices = choices.filter(
+        (choice) => !body.choices.some((c) => c.id === choice.id),
+      );
+
+      await Promise.all(
+        deleteChoices.map((choice) =>
+          this.choiceService.delete(choice.id, transaction),
+        ),
+      );
+
+      await Promise.all(
+        body.choices.map((choice) => {
+          if (choice.id !== -1) {
+            return this.choiceService.update(
+              choice.id,
+              {
+                parentPageId: pageId,
+                title: choice.title,
+                childPageId: choice.childPageId ?? null,
+              },
+              transaction,
+            );
+          }
+          if (choice.id === -1) {
+            return this.choiceService.create(
+              gameId,
+              {
+                parentPageId: pageId,
+                title: choice.title,
+                childPageId: choice.childPageId ?? undefined,
+              },
+              transaction,
+            );
+          }
+        }),
       );
-    }
 
-    const updatedPage = await this.pageService.update(
-      pageId,
-      body,
-      backgroundImageId,
-    );
-    return {
-      id: updatedPage.id,
-      title: updatedPage.title,
-      isEnding: updatedPage.isEnding,
-      contents: updatedPage.contents,
-    } as any;
+      return {
+        id: updatedPage.id,
+        title: updatedPage.title,
+        isEnding: updatedPage.isEnding,
+        contents: updatedPage.contents,
+      } as any;
+    });
   }
 }
diff --git a/src/game-play/play/applications/dto/get-play-game-screen.dto.ts b/src/game-play/play/applications/dto/get-play-game-screen.dto.ts
diff --git a/src/game-play/play/domain/entities/page.entity.ts b/src/game-play/play/domain/entities/page.entity.ts
diff --git a/src/game-play/play/domain/services/mapper/page.mapper.ts b/src/game-play/play/domain/services/mapper/page.mapper.ts
diff --git a/src/game-play/play/domain/usecases/get-play-game-screen.usecase.ts b/src/game-play/play/domain/usecases/get-play-game-screen.usecase.ts

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@ export interface IChatGPTKafkaPort {`
`6`	`6`	`}[];`
`7`	`7`	`choices: {`
`8`	`8`	`title: string;`
`9`		`- description: string;`
`10`	`9`	`}[];`
`11`	`10`	`}): Promise<void>;`
`12`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,6 @@ export class ChoiceController {`
`48`	`48`	`@Param('gameId', ParseIntPipe) gameId: number,`
`49`	`49`	`@Body() body: CreateChoiceReqDto,`
`50`	`50`	`): Promise<CreateChoiceResDto> {`
`51`		`- console.log(body);`
`52`	`51`	`return await this.createChoiceUsecase.execute(gameId, body);`
`53`	`52`	`}`
`54`	`53`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,6 @@ export class ChoiceDomainEntity {`
`4`	`4`	`constructor(`
`5`	`5`	`public id: number,`
`6`	`6`	`public title: string,`
`7`		`- public description: string,`
`8`	`7`	`public parentPageId: number,`
`9`	`8`	`public childPageId: number \| null,`
`10`	`9`	`public order: number,`
`@@ -16,10 +15,6 @@ export class ChoiceDomainEntity {`
`16`	`15`	`this.title = title;`
`17`	`16`	`}`
`18`	`17`
`19`		`- setDescription(description: string) {`
`20`		`- this.description = description;`
`21`		`- }`
`22`		`-`
`23`	`18`	`setParentPageId(parentPageId: number) {`
`24`	`19`	`this.parentPageId = parentPageId;`
`25`	`20`	`}`
`@@ -34,8 +29,6 @@ export class ChoiceDomainEntity {`
`34`	`29`
`35`	`30`	`updateChoice(updateChoiceReqDto: UpdateChoiceReqDto) {`
`36`	`31`	`this.setTitle(updateChoiceReqDto.title);`
`37`		`- this.setDescription(updateChoiceReqDto.description);`
`38`		`- this.setParentPageId(updateChoiceReqDto.parentPageId);`
`39`	`32`	`this.setChildPageId(updateChoiceReqDto.childPageId);`
`40`	`33`	`}`
`41`	`34`	`}`