hot-fix : creating user repo

EdgeCrafters · Aug 18, 2023 · 9da51e6 · 9da51e6
1 parent 21233c0
commit 9da51e6
Show file tree

Hide file tree

Showing 17 changed files with 43 additions and 176 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -7,6 +7,8 @@ services:
     image: mcr.microsoft.com/vscode/devcontainers/typescript-node:18-bullseye
     ports:
       - 4000:4000
+    expose:
+      - 4000
     volumes:
       - .:/workspace:cached
     stdin_open: true

diff --git a/prisma/migrations/20230727042812_/migration.sql b/prisma/migrations/20230727042812_/migration.sql
diff --git a/prisma/migrations/20230730083948_modify_testcase_table/migration.sql b/prisma/migrations/20230730083948_modify_testcase_table/migration.sql
diff --git a/prisma/migrations/20230730084056_modify_hiddencase_table/migration.sql b/prisma/migrations/20230730084056_modify_hiddencase_table/migration.sql
diff --git a/.../migrations/20230730130631_add_url_columns_on_testcase_and_hiddencase_table/migration.sql b/.../migrations/20230730130631_add_url_columns_on_testcase_and_hiddencase_table/migration.sql
diff --git a/prisma/migrations/20230802044433_/migration.sql b/prisma/migrations/20230802044433_/migration.sql
diff --git a/prisma/migrations/20230802044621_/migration.sql b/prisma/migrations/20230802044621_/migration.sql
diff --git a/prisma/migrations/20230806062344_/migration.sql b/prisma/migrations/20230806062344_/migration.sql
diff --git a/prisma/migrations/20230811131713_add_user_hidden_case_model/migration.sql b/prisma/migrations/20230811131713_add_user_hidden_case_model/migration.sql
diff --git a/prisma/migrations/20230811131938_add_is_correct_field_on_user_hidden_case/migration.sql b/prisma/migrations/20230811131938_add_is_correct_field_on_user_hidden_case/migration.sql
diff --git a/prisma/migrations/20230812090919_add_output_field_on_hidden_case/migration.sql b/prisma/migrations/20230812090919_add_output_field_on_hidden_case/migration.sql
diff --git a/prisma/migrations/20230817124452_/migration.sql b/prisma/migrations/20230817124452_/migration.sql
diff --git a/prisma/migrations/20230818063054_/migration.sql b/prisma/migrations/20230818063054_/migration.sql
diff --git a/...rations/20230717115256_init/migration.sql → .../migrations/20230818130322_/migration.sql b/...rations/20230717115256_init/migration.sql → .../migrations/20230818130322_/migration.sql
@@ -1,6 +1,9 @@
 -- CreateEnum
 CREATE TYPE "Role" AS ENUM ('Tutor', 'Student');
 
+-- CreateEnum
+CREATE TYPE "TestcaseType" AS ENUM ('OPENED', 'HIDDEN');
+
 -- CreateTable
 CREATE TABLE "User" (
     "id" SERIAL NOT NULL,
@@ -17,7 +20,6 @@ CREATE TABLE "User" (
 CREATE TABLE "Repo" (
     "id" SERIAL NOT NULL,
     "name" VARCHAR(255) NOT NULL,
-    "url" VARCHAR(255) NOT NULL,
 
     CONSTRAINT "Repo_pkey" PRIMARY KEY ("id")
 );
@@ -47,6 +49,7 @@ CREATE TABLE "Problem" (
     "id" SERIAL NOT NULL,
     "title" VARCHAR(255) NOT NULL,
     "text" TEXT NOT NULL,
+    "uuid" VARCHAR(255) NOT NULL DEFAULT 'null',
     "repoId" INTEGER NOT NULL,
 
     CONSTRAINT "Problem_pkey" PRIMARY KEY ("id")
@@ -57,19 +60,21 @@ CREATE TABLE "TestCase" (
     "id" SERIAL NOT NULL,
     "input" TEXT NOT NULL,
     "output" TEXT NOT NULL,
+    "isHidden" "TestcaseType" NOT NULL,
+    "repoId" INTEGER NOT NULL,
     "problemId" INTEGER NOT NULL,
 
     CONSTRAINT "TestCase_pkey" PRIMARY KEY ("id")
 );
 
 -- CreateTable
-CREATE TABLE "HiddenCase" (
+CREATE TABLE "UserTestCase" (
     "id" SERIAL NOT NULL,
-    "input" TEXT NOT NULL,
-    "output" TEXT NOT NULL,
-    "problemId" INTEGER NOT NULL,
+    "isCorrect" BOOLEAN,
+    "userId" INTEGER NOT NULL,
+    "testCaseId" INTEGER NOT NULL,
 
-    CONSTRAINT "HiddenCase_pkey" PRIMARY KEY ("id")
+    CONSTRAINT "UserTestCase_pkey" PRIMARY KEY ("id")
 );
 
 -- CreateIndex
@@ -78,6 +83,12 @@ CREATE UNIQUE INDEX "User_username_key" ON "User"("username");
 -- CreateIndex
 CREATE UNIQUE INDEX "User_nickname_key" ON "User"("nickname");
 
+-- CreateIndex
+CREATE UNIQUE INDEX "Repo_name_key" ON "Repo"("name");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "UserRepo_userId_repoId_key" ON "UserRepo"("userId", "repoId");
+
 -- AddForeignKey
 ALTER TABLE "UserRepo" ADD CONSTRAINT "UserRepo_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User"("id") ON DELETE CASCADE ON UPDATE CASCADE;
 
@@ -93,8 +104,14 @@ ALTER TABLE "Score" ADD CONSTRAINT "Score_problemId_fkey" FOREIGN KEY ("problemI
 -- AddForeignKey
 ALTER TABLE "Problem" ADD CONSTRAINT "Problem_repoId_fkey" FOREIGN KEY ("repoId") REFERENCES "Repo"("id") ON DELETE CASCADE ON UPDATE CASCADE;
 
+-- AddForeignKey
+ALTER TABLE "TestCase" ADD CONSTRAINT "TestCase_repoId_fkey" FOREIGN KEY ("repoId") REFERENCES "Repo"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
 -- AddForeignKey
 ALTER TABLE "TestCase" ADD CONSTRAINT "TestCase_problemId_fkey" FOREIGN KEY ("problemId") REFERENCES "Problem"("id") ON DELETE CASCADE ON UPDATE CASCADE;
 
 -- AddForeignKey
-ALTER TABLE "HiddenCase" ADD CONSTRAINT "HiddenCase_problemId_fkey" FOREIGN KEY ("problemId") REFERENCES "Problem"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+ALTER TABLE "UserTestCase" ADD CONSTRAINT "UserTestCase_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "UserTestCase" ADD CONSTRAINT "UserTestCase_testCaseId_fkey" FOREIGN KEY ("testCaseId") REFERENCES "TestCase"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
diff --git a/src/problem/problem.service.ts b/src/problem/problem.service.ts
@@ -63,6 +63,8 @@ export class ProblemService {
   }
 
   async isMemberOfRepo(userId: number, repoId: number): Promise<boolean> {
+    console.log(userId, repoId)
+
     const userRepo = await this.prisma.userRepo.findFirst({
       where: {
         userId,

diff --git a/src/repos/repos.controller.ts b/src/repos/repos.controller.ts
@@ -36,8 +36,14 @@ export class ReposController {
 
   @Roles(Role.Tutor)
   @Post()
-  async createRepo(@Body() createRepoDto: CreateRepoDto) {
-    const newRepo = await this.reposService.createNewRepo(createRepoDto)
+  async createRepo(
+    @Body() createRepoDto: CreateRepoDto,
+    @Req() req: AuthenticatedRequest
+  ) {
+    const newRepo = await this.reposService.createNewRepo(
+      createRepoDto,
+      req.user.userId
+    )
     return new CommonResponseDto({ repoId: newRepo.id })
   }
 

diff --git a/src/repos/repos.service.ts b/src/repos/repos.service.ts
@@ -33,7 +33,7 @@ export class ReposService {
     })
   }
 
-  async createNewRepo(createRepoDto: CreateRepoDto) {
+  async createNewRepo(createRepoDto: CreateRepoDto, userId: number) {
     const repoName = createRepoDto.repoName.toLowerCase()
     const repoExist = await this.prismaService.repo.findFirst({
       where: {
@@ -49,7 +49,12 @@ export class ReposService {
       await this.minio.makeBucket(repoName)
       return await tx.repo.create({
         data: {
-          name: repoName
+          name: repoName,
+          UserRepo: {
+            create: {
+              userId: userId
+            }
+          }
         }
       })
     })