Merge pull request #4 from CODESPACE-CE-PROJECT/CE-008-Compiler

Ce 008 compiler

Author: UnixVextor

.dockerignore

@@ -6,6 +6,5 @@ node_modules/
 .gitignore
 dist/
 logs/
-ear
 .env.example
 .github

.env.example

@@ -1,2 +1,7 @@
 PORT=
-DOCKER_HOST=
+RMQUSER=
+RMQPASS=
+RMQHOST=
+REDISHOST=
+BACKEND_URL=
+JWT_SECRET=

.github/workflows/deployment.yml

@@ -28,20 +28,19 @@ jobs:
               uses: actions/checkout@v3
             - name: Set Environment Variables 🔠
               env:
-                PORT: ${{ secrets.PORT }}
                 RMQUSER: ${{ secrets.RMQUSER }}
                 RMQPASS: ${{ secrets.RMQPASS }}
                 RMQHOST: ${{ secrets.RMQHOST }} 
-                RMQNAME: ${{ secrets.RMQNAME }}  
+                REDISHOST: ${{ secrets.REDISHOST }}
                 BACKEND_URL: ${{ secrets.BACKEND_URL }} 
                 JWT_SECRET: ${{ secrets.JWT_SECRET }}
               run: |
-                echo "PORT=$PORT" >> .env
                 echo "JWT_SECRET=$JWT_SECRET" >> .env
                 echo "RMQUSER=$RMQUSER" >> .env
                 echo "RMQPASS=$RMQPASS" >> .env
                 echo "RMQHOST=$RMQHOST" >> .env
                 echo "RMQNAME=$RMQNAME" >> .env
+                echo "REDISHOST=$REDISHOST" >> .env
                 echo "BACKEND_URL=$BACKEND_URL" >> .env
 
             - name: Clear Cache 🫧

docker-compose.prod.yaml

@@ -6,13 +6,14 @@ services:
     container_name: compiler
     build:
       context: .
-      dockerfile: Dockerfile
+      dockerfile: Dockerfile 
+    privileged: true
     environment:
-      PORT: ${PORT}
+      PORT: 3003
       RMQUSER: ${RMQUSER}
       RMQPASS: ${RMQPASS}
       RMQHOST: ${RMQHOST} 
-      RMQNAME: ${RMQNAME}  
+      REDISHOST: ${REDISHOST}
       BACKEND_URL: ${BACKEND_URL} 
       JWT_SECRET: ${JWT_SECRET} 
     restart: unless-stopped

package.json

@@ -12,19 +12,7 @@
   "author": "UnixVextor <withun.wch@gmail.com>",
   "license": "MIT",
   "dependencies": {
-    "@types/amqplib": "^0.10.5",
-    "@types/axios": "^0.14.0",
-    "@types/cors": "^2.8.17",
-    "@types/dockerode": "^3.3.26",
-    "@types/express": "^4.17.21",
-    "@types/jsonwebtoken": "^9.0.7",
-    "@types/pino": "^7.0.5",
-    "@types/strip-comments": "^2.0.4",
-    "@types/swagger-jsdoc": "^6.0.4",
-    "@types/swagger-ui-express": "^4.1.6",
-    "@types/tar-stream": "^3.1.3",
-    "@types/tress": "^1.0.5",
-    "amqplib": "^0.10.4",
+   "amqplib": "^0.10.4",
     "axios": "^1.7.7",
     "cors": "^2.8.5",
     "dayjs": "^1.11.13",
@@ -36,14 +24,26 @@
     "lexical-parser": "^1.0.0",
     "pino": "^9.4.0",
     "pino-pretty": "^11.2.2",
+    "redis": "^4.7.0",
     "rimraf": "^5.0.5",
     "strip-comments": "^2.0.1",
-    "swagger-jsdoc": "^6.2.8",
-    "swagger-ui-express": "^5.0.1",
     "tar-stream": "^3.1.7",
     "tress": "^1.1.4",
     "tsx": "^4.7.0",
     "typescript": "^5.3.3",
     "zod": "^3.22.4"
+  },
+  "devDependencies": {
+    "@types/redis": "^4.0.11",
+    "@types/amqplib": "^0.10.5",
+    "@types/axios": "^0.14.0",
+    "@types/cors": "^2.8.17",
+    "@types/dockerode": "^3.3.26",
+    "@types/express": "^4.17.21",
+    "@types/jsonwebtoken": "^9.0.7",
+    "@types/pino": "^7.0.5",
+    "@types/strip-comments": "^2.0.4",
+    "@types/tar-stream": "^3.1.3",
+    "@types/tress": "^1.0.5" 
   }
 }

src/controllers/compiler.controller.ts

@@ -3,6 +3,7 @@ import { ISubmissionRequest } from "../interfaces/submission.interface";
 import { ICompileRequest } from "../interfaces/compiler.interface";
 import { rabbitMQService } from "../services/rabbitmq.service";
 import { RequestWithUser } from "../interfaces/auth.interface";
+import { redisClient } from "../services/redis.service";
 
 export const compilerController = {
   addSubmissionToRabbitMQ: async (req: Request, res: Response) => {
@@ -13,7 +14,11 @@ export const compilerController = {
       });
     }
     submission.token = (req as RequestWithUser).user.token;
+    submission.username = (req as RequestWithUser).user.username
     await rabbitMQService.sendDataToQueue("submission", submission);
+
+    redisClient.set(`submissionState-${submission.username}`, "true", { EX: 240 })
+
     return res.status(200).json({
       message: "Add To Queue Successfully",
     });
@@ -25,7 +30,7 @@ export const compilerController = {
         message: "Missing Required Fields",
       });
     }
-    data.token = (req as RequestWithUser).user.token;
+    data.username = (req as RequestWithUser).user.username;
     await rabbitMQService.sendDataToQueue("compiler", data);
     return res.status(200).json({
       message: "Add To Queue Successfully",

src/interfaces/compiler.interface.ts

@@ -15,7 +15,7 @@ export interface ICompileRequest {
   language: languageType;
   fileName: string;
   input: string;
-  token?: string;
+  username?: string;
 }
 
 export interface IMoveFile {

src/interfaces/submission.interface.ts

@@ -6,6 +6,7 @@ export interface ISubmissionRequest {
   language: languageType;
   fileName: string;
   token?: string;
+  username?: string
 }
 
 export interface IResultProblem {
@@ -20,5 +21,23 @@ export interface ISubmission {
     output: string;
     isPass: boolean;
   }[];
-  status: boolean;
+  stateSubmission: string;
 }
+
+export interface IResultSubmission {
+  message: string;
+  data: {
+    submissionId: string;
+    problemId: string;
+    username: string;
+    sourceCode: string;
+    no: number;
+    results: {
+      output: string;
+      isPass: boolean;
+    }[];
+    stateSubmission: boolean;
+    createAt: Date;
+  }
+}
+

src/interfaces/testcase.interface.ts

@@ -1,8 +1,23 @@
 export interface ITestCase {
   message: string;
   data: {
-    input: string;
-    output: string;
-    isHidden: boolean;
-  }[];
+    testCases: {
+      testCaseId: string,
+      input: string;
+      output: string;
+      isHidden: boolean;
+    }[],
+    constraint: {
+      constraintId: string,
+      type: ConstraintType,
+      keyword: string,
+      qunatities: number,
+      problemId: string
+    }[]
+  };
+}
+
+export enum ConstraintType {
+  FUNCTION = "FUNCTION",
+  METHOD = "METHOD",
 }

src/interfaces/user.interface.ts

@@ -1,22 +1,25 @@
 export interface IUser {
-  username: string;
-  email: string;
-  hashedPassword: string;
-  studentNo: string;
-  firstName: string;
-  lastName: string;
-  gender: string;
-  role: string;
-  picture: string;
-  containerID: string;
-  IpAddress: string;
-  isActived: boolean;
-  createdAt: Date;
-  updatedAt: Date;
-  schoolId: string;
-  school: {
+  message: string
+  data: {
+    username: string;
+    email: string;
+    hashedPassword: string;
+    studentNo: string;
+    firstName: string;
+    lastName: string;
+    gender: string;
+    role: string;
+    picture: string;
+    containerID: string;
+    IpAddress: string;
+    isActived: boolean;
+    createdAt: Date;
+    updatedAt: Date;
     schoolId: string;
-    schoolName: string;
-  };
-  token?: string;
+    school: {
+      schoolId: string;
+      schoolName: string;
+    };
+    token?: string;
+  }
 }