From 2460eb695cd4ea4566182c38126c67c9bf7b2dbb Mon Sep 17 00:00:00 2001
From: Osama Mabkhot <99215291+O2sa@users.noreply.github.com>
Date: Mon, 3 Aug 2026 05:38:55 +0300
Subject: [PATCH] fix: user duplication and handling case-insensitive username
 indexing and deduplication (#184)

---
 lib/db-store.ts | 37 ++++++++++++++++++++++++++++---------
 1 file changed, 28 insertions(+), 9 deletions(-)

diff --git a/lib/db-store.ts b/lib/db-store.ts
index 27bd6a2..90e8ce1 100644
--- a/lib/db-store.ts
+++ b/lib/db-store.ts
@@ -114,6 +114,9 @@ export class DatabaseStore {
         ON github_users(stale_after)
         WHERE country IS NOT NULL;
 
+      CREATE UNIQUE INDEX IF NOT EXISTS idx_github_users_username_lower
+        ON github_users(LOWER(username));
+
       CREATE TABLE IF NOT EXISTS leaderboard_calculation (
         country_slug       VARCHAR(100) PRIMARY KEY,
         country_title      TEXT NOT NULL DEFAULT '',
@@ -193,7 +196,8 @@ export class DatabaseStore {
         $8, $9, $10, $11,
         NOW(), NOW() + ($12 || ' days')::INTERVAL, NOW()
       )
-      ON CONFLICT (username) DO UPDATE SET
+      ON CONFLICT (LOWER(username)) DO UPDATE SET
+        username          = EXCLUDED.username,
         name              = EXCLUDED.name,
         avatar_url        = EXCLUDED.avatar_url,
         location          = EXCLUDED.location,
@@ -251,8 +255,13 @@ export class DatabaseStore {
   ): Promise<GitHubUserRow[]> {
     const client = getPool();
     const result = await client.query(
-      `SELECT * FROM github_users
-       WHERE country = $1
+      `SELECT *
+       FROM (
+         SELECT DISTINCT ON (LOWER(username)) *
+         FROM github_users
+         WHERE country = $1
+         ORDER BY LOWER(username), final_score DESC, updated_at DESC
+       ) deduped_users
        ORDER BY final_score DESC
        LIMIT $2`,
       [country, limit],
@@ -263,7 +272,7 @@ export class DatabaseStore {
   async getLeaderboardCount(country: string): Promise<number> {
     const client = getPool();
     const result = await client.query(
-      "SELECT COUNT(*) FROM github_users WHERE country = $1",
+      "SELECT COUNT(DISTINCT LOWER(username)) FROM github_users WHERE country = $1",
       [country],
     );
     return Number(result.rows[0].count);
@@ -279,8 +288,13 @@ export class DatabaseStore {
   ): Promise<GitHubUserRow[]> {
     const client = getPool();
     const result = await client.query(
-      `SELECT * FROM github_users
-       WHERE country = $1 AND stale_after < NOW()
+      `SELECT *
+       FROM (
+         SELECT DISTINCT ON (LOWER(username)) *
+         FROM github_users
+         WHERE country = $1 AND stale_after < NOW()
+         ORDER BY LOWER(username), final_score DESC, updated_at DESC
+       ) deduped_users
        ORDER BY final_score DESC
        LIMIT $2`,
       [country, limit],
@@ -298,8 +312,13 @@ export class DatabaseStore {
   ): Promise<GitHubUserRow[]> {
     const client = getPool();
     const result = await client.query(
-      `SELECT * FROM github_users
-       WHERE country = $1
+      `SELECT *
+       FROM (
+         SELECT DISTINCT ON (LOWER(username)) *
+         FROM github_users
+         WHERE country = $1
+         ORDER BY LOWER(username), final_score DESC, updated_at DESC
+       ) deduped_users
        ORDER BY final_score DESC
        LIMIT $2`,
       [country, limit],
@@ -329,4 +348,4 @@ export function getDatabaseStore(): DatabaseStore {
     defaultStore = new DatabaseStore();
   }
   return defaultStore;
-}
\ No newline at end of file
+}