Update server/models/contests/getModeratorContests.js

Co-authored-by: NIKHIL BN <[email protected]>
Cyber-Labs · Dec 17, 2020 · fa04706 · fa04706
1 parent 83a26f1
commit fa04706
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/server/models/contests/getModeratorContests.js b/server/models/contests/getModeratorContests.js
@@ -13,6 +13,10 @@ function getModeratorContests({ username, query }) {
     const cursor = Number(query.cursor)
     let sqlQuery = `SELECT * FROM contests c JOIN contests_moderators cm ON c.id=cm.contest_id WHERE cm.moderator=? `
     let arr = [username]
+    if (cursor) {
+      sqlQuery += `AND c.id>? `
+      arr.push(cursor)
+    }
     if (limit && limit > 0) {
       sqlQuery += ` LIMIT ?`
       arr.push(limit)

diff --git a/server/models/contests/participate.js b/server/models/contests/participate.js
@@ -16,14 +16,12 @@ function participate({ params, username }) {
       }
       connection.beginTransaction((error) => {
         if (error) {
-          return connection.rollback(() => {
-            connection.release()
-            return reject(error)
-          })
+          connection.release()
+          return reject(error)
         }
         connection.query(
           `INSERT INTO contests_participants (contest_id, participant) SELECT ?, ? 
-          WHERE EXISTS(SELECT 1 FROM user_groups WHERE username=? AND group_id = ANY (SELECT group_id FROM contests_groups WHERE contest_id=?))`,
+          WHERE EXISTS(SELECT 1 FROM user_groups ug INNER JOIN contests_groups cg ON ug.group_id = cg.group_id WHERE ug.username=? AND cg.contest_id=?)`,
           [contestId, username, username, contestId],
           (error, res) => {
             if (error || res === undefined) {