chore: Add game normalizing functions to DB

Author: PartMan7

src/database/games.ts

@@ -11,7 +11,7 @@ import { toId } from '@/utils/toId';
 
 import type { Log as ScrabbleLog } from '@/ps/games/scrabble/logs';
 import type { WinCtx as ScrabbleWinCtx } from '@/ps/games/scrabble/types';
-import type { Player } from '@/ps/games/types';
+import type { BaseLog, Player } from '@/ps/games/types';
 
 const schema = new mongoose.Schema<GameModel>({
 	id: {
@@ -80,11 +80,19 @@ export interface GameModel {
 }
 const model = mongoose.model('game', schema, 'games', { overwriteModels: true });
 
+export type NormalizedGame = Omit<GameModel, 'players' | 'log'> & { players: Record<string, Player>; log: BaseLog[] };
+
 export async function uploadGame(game: GameModel): Promise<GameModel | null> {
 	if (!IS_ENABLED.DB) return null;
 	return model.create(game);
 }
 
+// Hydrate logStrings into log objects
+export function normalizeGame(game: HydratedDocument<GameModel>): NormalizedGame {
+	const serializable = 'toJSON' in game ? game.toJSON()! : game;
+	return { ...serializable, log: serializable.log.map(entry => JSON.parse(entry)) };
+}
+
 export async function getGameById(gameType: string, gameId: string): Promise<HydratedDocument<GameModel> | null> {
 	if (!IS_ENABLED.DB) return null;
 	const id = gameId.toUpperCase().replace(/^#?/, '#');

src/web/api/[game]/[gameId].ts

@@ -1,4 +1,4 @@
-import { getGameById } from '@/database/games';
+import { getGameById, normalizeGame } from '@/database/games';
 import { IS_ENABLED } from '@/enabled';
 import { Games } from '@/ps/games';
 import { WebError } from '@/utils/webError';
@@ -10,9 +10,9 @@ export const handler: RequestHandler = async (req, res, next) => {
 	const { game: gameType, gameId } = req.params as { game: string; gameId: string };
 	if (!Object.keys(Games).includes(gameType)) return next();
 	try {
-		const game = await getGameById(gameType, gameId);
-		const serializable = game!.toJSON();
-		res.json({ ...serializable, log: serializable.log.map(entry => JSON.parse(entry)) });
+		const record = (await getGameById(gameType, gameId))!;
+		const game = normalizeGame(record);
+		res.json(game);
 	} catch (err: unknown) {
 		if (err instanceof Error) throw new WebError(err.message, 404);
 	}