update game model & types

server/src/db/index.ts

@@ -12,8 +12,14 @@ export const INIT_TABLES = `
     );
     CREATE TABLE IF NOT EXISTS "game" (
         id SERIAL PRIMARY KEY,
+        code VARCHAR(8) UNIQUE NOT NULL,
+        winner_id INT REFERENCES "user",
+        reason VARCHAR(16),
         pgn TEXT,
+        host_id INT REFERENCES "user",
         white_id INT REFERENCES "user",
-        black_id INT REFERENCES "user"
+        white_guest_name VARCHAR(32),
+        black_id INT REFERENCES "user",
+        black_guest_name VARCHAR(32)
     );
 `;

server/src/db/models/game.model.ts

@@ -8,15 +8,37 @@ export const activeGames: Array<Game> = [];
 export const create = async (game: Game) => {
     try {
         const res = await db.query(
-            `INSERT INTO "game"(pgn, white_id, black_id, winner) VALUES($1, $2, $3, $4) RETURNING *`,
+            `INSERT INTO "game"(code, winner_id, reason, pgn, host_id, white_id, white_guest_name, black_id, black_guest_name) VALUES($1, $2, $3, $4, $5, $6, $7, $8, $9) RETURNING *`,
-            [game.pgn || null, game.white?.id || null, game.black?.id || null, game.winner || null]
+            [
+                game.code || null,
+                game.winner === "draw"
+                    ? null
+                    : game.winner === "white"
+                    ? game.white?.id
+                    : game.black?.id,
+                game.reason || null,
+                game.pgn,
+                game.host?.id || null,
+                game.white?.id || null,
+                game.white?.name || null,
+                game.black?.id || null,
+                game.black?.name || null
+            ]
         );
         return {
             id: res.rows[0].id,
+            code: res.rows[0].code,
+            winner:
+                res.rows[0].winner_id === res.rows[0].white_id
+                    ? "white"
+                    : res.rows[0].winner_id === res.rows[0].black_id
+                    ? "black"
+                    : "draw",
+            reason: res.rows[0].reason,
             pgn: res.rows[0].pgn,
-            white: { id: res.rows[0].white_id },
+            host: { id: res.rows[0].host_id },
-            black: { id: res.rows[0].black_id },
+            white: { id: res.rows[0].white_id, name: res.rows[0].white_guest_name },
-            winner: res.rows[0].winner
+            black: { id: res.rows[0].black_id, name: res.rows[0].black_guest_name }
         } as Game;
     } catch (err: unknown) {
         console.log(err);
@@ -80,3 +102,12 @@ export const remove = async (id: number) => {
         return null;
     }
 };
+
+const GameModel = {
+    create,
+    find,
+    update,
+    remove
+};
+
+export default GameModel;

types/index.d.ts

@@ -4,6 +4,7 @@ export interface Game {
     white?: User;
     black?: User;
     winner?: "white" | "black" | "draw";
+    reason?: string;
     host?: User;
     code?: string;
     unlisted?: boolean;
@@ -15,5 +16,8 @@ export interface User {
     id?: number | string; // string for guest IDs
     name?: string | null;
     email?: string;
-    connected?: boolean; // mainly for players, not spectators
+
+    // mainly for players, not spectators
+    connected?: boolean;
+    disconnectedOn?: number;
 }