Merge branch 'master' into delete-user

Author: cheehongw

api_gateway/src/proxy/service_addresses.ts

@@ -5,4 +5,4 @@ export const questionServiceUrl = isLocal ? "http://localhost:8080" : "http://qu
 export const userServiceHostUrl = isLocal ? "http://localhost:8081" : "http://user-service:8081/";
 export const matchServiceHostUrl = isLocal ? "http://localhost:8082" : "http://matching-service:8082"
 export const collabServiceHostUrl = isLocal ? "http://localhost:8083" : "http://collab-service:8083"
-export const executionServiceHostUrl = isLocal ? "http://localhost:8090" : "http://code-execution:8090";
+export const executionServiceHostUrl = isLocal ? "http://localhost:8090" : "http://code-execution:8090/";

code_execution/Dockerfile.prod

@@ -13,6 +13,7 @@ WORKDIR /usr/src/app
 COPY package*.json ./
 RUN npm ci --only=production
 COPY --from=builder /app/dist ./dist
+EXPOSE 8090
 
 # Command to run the application
 CMD ["npm", "run", "serve"]

code_execution/src/executor_client.ts

@@ -2,8 +2,9 @@ import axios from "axios";
 import { createBatchSubmission, getQnStdInOut } from "./testcases";
 import { callbacks, langToId } from "./shared";
 import { judge0Result, judge0submission, submissionResult } from "./types";
+import { submitSubmission } from "./submission_client";
 
-const JUDGE_API_URL = "https://judge0-ce.p.rapidapi.com"; //"http://judge0-server:2358/submissions";
+const JUDGE_API_URL = "http://peerprep-g10.com:2358"; //"https://judge0-ce.p.rapidapi.com";
 const API_KEY = process.env.JUDGE0_API_KEY;
 
 async function submitIndividual(submission: judge0submission) {
@@ -13,7 +14,6 @@ async function submitIndividual(submission: judge0submission) {
     {
       headers: {
         "Content-Type": "application/json",
-        "X-Rapidapi-Key": API_KEY,
       },
       params: { base64_encoded: "true" },
     }
@@ -29,7 +29,6 @@ async function submitCode(submission: judge0submission[]) {
     {
       headers: {
         "Content-Type": "application/json",
-        "X-Rapidapi-Key": API_KEY,
       },
       params: { base64_encoded: "true" },
     }
@@ -52,9 +51,6 @@ function pollIndividualTillComplete(
 ) {
   setTimeout(() => {
     const options = {
-      headers: {
-        "X-Rapidapi-Key": API_KEY,
-      },
       params: {
         fields: "status",
       },
@@ -114,7 +110,6 @@ async function delSubmissions(tokens: string[]) {
         params: { fields: "status_id" },
         headers: {
           "X-Judge0-User": "Auth-Judge0-User",
-          "X-Rapidapi-Key": API_KEY,
         },
       })
     )
@@ -155,8 +150,9 @@ export async function runSubmission(
   lang: string,
   qn__id: string,
   source_code: string,
-  userid: string
+  userid: number
 ) {
+  const submissionTime = new Date();
   const resDat: submissionResult = {
     completed: false,
     evaluated: 0,
@@ -190,4 +186,6 @@ export async function runSubmission(
 
   resDat.verdict = resDat.verdict === "Unknown" ? "Accepted" : resDat.verdict;
   resDat.completed = true;
-}
+
+  submitSubmission(resDat.verdict, lang, qn__id, userid, source_code, submissionTime); // runs in the bg
+}

code_execution/src/index.ts

@@ -38,7 +38,7 @@ app.get("/api/code/result/:token", async (req, res) => {
       return res.status(400).json({ error: "id not found" });
     }
 
-    res.json(response);
+    res.status(200).json(response);
   } catch (error) {
     console.error(error);
     res.status(500).json({ error: "An error occurred" });

code_execution/src/shared.ts

@@ -4,6 +4,6 @@ export const callbacks: callbackMapping = {};
 
 export const langToId: { [key: string]: number } = {
   "c++17": 76,
-  "python3": 92,
-  "java": 91,
-}
+  python3: 71,
+  java: 62,
+};

code_execution/src/submission_client.ts

@@ -0,0 +1,45 @@
+import axios from "axios";
+import { judge0Result, submissionResult } from "./types";
+
+type Question = {
+  id: number;
+  _id: string;
+  title: string;
+  description: string;
+  topics: string[];
+  difficulty: number;
+};
+
+const fetchQn = async (id: string) => {
+  const response = await axios.get<Question>(
+    `http://question-service:8080/api/questions/${id}`
+  );
+  return response.data;
+};
+
+export const submitSubmission = async (
+  verdict: string,
+  language: string,
+  qid: string,
+  userId: number,
+  sourceCode: string,
+  time: Date
+) => {
+  const question = await fetchQn(qid);
+  const submission = {
+    question__id: question._id,
+    userId: userId,
+    questionTitle: question.title,
+    questionId: question.id,
+    difficulty: question.difficulty,
+    topics: question.topics,
+    verdict: verdict,
+    sourceCode: sourceCode,
+    language: language,
+    answeredAt: time.toISOString(),
+  };
+  await axios.post(
+    `http://user-service:8081/api/users/${userId}/addquestions`,
+    submission
+  );
+};

docker-compose.yml

@@ -150,23 +150,6 @@ services:
       - "${PG_PORT}:5432"
     volumes:
       - postgres_data:/var/lib/postgresql/data/
-  
-
-  rabbitmq:
-    image: rabbitmq:3-management
-    container_name: rabbitmq
-    environment:
-      - RABBITMQ_DEFAULT_USER=guest
-      - RABBITMQ_DEFAULT_PASS=guest
-    ports:
-      - "5672:5672"
-      - "15672:15672"
-    healthcheck:
-      test: rabbitmq-diagnostics -q ping
-      interval: 30s
-      timeout: 30s
-      retries: 5
-      start_period: 30s
 
   redis:
     container_name: redis

docker_compose_dev.yml

@@ -127,22 +127,6 @@ services:
     volumes:
       - postgres_data:/var/lib/postgresql/data/
 
-  rabbitmq:
-    image: rabbitmq:3-management
-    container_name: rabbitmq
-    environment:
-      - RABBITMQ_DEFAULT_USER=guest
-      - RABBITMQ_DEFAULT_PASS=guest
-    ports:
-      - "5672:5672"
-      - "15672:15672"
-    healthcheck:
-      test: rabbitmq-diagnostics -q ping
-      interval: 30s
-      timeout: 30s
-      retries: 5
-      start_period: 30s
-
   redis:
     container_name: redis
     image: redis:7

frontend/src/api/code.ts

@@ -7,7 +7,7 @@ export async function submitCodeForExecution(data_payload: any) {
 }
 
 export async function getExecutionResult(token : string) {
-    const res = await apiGatewayClient.post(`/api/code/result/${token}`);
+    const res = await apiGatewayClient.get(`/api/code/result/${token}`);
 
     return res;
 }

frontend/src/api/gateway.ts

@@ -7,4 +7,4 @@ export const apiGatewayClient = axios.create({
 
 
 export const wsMatchMakeURL = process.env.NODE_ENV === 'production'? 'http://peerprep-g10.com:7999' : 'http://localhost:7999'
-export const wsCollabUrl = process.env.NODE_ENV === 'production'? 'ws://peerprep-g10.com:7998' :'ws://localhost:7998'
+export const wsCollabUrl = process.env.NODE_ENV === 'production'? 'ws://peerprep-g10.com:8083' :'ws://localhost:8083'