Add ranking freeze option

competition.yaml

@@ -1,4 +1,6 @@
 title: mądrALO
 rules: <p>zasady 123123</p><p><br></p><p>123</p><p>zasady</p>
-startTime: 2023-09-06T20:55
-endTime: 2023-09-27T20:55
+startTime: 2024-04-12T20:55
+endTime: 2024-04-24T20:55
+freezeTime: 2024-04-22T00:00
+freeze: 'true'

src/controllers/competition.controller.js

@@ -14,8 +14,16 @@ const getTimeRange = (request, response) => {
     response.status(200).send({ start: competitionConf.startTime, end: competitionConf.endTime });
 };
 
+const getFreeze = (request, response) => {
+    response.status(200).send(competitionConf.freeze);
+};
+
+const getFreezeTime = (request, response) => {
+    response.status(200).send(competitionConf.freezeTime);
+};
+
 const edit = async (request, response) => {
-    const { id, title, rules, start, end } = request.body;
+    const { id, title, rules, start, end, freeze, freezeTime } = request.body;
 
     const admin = await isAdminUtil(id);
     if (!admin) {
@@ -25,6 +33,8 @@ const edit = async (request, response) => {
     competitionConf.rules = rules;
     competitionConf.startTime = start;
     competitionConf.endTime = end;
+    competitionConf.freeze = freeze;
+    competitionConf.freezeTime = freezeTime;
     fs.writeFileSync(process.env.SOK_CONFIG, yaml.dump(competitionConf));
     return response.status(201).send('Competition updated');
 };
@@ -64,6 +74,8 @@ module.exports = {
     getTitle,
     getRules,
     getTimeRange,
+    getFreeze,
+    getFreezeTime,
     edit,
     uploadIcon,
     icon,

src/controllers/users.controller.js

@@ -1,10 +1,14 @@
 const bcrypt = require('bcryptjs');
+const fs = require('fs');
+const yaml = require('js-yaml');
 const dotenv = require('dotenv');
 const jwt = require('jsonwebtoken');
 const nodemailer = require('nodemailer');
 const pool = require('../services/db.service');
+const isAdminUtil = require('../utils/isAdminUtil');
 
 dotenv.config();
+const competitionConf = yaml.load(fs.readFileSync(process.env.SOK_CONFIG, 'utf8'));
 
 const transporter = nodemailer.createTransport({
     host: process.env.SMTP_HOST,
@@ -173,25 +177,53 @@ const solves = async (request, response) => {
 };
 
 const ranking = async (request, response) => {
-    const dbRes = await pool.query(
-        `
-        SELECT
-            u.name,
-            COALESCE(SUM(CASE WHEN s.correct = true THEN c.points ELSE -1 END), 0) AS points
-        FROM
-            users u
-        JOIN
-            submits s ON u.id = s.usr_id
-        JOIN
-            challenges c ON s.chall_id = c.id
-        WHERE
-            admin = 0 AND verified = true
-        GROUP BY
-            u.id, u.name
-        ORDER BY
-            points DESC, MAX(s.sent) ASC, u.name;
-        `,
-    );
+    const { id } = request.body;
+    const admin = await isAdminUtil(id);
+    const freeze = competitionConf.endTime;
+    let dbRes;
+    if (freeze === 'true' && !admin) {
+        const freezeTime = new Date(Date.parse(competitionConf.freezeTime));
+        dbRes = await pool.query(
+            `
+            SELECT
+                u.name,
+                COALESCE(SUM(CASE WHEN s.correct = true THEN c.points ELSE -1 END), 0) AS points
+            FROM
+                users u
+            JOIN
+                submits s ON u.id = s.usr_id
+            JOIN
+                challenges c ON s.chall_id = c.id
+            WHERE
+                admin = 0 AND verified = true AND sent <= $1
+            GROUP BY
+                u.id, u.name
+            ORDER BY
+                points DESC, MAX(s.sent) ASC, u.name;
+            `,
+            [freezeTime.toISOString()],
+        );
+    } else {
+        dbRes = await pool.query(
+            `
+            SELECT
+                u.name,
+                COALESCE(SUM(CASE WHEN s.correct = true THEN c.points ELSE -1 END), 0) AS points
+            FROM
+                users u
+            JOIN
+                submits s ON u.id = s.usr_id
+            JOIN
+                challenges c ON s.chall_id = c.id
+            WHERE
+                admin = 0 AND verified = true
+            GROUP BY
+                u.id, u.name
+            ORDER BY
+                points DESC, MAX(s.sent) ASC, u.name;
+            `,
+        );
+    }
     const dbRows = dbRes.rows;
     for (let i = 0; i < dbRes.rows.length; i += 1) {
         dbRows[i].position = i + 1;

src/routes/competition.route.js

@@ -11,6 +11,8 @@ router.use('/uploadIcon', authenticateToken);
 router.get('/title', errorHandler(competitionController.getTitle));
 router.get('/rules', errorHandler(competitionController.getRules));
 router.get('/timeRange', errorHandler(competitionController.getTimeRange));
+router.get('/freeze', errorHandler(competitionController.getFreeze));
+router.get('/freezeTime', errorHandler(competitionController.getFreezeTime));
 router.get('/icon', errorHandler(competitionController.icon));
 
 router.post('/edit', errorHandler(competitionController.edit));

src/routes/users.route.js

@@ -7,6 +7,7 @@ const errorHandler = require('../middlewares/errorHandler');
 
 router.use('/solves', authenticateToken);
 router.use('/islogged', authenticateToken);
+router.use('/ranking', authenticateToken);
 router.use('/isAdmin', authenticateToken);
 
 router.get('/solves', errorHandler(usersController.solves));