Merge pull request #188 from CS3219-AY2425S1/184-nginx-for-collab-ser…

…vice

Bug Fix for CD

backend/collaboration-service/src/controllers/collab.controller.ts

@@ -5,7 +5,6 @@ import { SubmissionRequestDto, SubmissionResponseDto } from '@repo/submission-ty
 import { CollabDto } from '../types/CollabDto'
 import { createSession, getSessionById } from '../models/collab.repository'
 import judgeZero from '../services/judgezero.service'
-import config from '../common/config.util'
 
 export async function createSessionRequest(request: ITypedBodyRequest<CollabDto>, response: Response): Promise<void> {
     const collabDto = CollabDto.fromRequest(request)
@@ -76,7 +75,7 @@ export async function submitCode(request: ITypedBodyRequest<SubmissionRequestDto
         return
     }
 
-    const res = await judgeZero.post(config.JUDGE_ZERO_SUBMIT_CONFIG, request.body)
+    const res = await judgeZero.post('/submissions?base64_encoded=false&wait=true', request.body)
 
     if (!res) {
         response.status(400).json('Failed to submit code. Please try again.').send()

backend/collaboration-service/src/types/Config.ts

@@ -27,10 +27,6 @@ export class Config {
     @IsUrl({ require_tld: false })
     JUDGE_ZERO_URL: string
 
-    @IsString()
-    @IsNotEmpty()
-    JUDGE_ZERO_SUBMIT_CONFIG: string
-
     constructor(
         NODE_ENV: string,
         PORT: string,
@@ -39,8 +35,7 @@ export class Config {
         USER_SERVICE_URL: string,
         QUESTION_SERVICE_URL: string,
         MATCHING_SERVICE_URL: string,
-        JUDGE_ZERO_URL: string,
-        JUDGE_ZERO_SUBMIT_CONFIG: string
+        JUDGE_ZERO_URL: string
     ) {
         this.NODE_ENV = NODE_ENV ?? 'development'
         this.PORT = PORT ?? '3006'
@@ -50,7 +45,6 @@ export class Config {
         this.QUESTION_SERVICE_URL = QUESTION_SERVICE_URL
         this.MATCHING_SERVICE_URL = MATCHING_SERVICE_URL
         this.JUDGE_ZERO_URL = JUDGE_ZERO_URL
-        this.JUDGE_ZERO_SUBMIT_CONFIG = JUDGE_ZERO_SUBMIT_CONFIG
     }
 
     static fromEnv(env: { [key: string]: string | undefined }): Config {
@@ -62,8 +56,7 @@ export class Config {
             env.USER_SERVICE_URL!,
             env.QUESTION_SERVICE_URL!,
             env.MATCHING_SERVICE_URL!,
-            env.JUDGE_ZERO_URL!,
-            env.JUDGE_ZERO_SUBMIT_CONFIG!
+            env.JUDGE_ZERO_URL!
         )
     }
 

docker-compose.local.yml

@@ -38,7 +38,6 @@ services:
             - QUESTION_SERVICE_URL=http://question-service:3004
             - MATCHING_SERVICE_URL=http://matching-service:3006
             - JUDGE_ZERO_URL=http://judgezero-server:2358
-            - JUDGE_ZERO_SUBMIT_CONFIG=${JUDGE_ZERO_SUBMIT_CONFIG}
         restart: always
         networks:
             - backend-network

docker-compose.yml

@@ -45,7 +45,6 @@ services:
             - QUESTION_SERVICE_URL=http://question-service:3004
             - MATCHING_SERVICE_URL=http://matching-service:3006
             - JUDGE_ZERO_URL=http://judgezero-server:2358
-            - JUDGE_ZERO_SUBMIT_CONFIG=${JUDGE_ZERO_SUBMIT_CONFIG}
         restart: always
         networks:
             - backend-network