Fix previous pr (#22)

* Fix freeze boolean in ranking

* Add usersPoints endpoint

* Fix fetching freeze value

src/controllers/users.controller.js

@@ -8,7 +8,6 @@ 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,
@@ -23,7 +22,6 @@ const transporter = nodemailer.createTransport({
 const signToken = (username, expTime) => jwt.sign(username, process.env.TOKEN_SECRET, { expiresIn: expTime });
 
 const sendMail = (destination, subject, text, html) => {
-    console.log('wysylam', html);
     const message = {
         from: process.env.SMTP_FROM,
         to: destination,
@@ -179,9 +177,9 @@ const solves = async (request, response) => {
 const ranking = async (request, response) => {
     const { id } = request.body;
     const admin = await isAdminUtil(id);
-    const freeze = competitionConf.endTime;
+    const competitionConf = yaml.load(fs.readFileSync(process.env.SOK_CONFIG, 'utf8'));
     let dbRes;
-    if (freeze === 'true' && !admin) {
+    if (competitionConf.freeze === 'true' && !admin) {
         const freezeTime = new Date(Date.parse(competitionConf.freezeTime));
         dbRes = await pool.query(
             `
@@ -231,6 +229,32 @@ const ranking = async (request, response) => {
     return response.status(200).send(dbRows);
 };
 
+const usersPoints = async (reuqest, response) => {
+    const { id } = reuqest.body;
+    if (!id) {
+        return response.status(403).send('Not permited!');
+    }
+    const dbRes = await pool.query(
+        `SELECT
+            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 u.id=$1
+        ORDER BY
+            points DESC, MAX(s.sent) ASC;`,
+        [id],
+    );
+    if (!dbRes.rowCount) {
+        return response.status(200).send(0);
+    }
+    return response.status(200).send(dbRes.rows[0].points);
+};
+
 const isAdmin = async (request, response) => {
     const { id } = request.body;
     if (!id) {
@@ -253,4 +277,5 @@ module.exports = {
     verifyRegistration,
     changePassword,
     verifyPasswordChange,
+    usersPoints,
 };

src/routes/users.route.js

@@ -9,11 +9,13 @@ router.use('/solves', authenticateToken);
 router.use('/islogged', authenticateToken);
 router.use('/ranking', authenticateToken);
 router.use('/isAdmin', authenticateToken);
+router.use('/usersPoints', authenticateToken);
 
 router.get('/solves', errorHandler(usersController.solves));
 router.get('/islogged', errorHandler(usersController.isLogged));
 router.get('/ranking', errorHandler(usersController.ranking));
 router.get('/isAdmin', errorHandler(usersController.isAdmin));
+router.get('/usersPoints', errorHandler(usersController.usersPoints));
 
 router.post('/verify', errorHandler(usersController.verifyRegistration));
 router.post('/verifyPass', errorHandler(usersController.verifyPasswordChange));