Merge pull request #82 from codegasms/fix/problem-solving-page

Fix code editor page so it runs all test cases and checks validity of the output

Author: virinci

app/api/orgs/[orgId]/contests/[contestId]/problems/[problemId]/service.ts

@@ -1,19 +1,16 @@
 import { db } from "@/db/drizzle";
-import { problems, contestProblems } from "@/db/schema";
+import { problems, contestProblems, testCases } from "@/db/schema";
 import { eq, and } from "drizzle-orm";
 import { getProblemIdFromCode } from "../../../../problems/service";
 
 export async function getContestProblem(
   contestId: number,
   problemCode: string,
 ) {
-  const problem = await db
+  // First, find the problem ID from the contest problems
+  const contestProblemResult = await db
     .select({
-      id: problems.id,
-      code: problems.code,
-      title: problems.title,
-      description: problems.description,
-      allowedLanguages: problems.allowedLanguages,
+      problemId: contestProblems.problemId,
       order: contestProblems.order,
     })
     .from(contestProblems)
@@ -26,11 +23,42 @@ export async function getContestProblem(
     )
     .limit(1);
 
-  if (!problem[0]) {
+  if (!contestProblemResult[0]) {
     throw new Error("Problem not found");
   }
 
-  return problem[0];
+  const { problemId, order } = contestProblemResult[0];
+
+  // Then, get the problem with its example test cases
+  const problem = await db.query.problems.findFirst({
+    where: eq(problems.id, problemId),
+    columns: {
+      id: true,
+      code: true,
+      title: true,
+      description: true,
+      allowedLanguages: true,
+    },
+    with: {
+      testCases: {
+        where: eq(testCases.kind, "example"),
+        columns: {
+          input: true,
+          output: true,
+        },
+      },
+    },
+  });
+
+  if (!problem) {
+    throw new Error("Problem not found");
+  }
+
+  // Add the order from contest problems
+  return {
+    ...problem,
+    order,
+  };
 }
 
 export async function updateContestProblem(

app/api/orgs/[orgId]/contests/[contestId]/problems/service.ts

@@ -1,6 +1,6 @@
 import { db } from "@/db/drizzle";
 import { contestProblems, problems } from "@/db/schema";
-import { eq } from "drizzle-orm";
+import { eq, and } from "drizzle-orm";
 
 export async function addProblemToContest(
   contestId: number,
@@ -46,3 +46,37 @@ export async function getContestProblems(contestId: number) {
     .where(eq(contestProblems.contestId, contestId))
     .orderBy(contestProblems.order);
 }
+
+export async function removeProblemFromContest(
+  orgId: number,
+  contestId: number,
+  problemCode: string,
+) {
+  return await db.transaction(async (tx) => {
+    // First, find the problem ID from the problem code
+    const problem = await tx.query.problems.findFirst({
+      where: and(eq(problems.orgId, orgId), eq(problems.code, problemCode)),
+    });
+
+    if (!problem) {
+      throw new Error("Problem not found");
+    }
+
+    // Delete the contest problem entry
+    const deleted = await tx
+      .delete(contestProblems)
+      .where(
+        and(
+          eq(contestProblems.contestId, contestId),
+          eq(contestProblems.problemId, problem.id),
+        ),
+      )
+      .returning();
+
+    if (deleted.length === 0) {
+      throw new Error("Problem not found in contest");
+    }
+
+    return deleted[0];
+  });
+}

app/api/orgs/[orgId]/problems/[problemId]/service.ts

@@ -1,12 +1,21 @@
 import { db } from "@/db/drizzle";
-import { problems, contestProblems } from "@/db/schema";
+import { problems, contestProblems, testCases } from "@/db/schema";
 import { eq, and } from "drizzle-orm";
 import { z } from "zod";
 import { updateProblemSchema } from "@/lib/validations";
 
 export async function getProblem(orgId: number, code: string) {
   const problem = await db.query.problems.findFirst({
     where: and(eq(problems.orgId, orgId), eq(problems.code, code)),
+    with: {
+      testCases: {
+        where: eq(testCases.kind, "example"),
+        columns: {
+          input: true,
+          output: true,
+        },
+      },
+    },
   });
 
   if (!problem) {