fix : get score logic (#59)

* fix : get score logic * fix : getscore logic
EdgeCrafters · Aug 26, 2023 · a1af2bc · a1af2bc
1 parent 1160216
commit a1af2bc
Show file tree

Hide file tree

Showing 13 changed files with 203 additions and 90 deletions.
diff --git a/package.json b/package.json
@@ -34,6 +34,7 @@
     "minio": "^7.1.1",
     "nestjs-minio": "^2.5.0",
     "nestjs-minio-client": "^2.1.0",
+    "papaparse": "^5.4.1",
     "passport": "^0.6.0",
     "passport-local": "^1.0.0",
     "reflect-metadata": "^0.1.13",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/prisma/migrations/20230826061858_/migration.sql b/prisma/migrations/20230826061858_/migration.sql
@@ -0,0 +1,9 @@
+-- AlterTable
+ALTER TABLE "UserTestCase" ADD COLUMN     "problemId" INTEGER,
+ADD COLUMN     "repoId" INTEGER;
+
+-- AddForeignKey
+ALTER TABLE "UserTestCase" ADD CONSTRAINT "UserTestCase_problemId_fkey" FOREIGN KEY ("problemId") REFERENCES "Problem"("id") ON DELETE SET NULL ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "UserTestCase" ADD CONSTRAINT "UserTestCase_repoId_fkey" FOREIGN KEY ("repoId") REFERENCES "Repo"("id") ON DELETE SET NULL ON UPDATE CASCADE;
diff --git a/prisma/schema.prisma b/prisma/schema.prisma
@@ -15,7 +15,6 @@ enum Role {
   Student
 }
 
-
 enum TestcaseType {
   OPENED
   HIDDEN
@@ -31,16 +30,16 @@ model User {
   score        Score[]
   UserGroup    UserRepo[]
   UserTestCase UserTestCase[]
-
 }
 
 model Repo {
   id   Int    @id @default(autoincrement())
   name String @unique @db.VarChar(255)
 
-  Problem  Problem[]
-  UserRepo UserRepo[]
-  TestCase TestCase[]
+  Problem      Problem[]
+  UserRepo     UserRepo[]
+  TestCase     TestCase[]
+  UserTestCase UserTestCase[]
 }
 
 model UserRepo {
@@ -64,14 +63,15 @@ model Score {
 }
 
 model Problem {
-  id       Int        @id @default(autoincrement())
-  title    String     @db.VarChar(255)
-  text     String     @db.Text
-  uuid     String     @default("null") @db.VarChar(255)
-  score    Score[]
-  testCase TestCase[]
-  Repo     Repo       @relation(fields: [repoId], references: [id], onDelete: Cascade)
-  repoId   Int
+  id           Int            @id @default(autoincrement())
+  title        String         @db.VarChar(255)
+  text         String         @db.Text
+  uuid         String         @default("null") @db.VarChar(255)
+  score        Score[]
+  testCase     TestCase[]
+  Repo         Repo           @relation(fields: [repoId], references: [id], onDelete: Cascade)
+  repoId       Int
+  UserTestCase UserTestCase[]
 }
 
 model TestCase {
@@ -93,4 +93,8 @@ model UserTestCase {
   userId     Int
   TestCase   TestCase @relation(fields: [testCaseId], references: [id])
   testCaseId Int
+  Problem    Problem? @relation(fields: [problemId], references: [id])
+  problemId  Int?
+  Repo       Repo?    @relation(fields: [repoId], references: [id])
+  repoId     Int?
 }
diff --git a/src/auth/auth.service.ts b/src/auth/auth.service.ts
@@ -14,14 +14,15 @@ export class AuthService {
   async validateUser(
     username: string,
     password: string
-  ): Promise<{ userId: number }> {
+  ): Promise<{ userId: number; username: string }> {
     const user = await this.prisma.user.findUnique({
       where: {
         username
       },
       select: {
         id: true,
-        password: true
+        password: true,
+        username: true
       }
     })
 
@@ -36,7 +37,8 @@ export class AuthService {
     }
 
     return {
-      userId: user.id
+      userId: user.id,
+      username: user.username
     }
   }
 
@@ -57,11 +59,14 @@ export class AuthService {
     return user.role === Role.Tutor
   }
 
-  async deSerializeUser(userId: number): Promise<{ userId: number }> {
+  async deSerializeUser(
+    userId: number
+  ): Promise<{ userId: number; username: string }> {
     const user = await this.prisma.user.findUnique({
       where: { id: userId },
       select: {
-        id: true
+        id: true,
+        username: true
       }
     })
 
@@ -70,7 +75,8 @@ export class AuthService {
     }
 
     return {
-      userId: user.id
+      userId: user.id,
+      username: user.username
     }
   }
 

diff --git a/src/auth/class/authenticated-user.class.ts b/src/auth/class/authenticated-user.class.ts
@@ -1,10 +1,17 @@
 export class AuthenticatedUser {
   #userId: number
-  constructor(userId: number) {
+  #username: string
+
+  constructor(userId: number, username: string) {
     this.#userId = userId
+    this.#username = username
   }
 
   get userId() {
     return this.#userId
   }
+
+  get username() {
+    return this.#username
+  }
 }
diff --git a/src/auth/serializer/local.serializer.ts b/src/auth/serializer/local.serializer.ts
@@ -15,7 +15,9 @@ export class LocalSerializer extends PassportSerializer {
   async deserializeUser(userId: number, done: CallableFunction) {
     return await this.authService
       .deSerializeUser(userId)
-      .then((user) => done(null, new AuthenticatedUser(user.userId)))
+      .then((user) =>
+        done(null, new AuthenticatedUser(user.userId, user.username))
+      )
       .catch((error) => done(error))
   }
 }
diff --git a/src/auth/strategy/local.strategy.ts b/src/auth/strategy/local.strategy.ts
@@ -19,7 +19,7 @@ export class LocalStrategy extends PassportStrategy(Strategy) {
     if (!user) {
       throw new UnauthorizedException()
     } else {
-      return new AuthenticatedUser(user.userId)
+      return new AuthenticatedUser(user.userId, user.username)
     }
   }
 }
diff --git a/src/submit/dto/score.dto.ts b/src/submit/dto/score.dto.ts
@@ -0,0 +1,33 @@
+import { IsNotEmpty, IsNumber, IsString } from 'class-validator'
+
+export class ScoreDTO {
+  @IsNumber()
+  @IsNotEmpty()
+  problemId: number
+
+  @IsString()
+  @IsNotEmpty()
+  problemName: string
+
+  @IsNumber()
+  @IsNotEmpty()
+  pass: number
+
+  @IsNumber()
+  @IsNotEmpty()
+  total: number
+}
+
+export class ScoreCSVDTO {
+  @IsNumber()
+  @IsNotEmpty()
+  problemId: number
+
+  @IsString()
+  @IsNotEmpty()
+  problemName: string
+
+  @IsString()
+  @IsNotEmpty()
+  data: string
+}
diff --git a/src/submit/submit.controller.ts b/src/submit/submit.controller.ts
@@ -1,8 +1,9 @@
 import { Controller, Get, Param, ParseIntPipe, Req } from '@nestjs/common'
 import { SubmitService } from './submit.service'
 import { Roles } from 'src/common/decorator/roles.decorator'
-import { Role, type Score } from '@prisma/client'
+import { Role } from '@prisma/client'
 import { AuthenticatedRequest } from 'src/common/interface/authenticated-request.interface'
+import type { ScoreCSVDTO, ScoreDTO } from './dto/score.dto'
 
 @Controller('submit')
 export class SubmitController {
@@ -12,34 +13,35 @@ export class SubmitController {
   async getMyScore(
     @Param('problemId', ParseIntPipe) problemId: number,
     @Req() req: AuthenticatedRequest
-  ): Promise<Score> {
-    return await this.submitService.getScore(req.user.userId, problemId)
+  ): Promise<ScoreDTO> {
+    return await this.submitService.getScore(req.user.username, problemId)
   }
 
-  @Get('result/userId/:userId/problemId/:problemId')
+  @Get('result/username/:username/problemId/:problemId')
   @Roles(Role.Tutor)
   async getStudentScore(
-    @Param('userId', ParseIntPipe) userId: number,
+    @Param('username') username: string,
     @Param('problemId', ParseIntPipe) problemId: number
-  ): Promise<Score> {
-    return await this.submitService.getScore(userId, problemId)
+  ): Promise<ScoreDTO> {
+    console.log(username, problemId)
+    return await this.submitService.getScore(username, problemId)
   }
 
-  @Get('result/all/userId/:userId/reopId/:reopId')
+  @Get('result/all/username/:username/reopId/:reopId')
   @Roles(Role.Tutor)
   async getStudentScores(
-    @Param('userId', ParseIntPipe) userId: number,
+    @Param('username') username: string,
     @Param('reopId', ParseIntPipe) reopId: number
-  ): Promise<Score[]> {
-    return await this.submitService.getRepoScores(userId, reopId)
+  ): Promise<ScoreDTO[]> {
+    return await this.submitService.getRepoScores(username, reopId)
   }
 
   @Get('result/all/problemId/:problemId/reopId/:reopId')
   @Roles(Role.Tutor)
   async getRepoProblemScores(
     @Param('problemId', ParseIntPipe) problemId: number,
     @Param('reopId', ParseIntPipe) repoId: number
-  ): Promise<Score[]> {
+  ): Promise<ScoreCSVDTO> {
     return await this.submitService.getRepoProblemScores(problemId, repoId)
   }
 }