order leaderboard by name and total

QPixel · Apr 17, 2024 · eb1390a · eb1390a
1 parent c3519dd
commit eb1390a
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 3 deletions.
diff --git a/src/lib/components/get-leaderboard.ts b/src/lib/components/get-leaderboard.ts
@@ -41,7 +41,18 @@ function getLeaderboard() {
             }
             return entry;
           });
-          v[current_quarter].data = newData.sort((a, b) => b.total - a.total);
+          v[current_quarter].data = newData.sort((a, b) => {
+            if (a.total > b.total) {
+              return -1;
+            }
+            if (a.total < b.total) {
+              return 1;
+            }
+            if (a.resolved_username < b.resolved_username) {
+              return -1;
+            }
+            return 0;
+          });
           v[current_quarter].total = v[current_quarter].total + 1;
         }
         return v;

diff --git a/src/pages/api/counter.ts b/src/pages/api/counter.ts
@@ -105,6 +105,7 @@ export const POST: APIRoute = async ({ cookies, locals }) => {
   }
 
   const resetAt = compareAsc(new Date(), cookies.get("resetAt")!.value);
+
   if (resetAt >= 0) {
     cookies.set("triedToIncrement", "0", {
       path: "/",
@@ -118,6 +119,7 @@ export const POST: APIRoute = async ({ cookies, locals }) => {
       },
     );
   }
+
   if (
     cookies.get("triedToIncrement")!.number() > incrementCount &&
     resetAt == -1 &&

diff --git a/src/pages/api/leaderboard/all.ts b/src/pages/api/leaderboard/all.ts
@@ -53,6 +53,22 @@ export async function getLeaderboard(env: ENV) {
       resolved_username: username ? username : "Unknown",
     });
   }
+
+  for (const entry of Object.values(wompData)) {
+    entry.data.sort((a, b) => {
+      if (a.total > b.total) {
+        return -1;
+      }
+      if (a.total < b.total) {
+        return 1;
+      }
+      if (a.resolved_username < b.resolved_username) {
+        return -1;
+      }
+      return 0;
+    });
+  }
+
   for (const total of quarterTotals) {
     wompData[total.quarter].total = total.total;
   }

diff --git a/src/pages/api/leaderboard/quarter.ts b/src/pages/api/leaderboard/quarter.ts
@@ -25,9 +25,21 @@ export async function getLeaderboardByQuarter(quarter: string, env: ENV) {
         updated_by: womp.updated_by,
         resolved_username: username ? username : "Unknown",
       };
-    }),
+    })
   );
-  return wompData;
+  return wompData.sort((a, b) => {
+    if (a.total > b.total) {
+      return -1;
+    }
+    if (a.total < b.total) {
+      return 1;
+    }
+    // follow alphabetical order if the totals are the same
+    if (a.resolved_username < b.resolved_username) {
+      return -1;
+    }
+    return 0;
+  });
 }
 
 export async function getQuarters(env: ENV) {