Merge pull request #9 from websurferdoteth/feat/sort-locations

Feat/sort locations

Author: escottalexander

packages/nextjs/app/api/locations/route.ts

@@ -1,5 +1,6 @@
 import { NextResponse } from "next/server";
 import { Redis } from "@upstash/redis";
+import { fetchActiveListings } from "~~/services/marketplace/graphql";
 
 const redis = Redis.fromEnv();
 const GEO_KEY = "locations:geo";
@@ -13,6 +14,33 @@ function idFor(lat: number, lng: number, miles: number) {
   return `loc:${lat.toFixed(5)}:${lng.toFixed(5)}:${miles.toFixed(2)}`;
 }
 
+async function getListingCountsByLocation(): Promise<Record<string, number>> {
+  try {
+    const items = await fetchActiveListings();
+
+    if (items.length === 0) {
+      return {};
+    }
+
+    const counts: Record<string, number> = {};
+
+    for (const item of items) {
+      const locationId = item?.locationId;
+      if (locationId && typeof locationId === "string") {
+        const normalizedId = locationId.trim();
+        if (normalizedId) {
+          counts[normalizedId] = (counts[normalizedId] || 0) + 1;
+        }
+      }
+    }
+
+    return counts;
+  } catch (error: any) {
+    console.error("[getListingCountsByLocation] Error:", error?.message || String(error));
+    return {};
+  }
+}
+
 export async function GET(req: Request) {
   try {
     const { searchParams } = new URL(req.url);
@@ -83,6 +111,27 @@ export async function GET(req: Request) {
         return name.includes(q) || id.includes(q) || akaMatch;
       });
     }
+
+    const listingCounts = await getListingCountsByLocation();
+
+    locations = locations.map((loc: any) => {
+      const locationId = String(loc?.id || "").trim();
+      const count = locationId ? listingCounts[locationId] || 0 : 0;
+
+      return { ...loc, activeListingsCount: count };
+    });
+
+    locations.sort((a: any, b: any) => {
+      const countA = a.activeListingsCount || 0;
+      const countB = b.activeListingsCount || 0;
+      if (countB !== countA) {
+        return countB - countA;
+      }
+      const nameA = (a.name || a.id || "").toLowerCase();
+      const nameB = (b.name || b.id || "").toLowerCase();
+      return nameA.localeCompare(nameB);
+    });
+
     return NextResponse.json({ locations: locations.slice(0, limit) });
   } catch (e: any) {
     if (String(e?.message || "").includes("Unexpected non-whitespace character after JSON")) {

packages/nextjs/app/page.tsx

@@ -137,7 +137,24 @@ const HomeInner = () => {
                     }}
                   >
                     <div className="card-body p-3">
-                      <div className="card-title text-base">{l.name || l.id}</div>
+                      <div className="flex items-start justify-between gap-2">
+                        <div className="flex-1 min-w-0">
+                          <div className="card-title text-base">{l.name || l.id}</div>
+                          <div className="text-sm opacity-70 mt-1">
+                            {l.activeListingsCount !== undefined ? (
+                              <>
+                                {l.activeListingsCount === 0 ? (
+                                  <span className="opacity-50">No active listings</span>
+                                ) : (
+                                  <span>
+                                    {l.activeListingsCount} {l.activeListingsCount === 1 ? "listing" : "listings"}
+                                  </span>
+                                )}
+                              </>
+                            ) : null}
+                          </div>
+                        </div>
+                      </div>
                     </div>
                   </button>
                 ))}

packages/nextjs/services/marketplace/graphql.ts

@@ -50,3 +50,46 @@ export async function fetchListingById(id: string): Promise<ListingData | null>
   const item = json?.data?.listings || null;
   return item;
 }
+
+export interface ActiveListing {
+  id: string;
+  locationId: string | null;
+}
+
+export async function fetchActiveListings(): Promise<ActiveListing[]> {
+  const res = await fetch(PONDER_URL, {
+    method: "POST",
+    headers: { "content-type": "application/json" },
+    body: JSON.stringify({
+      query: `
+        query ActiveListings {
+          listingss(
+            where: { active: true }
+          ) {
+            items {
+              id
+              locationId
+            }
+          }
+        }
+      `,
+    }),
+  });
+
+  if (!res.ok) {
+    throw new Error(`GraphQL request failed with status ${res.status}`);
+  }
+
+  const json = await res.json();
+
+  if (json.errors) {
+    throw new Error(`GraphQL errors: ${JSON.stringify(json.errors, null, 2)}`);
+  }
+
+  const data = json?.data;
+  if (!data) {
+    throw new Error(`No data in response: ${JSON.stringify(json, null, 2)}`);
+  }
+
+  return data?.listingss?.items || [];
+}