Merge pull request #122 from ChooseTale/fix/create-game

Gwonyeong · web-flow · commit 28c8b1f085b3 · 2025-02-27T21:41:38.000+09:00
Fix/create game
diff --git a/local.docker-compose.yml b/local.docker-compose.yml
@@ -34,16 +34,3 @@ services:
     environment:
       ZOOKEEPER_CLIENT_PORT: 2181
       ZOOKEEPER_TICK_TIME: 2000
-
-  server:
-    build:
-      context: .
-      dockerfile: dev.dockerfile
-    ports:
-      - '5001:5001'
-      - '5002:5002'
-    depends_on:
-      - db
-      - kafka
-      - zookeeper
-    command: ['sh', '-c', 'yarn prisma migrate dev && yarn dev:docker']
diff --git a/src/common/chat-gpt/chatgpt.ts b/src/common/chat-gpt/chatgpt.ts
@@ -96,7 +96,7 @@ export class ChatGPT implements IChatGPTPagePort {
           },
         ],
       });
-
+      console.log(promptGPT.choices[0].message.content);
       if (promptGPT.choices[0].message.content === 'error') {
         return '';
       }
@@ -107,7 +107,7 @@ export class ChatGPT implements IChatGPTPagePort {
         n: 1,
         size: '1024x1024',
       });
-
+      console.log(imageResponse.data[0].url);
       const response = await axios.get(imageResponse.data[0].url ?? '', {
         responseType: 'stream',
       });
diff --git a/src/game-builder/choice/infrastructure/repositories/choice.repository.ts b/src/game-builder/choice/infrastructure/repositories/choice.repository.ts
@@ -73,21 +73,6 @@ export class ChoiceRepository implements IChoiceRepository {
   ): Promise<ChoiceDomainEntity> {
     try {
       // 페이지 버전 업데이트
-      const updatedPage = await (transaction ?? this.prisma).page.update({
-        data: {
-          version: {
-            increment: 1,
-          },
-        },
-        where: {
-          id: createChoiceReqDto.parentPageId,
-          version: fromPageVersion,
-        },
-      });
-
-      if (!updatedPage) {
-        throw new ConflictException('페이지가 업데이트 되지 않음.');
-      }
 
       // 선택지 생성
       await (transaction ?? this.prisma).choicePage.create({
@@ -118,6 +103,7 @@ export class ChoiceRepository implements IChoiceRepository {
 
       return toDomain(createdFromPage);
     } catch (err) {
+      console.log(err);
       throw new BadRequestException(`선택지 생성 실패`);
     }
   }
diff --git a/src/game-builder/game/application/controllers/dto/get-recomment-image.dto.ts b/src/game-builder/game/application/controllers/dto/get-recomment-image.dto.ts
@@ -1,4 +1,3 @@
 export class GetRecommentImageDto {
-  imageId: number;
   url: string;
 }
diff --git a/src/game-builder/game/application/controllers/game.controller.ts b/src/game-builder/game/application/controllers/game.controller.ts
@@ -32,6 +32,7 @@ import { GetDataGameResDto } from './dto/get-data-game.dto';
 import { AuthSerializeGuard } from '@@src/common/guard/auth.serielize.guard';
 import { IsMyGameGuard } from '@@src/game-builder/guard/is-my-game.guard';
 import { PublishGameUsecase } from '../usecases/publish.usecase';
+import { Genres } from '@prisma/client';
 
 @Controller('game')
 @UseGuards(AuthSerializeGuard)
@@ -198,11 +199,14 @@ export class GameController {
    * @summary 🟡(240726) 게임 추천 썸네일 이미지 생성
    */
   @Post(':gameId/recommend-image')
-  @UseGuards(IsMyGameGuard)
   async recommendImage(
     @Param('gameId', ParseIntPipe) gameId: number,
+    @Body() body: { title: string; description: string; genre: Genres },
   ): Promise<GetRecommentImageDto> {
-    return await this.getRecommandImageUseCase.execute(gameId);
+    return {
+      url: 'https://oaidalleapiprodscus.blob.core.windows.net/private/org-XyZTnjNifxUU5reDbdFFMkGG/user-7T71nvcI6lYXV6RIPeFEKyLz/img-UTKIe4S0m7qjfMBg6MnUo4n2.png?st=2025-02-24T11%3A17%3A25Z&se=2025-02-24T13%3A17%3A25Z&sp=r&sv=2024-08-04&sr=b&rscd=inline&rsct=image/png&skoid=d505667d-d6c1-4a0a-bac7-5c84a87759f8&sktid=a48cca56-e6da-484e-a814-9c849652bcb3&skt=2025-02-24T05%3A52%3A53Z&ske=2025-02-25T05%3A52%3A53Z&sks=b&skv=2024-08-04&sig=T5ODHUJygh1ZlMYVfSDo4WPUBDglVY2qUHpMfa5Y9T8%3D',
+    };
+    // return await this.getRecommandImageUseCase.execute(body);
   }
 
   /**
diff --git a/src/game-builder/game/application/usecases/get-recommand-image.usecase.ts b/src/game-builder/game/application/usecases/get-recommand-image.usecase.ts
@@ -3,6 +3,7 @@ import { IChatGPTPagePort } from '@@src/game-builder/page/domain/ports/output/ch
 import { BadRequestException, Inject, Injectable } from '@nestjs/common';
 import { IGameService } from '../../domain/ports/input/game.service.interface';
 import { IImageService } from '@@src/game-builder/images/domain/port/input/image.service.interface';
+import { Genres } from '@prisma/client';
 
 @Injectable()
 export class GetRecommandImageUseCase {
@@ -17,37 +18,19 @@ export class GetRecommandImageUseCase {
     private readonly imageService: IImageService,
   ) {}
 
-  async execute(gameId: number) {
-    const game = await this.gameService.getById(gameId);
-    const startingPage = await this.pagePort.getStartingPage(gameId);
-    if (!game) {
-      throw new Error('Game not found');
-    }
-    if (!startingPage) {
-      throw new Error('Starting page not found');
-    }
+  async execute(body: { title: string; description: string; genre: Genres }) {
     const image = await this.chatGPT.getThumbnailImage(
-      game.title,
-      game.description,
-      game.genre,
+      body.title,
+      body.description,
+      body.genre,
     );
 
     if (image === '') {
       throw new BadRequestException('이미지 생성에 실패했습니다.');
     }
 
-    const newImage = await this.imageService.uploadImageForGameThumbnail(
-      gameId,
-      [{ url: image }],
-    );
-
-    if (newImage.length > 1) {
-      throw new Error('Too many images');
-    }
-
     return {
-      imageId: newImage[0].id,
-      url: newImage[0].url,
+      url: image,
     };
   }
 }
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
@@ -62,11 +62,8 @@ export const toGetAllResMapper = (
 
   // 선택지가 연결되지 않은 페이지
   // parentId와 childId가 모두 존재하지 않는 페이지
-  const unconnectedPages = pages.filter((page) =>
-    choices.every(
-      (choice) =>
-        choice.parentPageId !== page.id && choice.childPageId !== page.id,
-    ),
+  const unconnectedPages = pages.filter(
+    (page) => !result.some((r) => r.id === page.id),
   );
 
   for (const page of unconnectedPages) {
@@ -82,7 +79,7 @@ export const toGetAllResMapper = (
       isStarting: page.isStarting,
       isEnding: page.isEnding,
       depth: -1,
-      choices: [],
+      choices: resChoices.filter((choice) => choice.fromPageId === page.id),
       fromPageIds: [],
     });
   }
diff --git a/src/game-builder/game/application/usecases/publish.usecase.ts b/src/game-builder/game/application/usecases/publish.usecase.ts
@@ -36,7 +36,13 @@ export class PublishGameUsecase {
 
       const trees = toGetAllResMapper(game, pages, choices);
 
+      let endingCount = 0;
+
       for (const page of trees.pages) {
+        if (page.isEnding && page.depth !== -1) {
+          endingCount++;
+        }
+
         const notExistLinkChoice = page.choices.filter(
           (choice) => !choice.toPageId,
         );
@@ -57,8 +63,8 @@ export class PublishGameUsecase {
       );
 
       await Promise.all(
-        unConnectedPages.map((page) => {
-          this.pageService.delete(page.id, transaction);
+        unConnectedPages.map(async (page) => {
+          await this.pageService.delete(page.id, transaction);
         }),
       );
 
@@ -70,6 +76,10 @@ export class PublishGameUsecase {
         throw new ConflictException('썸네일 이미지가 없습니다.');
       }
 
+      if (endingCount === 0) {
+        throw new ConflictException('연결된 엔딩 페이지가 존재하지 않습니다.');
+      }
+
       await this.gameService.update(
         gameId,
         game.userId,
diff --git a/src/my-page/game-builder/domain/entities/get-my-builded-games.entity.ts b/src/my-page/game-builder/domain/entities/get-my-builded-games.entity.ts
@@ -31,6 +31,7 @@ export class GetMyBuildedGamesEntity {
       if (!startingPage) {
         throw new ConflictException('Starting page not found');
       }
+
       return {
         id: game.id,
         title: game.title,
diff --git a/src/my-page/game-builder/domain/services/query/get-my-builded-game.query.service.ts b/src/my-page/game-builder/domain/services/query/get-my-builded-game.query.service.ts
@@ -1,20 +1,42 @@
 import { Genres, Prisma } from '@prisma/client';
 
 export type GetMyBuildedGameInclude = {
-  Page: true;
+  Page: {
+    where: {
+      deletedAt: null;
+    };
+  };
   thumbnail: true;
-  ChoicePage: true;
-  PlayGame: true;
+  ChoicePage: {
+    where: {
+      deletedAt: null;
+    };
+  };
+  PlayGame: {
+    where: {
+      deletedAt: null;
+    };
+  };
 };
 
 export class GetMyBuildedGameQueryService {
   private query: Prisma.GameFindManyArgs = { where: {}, include: {} };
   constructor(userId: number) {
     const include: GetMyBuildedGameInclude = {
-      Page: true,
+      Page: {
+        where: {
+          deletedAt: null,
+        },
+      },
       thumbnail: true,
-      ChoicePage: true,
-      PlayGame: true,
+      ChoicePage: {
+        where: {
+          deletedAt: null,
+        },
+      },
+      PlayGame: {
+        where: { deletedAt: null },
+      },
     };
     this.query.where = {
       userId,
diff --git a/src/my-page/game-play/application/dto/res/get-ended-group-game-list.res.dto.ts b/src/my-page/game-play/application/dto/res/get-ended-group-game-list.res.dto.ts
@@ -7,6 +7,10 @@ export class GetEndedGroupGameListResDto {
     thumbnail: {
       url: string | null;
     };
+    author: {
+      id: number;
+      name: string;
+    };
     endings: {
       playId: number;
       endingNumber: number;
diff --git a/src/my-page/game-play/domain/entities/get-ended-group-game-list.entity.ts b/src/my-page/game-play/domain/entities/get-ended-group-game-list.entity.ts
@@ -12,6 +12,10 @@ export class GetEndedGroupGameListEntity {
       totalEndingCount: number;
       thumbnailUrl: string | null;
     };
+    author: {
+      id: number;
+      name: string;
+    };
     endings: {
       playId: number;
       endingNumber: number;
@@ -34,6 +38,10 @@ export class GetEndedGroupGameListEntity {
           totalEndingCount: playGame.game.Page.length,
           thumbnailUrl: getImagePathOrNull(playGame.game.thumbnail?.url),
         },
+        author: {
+          id: playGame.game.User.id,
+          name: playGame.game.User.nickname,
+        },
         endings: playGame.game.PlayGame.map((p) => {
           const endingPage = p.UserChoice[0].choicePage.toPage;
 
diff --git a/src/my-page/game-play/domain/services/mapper/to-get-ended-group-game-list.mapper.service.ts b/src/my-page/game-play/domain/services/mapper/to-get-ended-group-game-list.mapper.service.ts
@@ -14,6 +14,10 @@ export const toGetEndedGroupGameListResDto = (
         thumbnail: {
           url: game.game.thumbnailUrl,
         },
+        author: {
+          id: game.author.id,
+          name: game.author.name,
+        },
         endings: game.endings.map((ending) => {
           return {
             playId: ending.playId,
diff --git a/src/my-page/game-play/domain/services/query/get-ended-group-game-list.query.service.ts b/src/my-page/game-play/domain/services/query/get-ended-group-game-list.query.service.ts
@@ -5,6 +5,7 @@ export type EndedGroupGameInclude = {
   game: {
     include: {
       thumbnail: true;
+      User: true;
       PlayGame: {
         where: {
           deletedAt: null;
@@ -52,6 +53,7 @@ export class GetEndedGroupGameListQueryService extends ListParentQueryService {
       game: {
         include: {
           thumbnail: true,
+          User: true,
           PlayGame: {
             distinct: ['endingPageId'],
             orderBy: {

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`	`1`	`export class GetRecommentImageDto {`
`2`		`- imageId: number;`
`3`	`2`	`url: string;`
`4`	`3`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@ export class GetMyBuildedGamesEntity {`
`31`	`31`	`if (!startingPage) {`
`32`	`32`	`throw new ConflictException('Starting page not found');`
`33`	`33`	`}`
	`34`	`+`
`34`	`35`	`return {`
`35`	`36`	`id: game.id,`
`36`	`37`	`title: game.title,`