Merge branch 'develop' into hotfix/scoreboard-hotfix

boostcampwm2023 · Dec 12, 2023 · e3e50b6 · e3e50b6
2 parents 66ede66 + 870c2ec
commit e3e50b6
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 8 deletions.
diff --git a/server/src/problem/problem.service.ts b/server/src/problem/problem.service.ts
@@ -54,9 +54,14 @@ export class ProblemService {
  }
 
  async getProblemsByBojProblemIds(bojProblemIds: number[]) {
- return await this.problemRepository
- .createQueryBuilder('problem')
- .where('problem.bojProblemId IN (:...bojProblemIds)', { bojProblemIds })
- .getMany();
+ const problemEntities: Problem[] = [];
+ for (const bojProblemId of bojProblemIds) {
+ const problem = await this.getProblemByBojProblemId(bojProblemId);
+ if (problem == null) {
+ throw new Error(`bojProblemId ${bojProblemId} not found`);
+ }
+ problemEntities.push(problem);
+ }
+ return problemEntities;
  }
 }
diff --git a/server/src/socket/socket.service.ts b/server/src/socket/socket.service.ts
@@ -155,15 +155,17 @@ export class SocketService {
  throw new WsException('방장이 아닙니다.');
  }
 
+ this.logger.debug(util.inspect(startingRoomInfo));
+
  // update room entity properties: problems, isStarted, endAt
 
- const { problems, duration, isStarted } = startingRoomInfo;
+ const { problems, duration } = startingRoomInfo;
  if (problems == null) throw new WsException('problems is null');
- if (isStarted == null) throw new WsException('isStarted is null');
  if (duration == null) throw new WsException('duration is null');
  const bojProblemIds = problems.map((problem) => problem.bojProblemId);
- room.problems =
- this.problemService.getProblemsByBojProblemIds(bojProblemIds);
+ const problemEntities =
+ await this.problemService.getProblemsByBojProblemIds(bojProblemIds);
+ room.problems = Promise.resolve(problemEntities);
 
  room.isStarted = true;
  room.endAt = new Date(Date.now() + duration * 60 * 1000);