From f4bfb938b229bc496d636c7386e79c446ed27591 Mon Sep 17 00:00:00 2001
From: Bruce Berrios <58147810+Bruception@users.noreply.github.com>
Date: Mon, 7 Mar 2022 11:25:12 -0500
Subject: [PATCH] Consolidate personal bests endpoints (#2653)

---
 backend/api/controllers/user.ts |  2 +-
 backend/api/routes/users.ts     | 18 ++++++------------
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/backend/api/controllers/user.ts b/backend/api/controllers/user.ts
index f78adb602..eec6588f7 100644
--- a/backend/api/controllers/user.ts
+++ b/backend/api/controllers/user.ts
@@ -215,7 +215,7 @@ class UserController {
     req: MonkeyTypes.Request
   ): Promise<MonkeyResponse> {
     const { uid } = req.ctx.decodedToken;
-    const { mode, mode2 } = req.params;
+    const { mode, mode2 } = req.query;
 
     const data = (await UsersDAO.getPersonalBests(uid, mode, mode2)) ?? null;
     return new MonkeyResponse("Personal bests retrieved", data);
diff --git a/backend/api/routes/users.ts b/backend/api/routes/users.ts
index fa1128de1..a2123cdfe 100644
--- a/backend/api/routes/users.ts
+++ b/backend/api/routes/users.ts
@@ -202,24 +202,18 @@ router.post(
 );
 
 router.get(
-  "/personalBests/:mode/",
+  "/personalBests",
   RateLimit.userGet,
   authenticateRequest({
-    isPublic: false,
     acceptApeKeys: true,
   }),
   ApeRateLimit,
-  asyncHandler(UserController.getPersonalBests)
-);
-
-router.get(
-  "/personalBests/:mode/:mode2",
-  RateLimit.userGet,
-  authenticateRequest({
-    isPublic: false,
-    acceptApeKeys: true,
+  validateRequest({
+    query: {
+      mode: joi.string().required(),
+      mode2: joi.string(),
+    },
   }),
-  ApeRateLimit,
   asyncHandler(UserController.getPersonalBests)
 );