Merge branch 'dev' into feat/queue-strategy

J-Hoplin · Feb 17, 2024 · e4d99d8 · e4d99d8
2 parents d66e23d + 4b7b0a9
commit e4d99d8
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -5,6 +5,12 @@
   - J-Hoplin: Backend & Infrastructure
   - Oseungkwon: Frontend
 
+## Web Scraper
+
+Use web scraper to fill problem and problem example datas. **You need to run this scraper after you execute `Online Judge System` once.**
+
+- [Repository](https://github.com/J-Hoplin/Online-Judge-Scraper)
+
 ## Contents
 
 - [📦Diagram](#diagram)

diff --git a/prisma/migrations/20240212092633_problem_longtext/migration.sql b/prisma/migrations/20240212092633_problem_longtext/migration.sql
@@ -0,0 +1,4 @@
+-- AlterTable
+ALTER TABLE `problem` MODIFY `problem` LONGTEXT NOT NULL,
+    MODIFY `input` LONGTEXT NOT NULL,
+    MODIFY `output` LONGTEXT NOT NULL;
diff --git a/prisma/schema.prisma b/prisma/schema.prisma
@@ -40,9 +40,9 @@ enum UserType {
 model Problem {
   id            Int    @id @default(autoincrement())
   title         String @default("New Problem") // 제목
-  problem       String @default("Problem Here") // 문제
-  input         String @default("Input Here") // 입력
-  output        String @default("Output Here") // 출력
+  problem       String @db.LongText // 문제
+  input         String @db.LongText // 입력
+  output        String @db.LongText // 출력
   timeLimit     Int    @default(5) // 시간제한(Second)
   memoryLimit   Int    @default(128) // 메모리제한(MB)
   // 1:N relation with User
@@ -69,8 +69,8 @@ model Problem {
 
 model ProblemExample {
   id       Int     @id @default(autoincrement())
-  input    String  @default("")
-  output   String  @default("")
+  input    String  @db.LongText
+  output   String  @db.LongText
   isPublic Boolean @default(true) // If it's public example
 
   // 1:N relation with Problem

diff --git a/src/judge/contributer/contributer.service.ts b/src/judge/contributer/contributer.service.ts
@@ -45,6 +45,9 @@ export class ContributerService {
     return this.prisma.problem.create({
       data: {
         title: 'New Problem',
+        problem: 'Problem Here',
+        input: 'Input Here',
+        output: 'Output Here',
         contributerId: uid,
         tags: [],
       },

diff --git a/src/judge/judge.controller.e2e-spec.ts b/src/judge/judge.controller.e2e-spec.ts
@@ -106,7 +106,8 @@ describe('/judge Judge Controller', () => {
     it('should generate problme example', async () => {
       const example = await request(app.getHttpServer())
         .post(`/judge/contribute/problems/${problemId}/examples`)
-        .set('Authorization', BearerTokenHeader(adminToken));
+        .set('Authorization', BearerTokenHeader(adminToken))
+        .send({ input: 'Example', output: 'Output', isPublic: true });
       expect(example.statusCode).toBe(201);
       exampleId = example.body['id'];
     });

diff --git a/src/judge/judge.service.spec.ts b/src/judge/judge.service.spec.ts
@@ -80,6 +80,9 @@ describe('JudgeService', () => {
     problem1 = await prisma.problem.create({
       data: {
         title: 'Have Example',
+        problem: '',
+        input: '',
+        output: '',
         contributerId: user1.id,
         tags: [],
         isOpen: true,
@@ -97,6 +100,9 @@ describe('JudgeService', () => {
     problem2 = await prisma.problem.create({
       data: {
         title: 'No Example',
+        problem: '',
+        input: '',
+        output: '',
         contributerId: user1.id,
         tags: [],
         isOpen: true,
@@ -106,6 +112,9 @@ describe('JudgeService', () => {
     problem3 = await prisma.problem.create({
       data: {
         title: 'Closed Problem',
+        problem: '',
+        input: '',
+        output: '',
         contributerId: user1.id,
         tags: [],
         isOpen: false,