Ferrodri/agora 1687 citizens with most voting power are not sorted co…

…rrectly (#151) * add coalesce to sort by desc * minor typo * sort byaddress_metadata.address to be able to paginate
voteagora · Mar 4, 2024 · 7cedfcf · 7cedfcf
1 parent 0c556c5
commit 7cedfcf
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/src/app/api/common/citizens/getCitizens.ts b/src/app/api/common/citizens/getCitizens.ts
@@ -34,8 +34,7 @@ export async function getCitizensForNamespace({
           `
           SELECT address_metadata.address, address_metadata.metadata, delegate.voting_power
           FROM agora.address_metadata address_metadata
-          LEFT JOIN ${
-            namespace + ".delegates"
+          LEFT JOIN ${namespace + ".delegates"
           } delegate ON LOWER(address_metadata.address) = LOWER(delegate.delegate)
           WHERE address_metadata.kind = 'citizen' 
           AND address_metadata.dao_slug = 'OP'
@@ -52,12 +51,12 @@ export async function getCitizensForNamespace({
           `
             SELECT address_metadata.address, address_metadata.metadata, delegate.voting_power
             FROM agora.address_metadata address_metadata
-            LEFT JOIN ${
-              namespace + ".delegates"
-            } delegate ON LOWER(address_metadata.address) = LOWER(delegate.delegate)
+            LEFT JOIN ${namespace + ".delegates"
+          } delegate ON LOWER(address_metadata.address) = LOWER(delegate.delegate)
             WHERE address_metadata.kind = 'citizen' 
             AND address_metadata.dao_slug = 'OP'
-            ORDER BY delegate.voting_power DESC
+            ORDER BY COALESCE(delegate.voting_power, 0) DESC,
+            address_metadata.address ASC 
             OFFSET $1
             LIMIT $2;
           `,