2 files changed, 36 insertions, 2 deletions
diff --git a/backend/src/routes/score.ts b/backend/src/routes/score.ts
index a652b93..168629a 100644
--- a/backend/src/routes/score.ts
+++ b/backend/src/routes/score.ts
@@ -181,6 +181,7 @@ export const handleGetScores = async (
     if (!userId || !internalGameName || !pageNum) {
       return res.status(400).json({ error: "Missing required parameters" });
     }
+
     const pageNumber = parseInt(pageNum as string);
     const gameInternalName = internalGameName as string;
     const userIdNumber = parseInt(userId as string);
@@ -200,6 +201,15 @@ export const handleGetScores = async (
     let scores;
     let totalScores;
 
+    const user = await prisma.user.findUnique({
+      where: { id: userIdNumber },
+      select: { username: true },
+    });
+
+    if (!user) {
+      return res.status(404).json({ error: "User not found" });
+    }
+
     if (pbOnlyFlag) {
       // For pbOnly, we need to get the best score for each chart
       if (sortKeyString === "timestamp") {
@@ -359,6 +369,7 @@ export const handleGetScores = async (
     res.status(200).json({
       scores: safeScores,
       num_pages,
+      user: user.username
     });
   } catch (error) {
     console.error("Failed to fetch scores:", error);
diff --git a/backend/src/routes/user.ts b/backend/src/routes/user.ts
index 497d6da..b99964b 100644
--- a/backend/src/routes/user.ts
+++ b/backend/src/routes/user.ts
@@ -2,6 +2,11 @@
 import express from 'express';
 import { prisma } from '../config/db';
 
+interface recentPlayedGame {
+  gameInternalName: string;
+  timestamp: BigInt;
+}
+
 export const handleMeRoute = async (req: express.Request, res: express.Response) => {
   try {
     const { userId } = req.query;
@@ -12,13 +17,31 @@ export const handleMeRoute = async (req: express.Request, res: express.Response)
       where: { id: parseInt(userId as string) },
       select: { id: true, username: true, isAdmin: true, bio: true }
     });
+    const recentPlayedGames: recentPlayedGame[] = await prisma.$queryRaw`
+      SELECT DISTINCT ON (s."gameInternalName")
+        g."formattedName",
+        s."gameInternalName",
+        s."timestamp"
+      FROM "Score" s
+      INNER JOIN "Game" g ON g."internalName" = s."gameInternalName"
+      WHERE s."userId" = ${parseInt(userId as string)}
+      ORDER BY s."gameInternalName", s."timestamp" DESC;
+    `;
+    const safeGames= recentPlayedGames.map((game) => ({
+      ...game,
+      timestamp:
+        typeof game.timestamp === "bigint"
+          ? Number(game.timestamp)
+          : game.timestamp,
+    }));
     const isAdmin = user.id === 1 || user.isAdmin;
-    res.json({user, isAdmin});
+    const { isAdmin: _, ...safeUser } = user;
+    res.json({ user: safeUser, recentPlayedGames: safeGames, isAdmin });
   } catch (error) {
     console.error('Me endpoint error:', error);
     res.status(500).json({ error: 'Internal server error' });
   }
-}
+};
 
 export const handleGetCurrentSession =  async (req: express.Request, res: express.Response) => {
   try {