refactor: use findOne instead of limit(1) (@fehmer) (monkeytypegame#6924)

Author: fehmer

backend/src/api/controllers/dev.ts

@@ -211,18 +211,15 @@ async function updateUser(uid: string): Promise<void> {
   );
 
   for (const mode of modes) {
-    const best = (
-      await ResultDal.getResultCollection()
-        .find({
-          uid,
-          language: mode.language,
-          mode: mode.mode,
-          mode2: mode.mode2,
-        })
-        .sort({ wpm: -1, timestamp: 1 })
-        .limit(1)
-        .toArray()
-    )[0] as DBResult;
+    const best = (await ResultDal.getResultCollection().findOne(
+      {
+        uid,
+        language: mode.language,
+        mode: mode.mode,
+        mode2: mode.mode2,
+      },
+      { sort: { wpm: -1, timestamp: 1 } }
+    )) as DBResult;
 
     if (personalBests[mode.mode] === undefined) personalBests[mode.mode] = {};
     if (personalBests[mode.mode][mode.mode2] === undefined)

backend/src/dal/result.ts

@@ -70,22 +70,25 @@ export async function getResult(uid: string, id: string): Promise<DBResult> {
 }
 
 export async function getLastResult(uid: string): Promise<DBResult> {
-  const [lastResult] = await getResultCollection()
-    .find({ uid })
-    .sort({ timestamp: -1 })
-    .limit(1)
-    .toArray();
-  if (!lastResult) throw new MonkeyError(404, "No last result found");
+  const lastResult = await getResultCollection().findOne(
+    { uid },
+    { sort: { timestamp: -1 } }
+  );
+
+  if (lastResult === null) throw new MonkeyError(404, "No last result found");
   return convert(lastResult);
 }
 
 export async function getLastResultTimestamp(uid: string): Promise<number> {
-  const [lastResult] = await getResultCollection()
-    .find({ uid }, { projection: { timestamp: 1, _id: 0 } })
-    .sort({ timestamp: -1 })
-    .limit(1)
-    .toArray();
-  if (!lastResult) throw new MonkeyError(404, "No last result found");
+  const lastResult = await getResultCollection().findOne(
+    { uid },
+    {
+      projection: { timestamp: 1, _id: 0 },
+      sort: { timestamp: -1 },
+    }
+  );
+
+  if (lastResult === null) throw new MonkeyError(404, "No last result found");
   return lastResult.timestamp;
 }
 

backend/src/dal/user.ts

@@ -265,13 +265,12 @@ export async function getPartialUser<K extends keyof DBUser>(
 }
 
 export async function findByName(name: string): Promise<DBUser | undefined> {
-  return (
-    await getUsersCollection()
-      .find({ name })
-      .collation({ locale: "en", strength: 1 })
-      .limit(1)
-      .toArray()
-  )[0];
+  const found = await getUsersCollection().findOne(
+    { name },
+    { collation: { locale: "en", strength: 1 } }
+  );
+
+  return found !== null ? found : undefined;
 }
 
 export async function isNameAvailable(

package.json

@@ -67,6 +67,7 @@
     "@commitlint/cli": "17.7.1",
     "@commitlint/config-conventional": "19.2.2",
     "@monkeytype/release": "workspace:*",
+    "@vitest/coverage-v8": "3.2.4",
     "conventional-changelog": "6.0.0",
     "eslint": "8.57.1",
     "husky": "8.0.1",