Fix bug in results page

api/src/openapi.ts

@@ -667,13 +667,13 @@ export const RecalculateLeaderboardSchema = {
 
 export const UserResultsResponseComponent = z
   .object({
-    user_name: z.string(),
-    user_id: z.number(),
+    userName: z.string(),
+    userId: z.number(),
     rank: z.number(),
-    seasonId: z.number().optional(),
-    seasonName: z.string().optional(),
-    format: FormatComponent.optional(),
-    factionCode: z.string().optional(),
+    seasonId: z.number().optional().nullable(),
+    seasonName: z.string().optional().nullable(),
+    format: FormatComponent.optional().nullable(),
+    factionCode: z.string().optional().nullable(),
     results: z.array(ResultComponent),
   })
   .openapi("UserResultsResponse");

api/src/routes/users.ts

@@ -17,6 +17,7 @@ import {
   ResultComponent,
   type UpdateUserComponentType,
   UserComponent,
+  UserResultsResponseComponent,
 } from "../openapi.js";
 import type { FactionCode, Format } from "../schema.js";
 import type { Env, RequestWithDB } from "../types.d.js";
@@ -133,15 +134,17 @@ export class GetUserResults extends OpenAPIRoute {
       }
     }
 
-    return json({
-      user_id: user.id,
-      user_name: user.name,
-      season_id: seasonId || null,
-      seasonName: seasonName,
-      format: format,
-      factionCode: faction?.code || null,
-      rank: currentRank,
-      results: results.map((result) => ResultComponent.parse(result)),
-    });
+    return json(
+      UserResultsResponseComponent.parse({
+        userId: user.id,
+        userName: user.name,
+        seasonId: seasonId || null,
+        seasonName: seasonName,
+        format: format,
+        factionCode: faction?.code || null,
+        rank: currentRank,
+        results: results.map((result) => ResultComponent.parse(result)),
+      }),
+    );
   }
 }

app/src/client/models/UserResultsResponse.ts

@@ -7,8 +7,8 @@ import type { Format } from './Format';
 import type { Result } from './Result';
 
 export type UserResultsResponse = {
-    user_name: string;
-    user_id: number;
+    userName: string;
+    userId: number;
     rank: number;
     seasonId?: number;
     seasonName?: string;