chore(be): rename files and add fields on contest-submission-summary-…

…for-one
skkuding · Aug 7, 2024 · d9a9971 · d9a9971
1 parent f33cfe3
commit d9a9971
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 11 deletions.
diff --git a/apps/backend/apps/admin/src/contest/contest.resolver.ts b/apps/backend/apps/admin/src/contest/contest.resolver.ts
@@ -21,7 +21,7 @@ import {
   RequiredIntPipe
 } from '@libs/pipe'
 import { ContestService } from './contest.service'
-import { ContestSubmissionSummary } from './model/contest-submission-information.model'
+import { ContestSubmissionSummaryForOne } from './model/contest-submission-summary-for-one.model'
 import { ContestWithParticipants } from './model/contest-with-participants.model'
 import { CreateContestInput } from './model/contest.input'
 import { UpdateContestInput } from './model/contest.input'
@@ -225,13 +225,14 @@ export class ContestResolver {
     }
   }
 
-  @Query(() => [ContestSubmissionSummary])
-  async getContestSubmissionSummaries(
+  // TODO: 특정 User의 특정 Contest에 대한 점수만 요약해 불러오는 함수 필요
+  @Query(() => [ContestSubmissionSummaryForOne])
+  async getContestSubmissionSummaryByUserId(
     @Args('contestId', { type: () => Int }, IDValidationPipe) contestId: number,
     @Args('userId', { type: () => Int }, IDValidationPipe) userId: number
   ) {
     try {
-      return await this.contestService.getContestSubmissionSummaries(
+      return await this.contestService.getContestSubmissionSummaryByUserId(
         contestId,
         userId
       )

diff --git a/apps/backend/apps/admin/src/contest/contest.service.spec.ts b/apps/backend/apps/admin/src/contest/contest.service.spec.ts
@@ -150,7 +150,8 @@ const submissionsWithProblemTitleAndUsername = {
     title: 'submission'
   },
   user: {
-    username: 'user01'
+    username: 'user01',
+    studentId: '1234567890'
   }
 }
 
@@ -366,14 +367,16 @@ describe('ContestService', () => {
     })
   })
 
-  describe('getContestSubmissionSummaries', () => {
+  describe('getContestSubmissionSummaryByUserId', () => {
     it('should return contest submission summaries', async () => {
-      const res = await service.getContestSubmissionSummaries(1, 1)
+      const res = await service.getContestSubmissionSummaryByUserId(1, 1)
 
       expect(res).to.deep.equal([
         {
           contestId: 1,
           problemTitle: 'submission',
+          username: 'user01',
+          studentId: '1234567890',
           submissionResult: 'ACCEPTED',
           language: 'C',
           submissionTime: '2000-01-01',

diff --git a/apps/backend/apps/admin/src/contest/contest.service.ts b/apps/backend/apps/admin/src/contest/contest.service.ts
@@ -372,7 +372,7 @@ export class ContestService {
     return contestProblems
   }
 
-  async getContestSubmissionSummaries(contestId: number, userId: number) {
+  async getContestSubmissionSummaryByUserId(contestId: number, userId: number) {
     const submissions = await this.prisma.submission.findMany({
       where: {
         userId,
@@ -386,7 +386,8 @@ export class ContestService {
         },
         user: {
           select: {
-            username: true
+            username: true,
+            studentId: true
           }
         }
       }
@@ -397,6 +398,8 @@ export class ContestService {
         return {
           contestId: submission.contestId,
           problemTitle: submission.problem.title,
+          username: submission.user?.username,
+          studentId: submission.user?.studentId,
           submissionResult: submission.result,
           language: submission.language,
           submissionTime: submission.createTime,

diff --git a/...l/contest-submission-information.model.ts → ...ntest-submission-summary-for-one.model.ts b/...l/contest-submission-information.model.ts → ...ntest-submission-summary-for-one.model.ts
@@ -4,14 +4,20 @@ import { Language, ResultStatus } from '@admin/@generated'
 /**
  * 특정 User의 특정 Contest에 대한 Submission 정보 (!== model SubmissionResult)
  */
-@ObjectType({ description: 'contestSubmissionSummary' })
-export class ContestSubmissionSummary {
+@ObjectType({ description: 'ContestSubmissionSummaryForOne' })
+export class ContestSubmissionSummaryForOne {
   @Field(() => Int, { nullable: false })
   contestId: number
 
   @Field(() => String, { nullable: false })
   problemTitle: string
 
+  @Field(() => String, { nullable: false })
+  username: string
+
+  @Field(() => String, { nullable: false })
+  studentId: string
+
   @Field(() => ResultStatus, { nullable: false })
   submissionResult: ResultStatus // Accepted, RuntimeError, ...