fix(be): integrate problem exposeTIme isVisible

skkuding · Apr 29, 2024 · 9754226 · 9754226
1 parent d249bbc
commit 9754226
Show file tree

Hide file tree

Showing 9 changed files with 62 additions and 28 deletions.
diff --git a/apps/backend/apps/admin/src/problem/mock/mock.ts b/apps/backend/apps/admin/src/problem/mock/mock.ts
@@ -48,9 +48,8 @@ export const problems: Problem[] = [
     acceptedRate: 0.5,
     createTime: faker.date.past(),
     updateTime: faker.date.past(),
-    exposeTime: faker.date.anytime(),
+    exposeTime: new Date(),
     samples: [],
-    isVisible: true,
     engTitle: null,
     engDescription: null,
     engHint: null,
@@ -77,9 +76,8 @@ export const problems: Problem[] = [
     acceptedRate: 0.5,
     createTime: faker.date.past(),
     updateTime: faker.date.past(),
-    exposeTime: faker.date.anytime(),
+    exposeTime: new Date(),
     samples: [],
-    isVisible: true,
     engTitle: null,
     engDescription: null,
     engHint: null,
@@ -136,9 +134,8 @@ export const importedProblems: Problem[] = [
     acceptedRate: 0.5,
     createTime: faker.date.past(),
     updateTime: faker.date.past(),
-    exposeTime: faker.date.anytime(),
+    exposeTime: new Date(),
     samples: [],
-    isVisible: true,
     engTitle: null,
     engDescription: null,
     engHint: null,
@@ -181,9 +178,8 @@ export const importedProblems: Problem[] = [
     acceptedRate: 0.5,
     createTime: faker.date.past(),
     updateTime: faker.date.past(),
-    exposeTime: faker.date.anytime(),
+    exposeTime: new Date(),
     samples: [],
-    isVisible: true,
     engTitle: null,
     engDescription: null,
     engHint: null,

diff --git a/apps/backend/apps/admin/src/problem/model/problem.constants.ts b/apps/backend/apps/admin/src/problem/model/problem.constants.ts
@@ -43,3 +43,5 @@ export const ImportedProblemHeader: string[] = [
   'AnswerDetail',
   'AnswerYn'
 ]
+
+export const maxDate: Date = new Date('2999-12-31T00:00:00.000Z')
diff --git a/apps/backend/apps/admin/src/problem/problem.service.ts b/apps/backend/apps/admin/src/problem/problem.service.ts
@@ -20,6 +20,7 @@ import {
 import { PrismaService } from '@libs/prisma'
 import { StorageService } from '@admin/storage/storage.service'
 import { ImportedProblemHeader } from './model/problem.constants'
+import { maxDate } from './model/problem.constants'
 import type {
   CreateProblemInput,
   UploadFileInput,
@@ -49,7 +50,15 @@ export class ProblemService {
     userId: number,
     groupId: number
   ) {
-    const { languages, template, tagIds, samples, testcases, ...data } = input
+    const {
+      languages,
+      template,
+      tagIds,
+      samples,
+      testcases,
+      isVisible,
+      ...data
+    } = input
     if (!languages.length) {
       throw new UnprocessableDataException(
         'A problem should support at least one language'
@@ -66,6 +75,7 @@ export class ProblemService {
     const problem = await this.prisma.problem.create({
       data: {
         ...data,
+        exposeTime: isVisible ? new Date() : maxDate,
         samples: {
           create: samples
         },
@@ -324,7 +334,16 @@ export class ProblemService {
   }
 
   async updateProblem(input: UpdateProblemInput, groupId: number) {
-    const { id, languages, template, tags, testcases, samples, ...data } = input
+    const {
+      id,
+      languages,
+      template,
+      tags,
+      testcases,
+      samples,
+      isVisible,
+      ...data
+    } = input
     const problem = await this.getProblem(id, groupId)
 
     if (languages && !languages.length) {
@@ -359,6 +378,7 @@ export class ProblemService {
             }
           })
         },
+        ...(isVisible && { exposeTime: isVisible ? new Date() : maxDate }),
         ...(languages && { languages }),
         ...(template && { template: [JSON.stringify(template)] }),
         problemTag

diff --git a/apps/backend/apps/client/src/problem/mock/problem.mock.ts b/apps/backend/apps/client/src/problem/mock/problem.mock.ts
@@ -30,7 +30,6 @@ export const problems: Problem[] = [
     createTime: faker.date.past(),
     updateTime: faker.date.past(),
     template: [],
-    isVisible: true,
     engTitle: null,
     engDescription: null,
     engHint: null,
@@ -58,7 +57,6 @@ export const problems: Problem[] = [
     createTime: faker.date.past(),
     updateTime: faker.date.past(),
     template: [],
-    isVisible: true,
     engTitle: null,
     engDescription: null,
     engHint: null,

diff --git a/apps/backend/apps/client/src/problem/problem.repository.ts b/apps/backend/apps/client/src/problem/problem.repository.ts
@@ -111,8 +111,7 @@ export class ProblemRepository {
         },
         exposeTime: {
           lte: new Date()
-        },
-        isVisible: true
+        }
       },
       select: {
         ...this.problemsSelectOption,
@@ -135,8 +134,7 @@ export class ProblemRepository {
         },
         exposeTime: {
           lte: new Date()
-        },
-        isVisible: true
+        }
       }
     })
   }
@@ -167,7 +165,9 @@ export class ProblemRepository {
       where: {
         id: problemId,
         groupId,
-        isVisible: true
+        exposeTime: {
+          lte: new Date()
+        }
       },
       select: this.problemSelectOption
     })
@@ -207,7 +207,9 @@ export class ProblemRepository {
       where: {
         contestId,
         problem: {
-          isVisible: true
+          exposeTime: {
+            lte: new Date()
+          }
         }
       },
       select: {
@@ -224,7 +226,9 @@ export class ProblemRepository {
       where: {
         contestId,
         problem: {
-          isVisible: true
+          exposeTime: {
+            lte: new Date()
+          }
         }
       }
     })
@@ -239,7 +243,9 @@ export class ProblemRepository {
           problemId
         },
         problem: {
-          isVisible: true
+          exposeTime: {
+            lte: new Date()
+          }
         }
       },
       select: {
@@ -270,7 +276,9 @@ export class ProblemRepository {
       where: {
         workbookId,
         problem: {
-          isVisible: true
+          exposeTime: {
+            lte: new Date()
+          }
         }
       },
       select: {
@@ -287,7 +295,9 @@ export class ProblemRepository {
       where: {
         workbookId,
         problem: {
-          isVisible: true
+          exposeTime: {
+            lte: new Date()
+          }
         }
       }
     })
@@ -302,7 +312,9 @@ export class ProblemRepository {
           problemId
         },
         problem: {
-          isVisible: true
+          exposeTime: {
+            lte: new Date()
+          }
         }
       },
       select: {

diff --git a/apps/backend/apps/client/src/submission/mock/problem.mock.ts b/apps/backend/apps/client/src/submission/mock/problem.mock.ts
@@ -31,7 +31,6 @@ export const problems: Problem[] = [
     exposeTime: new Date(),
     createTime: faker.date.past(),
     updateTime: faker.date.past(),
-    isVisible: true,
     engTitle: null,
     engDescription: null,
     engHint: null,

diff --git a/apps/backend/prisma/migrations/20240409084147_remove_problem_is_visible/migration.sql b/apps/backend/prisma/migrations/20240409084147_remove_problem_is_visible/migration.sql
@@ -0,0 +1,8 @@
+/*
+  Warnings:
+
+  - You are about to drop the column `is_visible` on the `problem` table. All the data in the column will be lost.
+
+*/
+-- AlterTable
+ALTER TABLE "problem" DROP COLUMN "is_visible";
diff --git a/apps/backend/prisma/schema.prisma b/apps/backend/prisma/schema.prisma
@@ -167,7 +167,6 @@ model Problem {
   ///             "locked": boolean
   ///           }[]
   /// }
-  isVisible       Boolean    @default(true) @map("is_visible")
   template        Json[]
   languages       Language[]
   timeLimit       Int        @map("time_limit") // unit: MilliSeconds

diff --git a/apps/backend/prisma/seed.ts b/apps/backend/prisma/seed.ts
@@ -25,9 +25,9 @@ const fixturePath = join(__dirname, '__fixtures__')
 
 let superAdminUser: User
 let managerUser: User
-const users: User[] = []
 let publicGroup: Group
 let privateGroup: Group
+const users: User[] = []
 const problems: Problem[] = []
 const problemTestcases: ProblemTestcase[] = []
 const contests: Contest[] = []
@@ -895,7 +895,7 @@ const createProblems = async () => {
             }
           ]
         },
-        isVisible: false
+        exposeTime: new Date('2999-12-31T00:00:00.000Z')
       }
     })
   )
@@ -928,7 +928,7 @@ const createProblems = async () => {
             }
           ]
         },
-        isVisible: false
+        exposeTime: new Date('2999-12-31T00:00:00.000Z')
       }
     })
   )