From 08cda896097b27c5e8f0743a3cbb66ac7ea8251f Mon Sep 17 00:00:00 2001
From: Will Bradley <wbradley@netburner.com>
Date: Wed, 16 Jul 2025 19:11:58 -0700
Subject: [PATCH] Fix unknown oauth user display

---
 server.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/server.js b/server.js
index 1fc7e77..7ff4913 100644
--- a/server.js
+++ b/server.js
@@ -365,12 +365,12 @@ app.get('/api/cities/:cityName/stations', (req, res) => {
   const query = `
     SELECT 
       ws.*,
-      u.username as created_by_name,
+      COALESCE(u.display_name, u.username) as created_by_name,
       su.description as latest_description,
       su.last_refill_time,
       su.estimated_empty_time,
       su.updated_at as last_updated,
-      u2.username as updated_by_name,
+      COALESCE(u2.display_name, u2.username) as updated_by_name,
       c.display_name as city_name
     FROM water_stations ws
     JOIN cities c ON ws.city_id = c.id
@@ -417,12 +417,12 @@ app.get('/api/stations', (req, res) => {
   const query = `
     SELECT 
       ws.*,
-      u.username as created_by_name,
+      COALESCE(u.display_name, u.username) as created_by_name,
       su.description as latest_description,
       su.last_refill_time,
       su.estimated_empty_time,
       su.updated_at as last_updated,
-      u2.username as updated_by_name
+      COALESCE(u2.display_name, u2.username) as updated_by_name
     FROM water_stations ws
     LEFT JOIN users u ON ws.created_by = u.id
     LEFT JOIN (