update leaderboard to have name, and peer db to have name.

Author: Ughuuu

src/database/database.cpp

@@ -80,10 +80,11 @@ void Database::connect_to_db() {
             "CREATE TABLE IF NOT EXISTS peers ("
             "id TEXT NOT NULL, "
             "peer_id TEXT NOT NULL, "
-            "name TEXT, "
+            "name TEXT NOT NULL, "
             "game_id TEXT NOT NULL, "
             "timestamp TIMESTAMPTZ DEFAULT NOW(), "
-            "PRIMARY KEY (id, game_id)"
+            "PRIMARY KEY (id, game_id),"
+            "UNIQUE (peer_id, game_id)"
             ");");
         txn.exec("CREATE INDEX IF NOT EXISTS idx_peers_peer_game ON peers (peer_id, game_id);");
         txn.commit();
@@ -139,27 +140,34 @@ void Database::leaderboard_set_score(const std::string& leaderboard_id, const st
     txn.commit();
 }
 
-// Set or update user data
+// Update user data if row exists
 void Database::set_user_data(const std::string& game_id, const std::string& peer_id,
                              const boost::container::flat_map<std::string, AnyElement>& user_data) {
     ensure_connection();
+
     // Extract optional name from user_data key "n"
-    std::string name;
+    std::string name = "";
     auto it = user_data.find("n");
     if (it != user_data.end()) {
         const AnyElement& nElem = it->second;
         if (std::holds_alternative<std::string>(nElem.value)) {
             name = std::get<std::string>(nElem.value);
         }
     }
+
+    if (name.empty()) {
+        std::cerr << "Name is required for user data" << std::endl;
+        return;
+    }
+
     pqxx::work txn(*connection);
-    txn.exec(pqxx::zview("INSERT INTO peers (id, peer_id, name, game_id) "
-                         "VALUES ($1, $2, $3, $4) "
-                         "ON CONFLICT (id, game_id) DO UPDATE SET "
-                         "peer_id = EXCLUDED.peer_id, "
-                         "name = EXCLUDED.name, "
-                         "timestamp = NOW();"),
-             pqxx::params(peer_id, peer_id, name, game_id));
+
+    // Only update existing row
+    txn.exec(pqxx::zview("UPDATE peers "
+                         "SET name = $1, timestamp = NOW() "
+                         "WHERE peer_id = $2 AND game_id = $3;"),
+             pqxx::params(name, peer_id, game_id));
+
     txn.commit();
 }
 
@@ -233,8 +241,8 @@ std::string Database::get_peer_or_insert(const std::string& reconnection_token,
     }
 
     // Not found, insert new peer
-    txn.exec(pqxx::zview("INSERT INTO peers (id, peer_id, game_id) VALUES ($1, $2, $3);"),
-             pqxx::params(reconnection_token, peer_id, game_id));
+    txn.exec(pqxx::zview("INSERT INTO peers (id, peer_id, name, game_id) VALUES ($1, $2, $3, $4);"),
+             pqxx::params(reconnection_token, peer_id, "", game_id));
     txn.commit();
     return peer_id;
 }

src/main.cpp

@@ -112,11 +112,7 @@ int main(int argc, char *argv[]) {
     }
     moodycamel::BlockingReaderWriterQueue<WebSocketReceivedMessage> receive_queue(
         message_queue_length);
-    moodycamel::BlockingReaderWriterQueue<DatabaseReceivedMessage> &database_queue =
-        config_reader.GetBoolean("database", "enabled", false)
-            ? *new moodycamel::BlockingReaderWriterQueue<DatabaseReceivedMessage>(
-                  message_queue_length)
-            : *new moodycamel::BlockingReaderWriterQueue<DatabaseReceivedMessage>(0);
+    moodycamel::BlockingReaderWriterQueue<DatabaseReceivedMessage> database_queue(message_queue_length);
     std::cout << "Starting webserver" << std::endl;
     uWS::App app = uWS::App();
     WebSocketServer webserver(