2024 changes

.docker/init-mongo.js

@@ -4,17 +4,19 @@ db.createUser({
     user: "username",
     pwd: "password",
     roles: [{
-        role: "readWrite",
-        db: "abacus"
-    }]
+        role: "dbAdmin",
+        db: "abacus"},
+        {role: "readWrite",
+        db: "abacus"}
+    ]
 })
 
 db.createCollection('user')
 
 db.user.insert({
     uid: "b126d7588b184db7818693c2ab891887",
     display_name: "Admin",
-    password: "65df4b1116b849b2d02063932b1472a2c15545908d2bdb029c14bd710158c1e2",
+    password: "62b5f0bf8345c5c47ededf67c6a205131b1fa2d0c07e5e3f747395285780cccf",
     role: "admin",
     username: "admin"
 })

backend/Dockerfile

@@ -1,7 +1,5 @@
 # pull official base image
-FROM node:16
-
-ENV CHOKIDAR_USEPOLLING true
+FROM node:16 as build
 
 # set working directory
 WORKDIR /app
@@ -15,7 +13,21 @@ RUN yarn global add nodemon --silent
 # add app
 COPY . ./
 
+# production environment
+FROM build as production
+
+# add `/app/node_modules/.bin` to PATH
+ENV PATH /app/node_modules/.bin:$PATH
+ENV NODE_OPTIONS=--MAX-OLD-SPACE-SIZE=10240
+# build app
+RUN yarn build
+
 EXPOSE 80
 
-# run development server
-CMD ["yarn", "dev"]
+# start app
+CMD ["node", "/app/build/server.js"]
+
+
+
+# build container: docker build -f Dockerfile.prod -t abacus-server:prod .
+# run container: docker run -it --rm -p 80:80 abacus-server:prod

backend/src/api/auth/getTableSize.ts

@@ -61,7 +61,7 @@ export const getTableSize = async (req: Request, res: Response) => {
       const tableSize = await contest.get_table_size(tableName, params)
       //divides by the number of items per page.
 
-      const pages = tableSize ? tableSize / 25 : 0
+      const pages = tableSize ? tableSize : 0
       //send response back.
       res.send({ tableSize: pages })
     } else {

backend/src/api/clarifications/getClarifications.ts

@@ -157,7 +157,7 @@ export const getClarifications = async (req: Request, res: Response): Promise<vo
 
     res.send(map)
   } catch (err) {
-    console.error(err)
+    //console.error(err)
     res.sendStatus(500)
   }
 }

backend/src/api/standings/getStandings.ts

@@ -220,14 +220,11 @@ const getGoldStandings = async (isPractice: boolean): Promise<Standings<GoldTeam
     'max_points',
     'capped_points'
   ])
-  console.log('problemsLift before', problemsList)
   problemsList = problemsList.filter(({ practice }) => {
     if (isPractice) return practice
     return practice == undefined || practice == false
   })
 
-  console.log('problemsLift after', problemsList)
-
   const problems = transpose(problemsList, 'pid')
 
   const subs: Record<string, Record<string, Submission[]>> = {}

backend/src/api/submissions/postSubmissions.ts

@@ -124,15 +124,15 @@ export const postSubmissions = async (req: Request, res: Response): Promise<void
       res.status(403).send({ message: 'You can not submit to problems in this division!' })
       return
     }
-
+    /*points_per_yes,
+      points_per_minute,
+      points_per_no*/
     const {
       start_date,
       end_date,
       practice_start_date,
       practice_end_date,
-      points_per_yes,
-      points_per_minute,
-      points_per_no
+
     } = await contest.get_settings()
     const now = Date.now()
     if (problem.practice) {
@@ -215,7 +215,7 @@ export const postSubmissions = async (req: Request, res: Response): Promise<void
         source: data.toString('utf-8')
       }
       let status = 'accepted'
-      for (let test of problem.tests) {
+      /*for (let test of problem.tests) {
         // Copy tests from problem
         submission.tests = problem.tests
 
@@ -224,11 +224,12 @@ export const postSubmissions = async (req: Request, res: Response): Promise<void
         // Await response from piston execution
         try {
           const res = await axios.post(
-            'https://piston.tabot.sh/api/v2/execute',
+            //https://piston.tabot.sh/api/v2/execute
+            '',
             {
-              language: item.language,
+              language: item.language as string,
+              version: '*',
               files: [file],
-              version: item.language === 'python' ? '3.9.4' : '15.0.2',
               stdin: test.in
             },
             {
@@ -237,8 +238,9 @@ export const postSubmissions = async (req: Request, res: Response): Promise<void
               }
             }
           )
+          //This is where we are getting our rejection error
           test['stdout'] = res.data.run.code == 0 ? res.data.run.stdout : res.data.run.stderr
-          if ((res.data.run.output.trim() as string) == (test.out.trim() as string) && res.data.run.code === 0) {
+          if (((res.data.run.output.trim() as string) == (test.out.trim() as string)) && res.data.run.code === 0) {
             console.log('Result: ACCEPTED')
             test['result'] = 'accepted'
           } else {
@@ -249,10 +251,10 @@ export const postSubmissions = async (req: Request, res: Response): Promise<void
         } catch (e) {
           console.log(e)
         }
-      }
+      }*/
       submission.status = status
       // Calculate Score
-      if (status == 'accepted') {
+      /*if (status == 'accepted') {
         let minutes = 0
         if (problem.practice) {
           minutes = ((submission.date as any) - practice_start_date) / 60
@@ -265,7 +267,7 @@ export const postSubmissions = async (req: Request, res: Response): Promise<void
       } else {
         submission.score = 0
       }
-
+      */
       // Save submission to database
       await contest.update_submission(submission.sid as string, { ...submission, sid: submission.sid })
     } else if (req.user?.division == 'gold') {

backend/src/api/submissions/rerunSubmission.ts

@@ -43,32 +43,33 @@ export const rerunSubmission = async (req: Request, res: Response): Promise<void
     return
   }
   const item = matchedData(req)
+
   try {
     const submission = await contest.get_submission(item.sid)
     const problem = await contest.get_problem(submission.pid)
+
 
     const { start_date, practice_start_date, points_per_yes, points_per_minute, points_per_no } =
       await contest.get_settings()
     if (submission) {
-      let newSubmission = { ...submission }
-      newSubmission.tests = problem.tests;
+      submission.tests = problem.tests;
       // Update status to 'pending'
       // await updateItem('', { submission.sid }, { status: 'pending' });
       // Extract details and set defaults
       let status = 'accepted'
       for (let test of problem.tests) {
         // Copy tests from problem
-        newSubmission.tests = problem.tests
+        submission.tests = problem.tests
         // Run tests
-        const file = { name: newSubmission.filename as string, content: newSubmission['source'] as string }
+        const file = { name: submission.filename as string, content: submission['source'] as string }
         // Await response from piston execution
-        try {
+        /*try {
           const res = await axios.post(
             'https://piston.tabot.sh/api/v2/execute',
             {
-              language: item.language,
+              language: item.language as string,
+              version: '*',
               files: [file],
-              version: item.language === 'python' ? '3.9.4' : '15.0.2',
               stdin: test.in
             },
             {
@@ -91,24 +92,91 @@ export const rerunSubmission = async (req: Request, res: Response): Promise<void
         }
       }
 
-      newSubmission.status = status
+      submission.status = status
       // Calculate Score
       if (status == 'accepted') {
         let minutes = 0
         if (problem.practice) {
-          minutes = ((newSubmission.date as any) - practice_start_date) / 60
+          minutes = ((submission.date as any) - practice_start_date) / 60
         } else {
-          minutes = ((newSubmission.date as any) - start_date) / 60
+          minutes = ((submission.date as any) - start_date) / 60
         }
-        newSubmission.score = Math.floor(
-          minutes * points_per_minute + points_per_no * (newSubmission.sub_no as any) + points_per_yes
+        submission.score = Math.floor(
+          minutes * points_per_minute + points_per_no * (submission.sub_no as any) + points_per_yes
         )
       } else {
-        newSubmission.score = 0
+        submission.score = 0
       }
       // update submission
-      await contest.update_submission(newSubmission.sid as string, { ...newSubmission, sid: newSubmission.sid })
-      res.send(newSubmission)
+      await contest.update_submission(submission.sid as string, { ...submission, sid: submission.sid })*/
+      try {
+        //console.log(item.language);
+        const res = await axios.post(
+          'https://piston.tabot.sh/api/v2/execute',
+          {
+            //item.language as string
+            language: submission.language as string,
+            version: '*',
+            files: [file],
+            stdin: test.in
+          },
+          {
+            headers: {
+              'Content-Type': 'application/json'
+            }
+          }
+        )
+        //This is where we are getting our rejection error
+        //console.log(res.data);
+        test['stdout'] = res.data.run.code == 0 ? res.data.run.stdout : res.data.run.stderr
+        //console.log('Ours: ' + res.data.run.output.trim());
+        //console.log('theirs: ' + test.out.trim());
+        //console.log(res.data);
+        //&& res.data.run.code === 0
+        //console.log(res.data);
+        if (((res.data.run.stdout.trim() as string) == (test.out.trim() as string))) {
+          console.log('Result: ACCEPTED')
+          test['result'] = 'accepted'
+        } else {
+          console.log('Result: REJECTED')
+          status = 'rejected'
+          test['result'] = 'rejected'
+        }
+      } catch (e) {
+        console.log(e)
+      }
+    }
+    submission.status = status
+    // Calculate Score
+    //const base_time_score = 180;
+    if (status == 'accepted') {
+      let minutes = 0
+      if (problem.practice) {
+        minutes = ((submission.date as any) - practice_start_date) / 60
+      } else {
+        minutes = ((submission.date as any) - start_date) / 60
+      }
+      /*console.log(base_time_score)
+      console.log(points_per_yes)
+      console.log(Number(base_time_score) + Number(points_per_yes) - (minutes * points_per_minute + points_per_no * (submission.sub_no as any)));
+      console.log(Number(base_time_score) + Number(points_per_yes));
+      console.log((minutes * points_per_minute + points_per_no * (submission.sub_no as any)))
+      console.log(minutes * points_per_minute)
+      console.log(points_per_no * (submission.sub_no as any));*/
+      submission.score = Math.floor(
+        minutes * points_per_minute + points_per_no * (submission.sub_no as any) + points_per_yes
+      )
+      //Number(base_time_score) + Number(points_per_yes) - (minutes * points_per_minute + points_per_no * (submission.sub_no as any))
+      //console.log(submission);
+      //minutes * points_per_minute + points_per_no * (submission.sub_no as any) + points_per_yes
+    } else {
+      submission.score = 0
+    }
+
+    // Save submission to database
+    await contest.update_submission(submission.sid as string, { ...submission, sid: submission.sid })
+    //await contest.update_submission(submission.sid as string, { ...submission, sid: submission.sid })
+      res.send(submission)
     }
   } catch (err) {
     console.error(err)

backend/src/services/db/mongo.ts

@@ -44,8 +44,8 @@ export default class MongoDB extends Database {
           if (data) resolve(data)
         })
     })
-  }
 
+  }
   count(TableName: string, query?: ScanOptions): Promise<number> {
     return new Promise((resolve, reject) => {
       this.db