replaced datatable with Simple-DataTables (written in vanilla Js) and some minor fixes

SysSn13 · SysSn13 · commit 1d9ca71fe487 · 2021-08-05T23:06:45.000+05:30
diff --git a/controllers/rankingsController.js b/controllers/rankingsController.js
@@ -75,9 +75,9 @@ exports.search = async function (req, res) {
             page: 1,
             totalPages: 1,
             searchResult: true,
-            title: `Search | ${_id} | Leetcode Rating Predictor`,
+            title: `Search | ${req.params.contestSlug} | Leetcode Rating Predictor`,
         });
-    } catch (error) {
+    } catch (err) {
         console.error(err);
         res.sendStatus(500);
     }
diff --git a/main.js b/main.js
@@ -33,6 +33,7 @@ if (process.env.WEB == true) {
     app.set("view engine", "ejs");
     app.set("views", __dirname + "/views");
     app.set("layout", "layouts/layout");
+    app.set("layout extractScripts", true);
     app.use(expressLayouts);
     app.use(bodyParser.urlencoded({ extended: true }));
     app.use(express.static("public"));
diff --git a/package.json b/package.json
@@ -7,8 +7,8 @@
   },
   "main": "server.js",
   "scripts": {
-    "start": "node main.js --max_old_space_size=1024",
-    "dev": "nodemon --max_old_space_size=1024  --trace-warnings main.js",
+    "start": "node main.js --max_old_space_size=1024 --trace-warnings",
+    "dev": "nodemon --max_old_space_size=1024 --trace-warnings main.js",
     "buildAddon": "npm run build --prefix ./services/predict-addon/"
   },
   "keywords": [],
diff --git a/public/stylesheets/main.css b/public/stylesheets/main.css
@@ -1,5 +1,13 @@
-body{
-    color:#333;
+body {
+    margin: 0;
+    color: rgba(0, 0, 0, 0.65);
+    font-size: 14px;
+    font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'PingFang SC', 'Hiragino Sans GB', 'Microsoft YaHei', 'Helvetica Neue', Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol';
+    font-variant: tabular-nums;
+    line-height: 1.5;
+    background-color: #fff;
+    -webkit-font-feature-settings: 'tnum';
+    font-feature-settings: 'tnum';
 }
 
 #forkMe {
@@ -11,17 +19,18 @@ body{
     text-align: center;
     text-decoration: none;
     letter-spacing: .06em;
-    background-color: #455a64;
+    background-color: #1890ff;
     padding: 0.5em 5em 0.4em 5em;
     text-shadow: 0 0 0.75em #444;
-    box-shadow: 0 0 0.5em rgba(0,0,0,0.5);
-    transform: rotate(45deg) scale(0.75,1);
+    box-shadow: 0 0 0.5em rgba(0, 0, 0, 0.5);
+    transform: rotate(45deg) scale(0.75, 1);
     font: bold 16px/1.2em Arial, Sans-Serif;
     -webkit-text-shadow: 0 0 0.75em #444;
-    -webkit-box-shadow: 0 0 0.5em rgba(0,0,0,0.5);
-    -webkit-transform: rotate(45deg) scale(0.75,1);
-    z-index:10;
+    -webkit-box-shadow: 0 0 0.5em rgba(0, 0, 0, 0.5);
+    -webkit-transform: rotate(45deg) scale(0.75, 1);
+    z-index: 10;
 }
+
 #forkMe:before {
     content: '';
     top: 0;
@@ -32,9 +41,18 @@ body{
     margin: -0.3em -5em;
     transform: scale(0.7);
     -webkit-transform: scale(0.7);
-    border: 2px rgba(255,255,255,0.7) dashed;
+    border: 2px rgba(255, 255, 255, 0.7) dashed;
+}
+
+@media only screen and (max-width: 600px) {
+    #forkMe {
+        font-size: small;
+    }
+}
+
+#forkMe:hover {
+    opacity: 0.9;
 }
-#forkMe:hover {opacity: 0.9;}
 
 a {
     color: #1890ff;
@@ -47,16 +65,20 @@ a {
     transition: color 0.3s;
     -webkit-text-decoration-skip: objects;
 }
-.btn-primary{
+
+.btn-primary {
     background-color: #337ab7 !important;
     border-color: #337ab7 !important;
-    color:white !important;
+    color: white !important;
 }
-.bg-primary{
+
+.bg-primary {
     background-color: #337ab7 !important;
     color: white !important;
 }
-.btn-primary:focus, .btn-primary:active {
+
+.btn-primary:focus,
+.btn-primary:active {
     background-color: #337ab7 !important;
     border-color: #337ab7 !important;
     box-shadow: 0 0 0 0.25rem rgb(102 151 193) !important;
diff --git a/public/stylesheets/tablestyle.css b/public/stylesheets/tablestyle.css
@@ -4,48 +4,52 @@
       white-space: nowrap;
       overflow: hidden;
     }
-        
+
     .card {
       border-radius: .5rem;
     }
-    
+
     .table-scroll {
       border-radius: .5rem;
     }
-    
+
     .table-scroll table thead th {
       font-size: 1.25rem;
     }
-    .pagination > li > a
-    {
-        background-color: white;
-        color: #000000;
+
+    .pagination>li>a {
+      background-color: white;
+      color: #000000;
     }
-    
-    .pagination > li > a:focus,
-    .pagination > li > a:hover,
-    .pagination > li > span:focus,
-    .pagination > li > span:hover
-    {
-        color: #5a5a5a;
-        background-color: #eee;
-        border-color: #ddd;
+
+    .pagination>li>a:focus,
+    .pagination>li>a:hover,
+    .pagination>li>span:focus,
+    .pagination>li>span:hover {
+      color: #5a5a5a;
+      background-color: #eee;
+      border-color: #ddd;
     }
-    
-    .pagination > .active > a
-    {
-        color: #000000;
-        background-color: #337ab7 !important;
-        border: solid 1px #337ab7 !important;
+
+    .pagination>.active>a {
+      color: #000000;
+      background-color: #337ab7 !important;
+      border: solid 1px #337ab7 !important;
     }
-    
-    .pagination > .active > a:hover
-    {
-        background-color: #4c85b8 !important;
-        border: solid 1px #4c85b8;
+
+    .pagination>.active>a:hover {
+      background-color: #4c85b8 !important;
+      border: solid 1px #4c85b8;
     }
-    table,tbody, td, tfoot, th, thead, tr{
-      border-style:none !important;
+
+    table,
+    tbody,
+    td,
+    tfoot,
+    th,
+    thead,
+    tr {
+      border-style: none !important;
     }
 
     table {
@@ -54,11 +58,10 @@
     }
 
     .table thead th {
-        border-bottom: 2px solid #6685a5 !important;
+      border-bottom: 2px solid #6685a5 !important;
     }
-    .dataTables_filter{
+
+    .dataTables_filter {
       margin-bottom: 1em !important;
       padding: 1px;
-    }
-
-
+    }
diff --git a/services/contests.js b/services/contests.js
@@ -11,13 +11,13 @@ const fetchContestRankings = async function (contestSlug) {
         if (contest.rankings_fetched) {
             return [contest, null];
         }
-
+        contest.rankings = [];
         console.log(`fetching ${contestSlug} ...`);
         let resp = await fetch(
             `https://leetcode.com/contest/api/ranking/${contestSlug}/?region=global`
         );
         resp = await resp.json();
-        let pages = Math.floor(resp.user_num / 25);
+        let pages = Math.ceil(resp.user_num / 25);
         let all_rankings = [];
         let failed = [];
         let lastPage = Math.MAX_SAFE_INTEGER;
@@ -29,7 +29,7 @@ const fetchContestRankings = async function (contestSlug) {
             if (pageNo > lastPage) {
                 return;
             }
-            console.log(`Fetching rankings (${contestSlug}): page: ${pageNo}`);
+            // console.log(`Fetching rankings (${contestSlug}): page: ${pageNo}`);
             try {
                 let res = await fetch(
                     `https://leetcode.com/contest/api/ranking/${contestSlug}/?pagination=${pageNo}&region=global`
@@ -75,10 +75,10 @@ const fetchContestRankings = async function (contestSlug) {
                     `Fetched rankings (${contestSlug} page: ${pageNo})`
                 );
             } catch (err) {
-                console.log(
-                    `Failed to fetch rankings (${contestSlug} page: ${pageNo})`,
-                    err.message
-                );
+                // console.log(
+                //     `Failed to fetch rankings (${contestSlug} page: ${pageNo})`,
+                //     err.message
+                // );
                 if (retries > 0) {
                     await fetchPageRankings(pageNo, retries - 1);
                 } else if (throwError) {
@@ -101,13 +101,17 @@ const fetchContestRankings = async function (contestSlug) {
         for (let i = 0; i < failed.length; i++) {
             await fetchPageRankings(failed[i], maxRetries, true);
         }
-
+        console.log(`(${contestSlug}) Rankings fetched from leetcode!`);
         all_rankings.sort((a, b) => (a.rank > b.rank ? 1 : -1));
+
         contest.rankings = all_rankings;
         contest.rankings_fetched = true;
         contest.user_num = all_rankings.length;
-        await contest.update();
-        console.log(`Updated Rankings in ${contestSlug}.`);
+        console.time(`Saving rankings in db (${contestSlug})`);
+        await contest.save();
+        console.timeEnd(`Saving rankings in db (${contestSlug})`);
+        console.log(`Updated rankings in db (${contestSlug}).`);
+
         return [contest, null];
     } catch (err) {
         return [null, err];
diff --git a/services/job-queues/contestPredictionQueue.js b/services/job-queues/contestPredictionQueue.js
@@ -1,19 +1,32 @@
 const Queue = require("bull");
+const Contest = require("../../models/contest");
 const { predict } = require("../predict");
 const opts = require("../redis");
 const { updateUsers } = require("../users");
 
 opts.lockDuration = 30 * 60 * 1000; // 30 minutes
+opts.maxStalledCount = 0;
 
 const predictQueue = new Queue("Predictions", opts);
 predictQueue.process("predictRatings", async (job, done) => {
-    console.log("Processing job: ", job.id);
-    const err = await predict(job);
-    if (err) {
-        console.error(err);
+    try {
+        console.log(`Processing ${job.name} job: ${job.id}`);
+        const contest = await Contest.findById(job.data.contestSlug, {
+            ratings_predicted: 1,
+        });
+        if (contest && contest.ratings_predicted) {
+            done(null, { message: "skipped (already predicted)" });
+            return;
+        }
+        const err = await predict(job);
+        if (err) {
+            console.error(err);
+            done(err);
+        }
+        done(null, { message: "DONE" });
+    } catch (err) {
         done(err);
     }
-    done();
 });
 
 predictQueue.process("updateUserData", async (job, done) => {
diff --git a/services/job-queues/jobScheduler.js b/services/job-queues/jobScheduler.js
@@ -29,6 +29,7 @@ scheduler.process("contestScheduler", async (job, done) => {
                     attempts: 5,
                     delay: getRemainingTime(contest.endTime) + 10 * 1000,
                     backoff: 10000,
+                    priority: 1,
                 }
             );
             cnt++;
diff --git a/services/users.js b/services/users.js
@@ -321,7 +321,7 @@ const getContestParticipantsData = async (contest) => {
                 await Promise.all(promises);
                 console.info(
                     `users fetched: ${i + limit} (${getPercentage(
-                        Math.min(i + limit, total),
+                        Math.min(i + limit, failedRanks.length),
                         total
                     )}%)`
                 );
@@ -345,8 +345,10 @@ const getContestParticipantsData = async (contest) => {
             console.log("Unable to fetch these ranks: ", failed);
             return [];
         }
-        contest.users_fetched = true;
-        await contest.save();
+        await Contest.updateOne(
+            { _id: contest._id },
+            { $set: { users_fetched: true } }
+        );
         return result;
     } catch (err) {
         console.error(err);
@@ -369,9 +371,9 @@ const updateUsers = async (job) => {
         const total = users.length;
 
         const failed = [];
-        const totalSuccess = 0;
+        let totalSuccess = 0;
         const fetchUserHelper = async (user) => {
-            const [data_region, username] = users[i]._id.split("/");
+            const [data_region, username] = user._id.split("/");
             const [result, err] = await fetchUserInfo(username, data_region);
             if (err) {
                 failed.push(user);
@@ -380,13 +382,14 @@ const updateUsers = async (job) => {
             }
         };
 
-        for (let i = 0; i < total; i++) {
+        for (let i = 0; i < total; i += rateLimit) {
             let promises = [];
             for (let j = 0; j < rateLimit && i + j < total; j++) {
                 if (
                     Date.now() - users[i + j].lastUpdated <
                     12 * 60 * 60 * 1000
                 ) {
+                    totalSuccess++;
                     continue;
                 }
                 promises.push(fetchUserHelper(users[i + j]));
@@ -407,5 +410,4 @@ const updateUsers = async (job) => {
 };
 
 exports.getContestParticipantsData = getContestParticipantsData;
-exports.fetchUserInfo = fetchUserInfo;
 exports.updateUsers = updateUsers;
diff --git a/views/index.ejs b/views/index.ejs
diff --git a/views/layouts/layout.ejs b/views/layouts/layout.ejs
diff --git a/views/ranking.ejs b/views/ranking.ejs

Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,7 @@ scheduler.process("contestScheduler", async (job, done) => {`
`29`	`29`	`attempts: 5,`
`30`	`30`	`delay: getRemainingTime(contest.endTime) + 10 * 1000,`
`31`	`31`	`backoff: 10000,`
	`32`	`+ priority: 1,`
`32`	`33`	`}`
`33`	`34`	`);`
`34`	`35`	`cnt++;`