refactor: remove lodash from backend (@fehmer)

backend/__tests__/__integration__/dal/ape-keys.spec.ts

@@ -1,23 +1,107 @@
-import { describe, it, expect } from "vitest";
+import { describe, it, expect, vi, beforeEach } from "vitest";
 import { ObjectId } from "mongodb";
-import { addApeKey } from "../../../src/dal/ape-keys";
+import {
+  addApeKey,
+  DBApeKey,
+  editApeKey,
+  getApeKey,
+  updateLastUsedOn,
+} from "../../../src/dal/ape-keys";
 
 describe("ApeKeysDal", () => {
-  it("should be able to add a new ape key", async () => {
-    const apeKey = {
-      _id: new ObjectId(),
-      uid: "123",
-      name: "test",
-      hash: "12345",
-      createdOn: Date.now(),
-      modifiedOn: Date.now(),
-      lastUsedOn: Date.now(),
-      useCount: 0,
-      enabled: true,
-    };
-
-    const apeKeyId = await addApeKey(apeKey);
-
-    expect(apeKeyId).toBe(apeKey._id.toHexString());
+  beforeEach(() => {
+    vi.useFakeTimers();
+  });
+
+  describe("addApeKey", () => {
+    it("should be able to add a new ape key", async () => {
+      const apeKey = buildApeKey();
+
+      const apeKeyId = await addApeKey(apeKey);
+
+      expect(apeKeyId).toBe(apeKey._id.toHexString());
+
+      const read = await getApeKey(apeKeyId);
+      expect(read).toEqual({
+        ...apeKey,
+      });
+    });
+  });
+
+  describe("editApeKey", () => {
+    it("should edit name of an existing ape key", async () => {
+      //GIVEN
+      const apeKey = buildApeKey({ useCount: 5, enabled: true });
+      const apeKeyId = await addApeKey(apeKey);
+
+      //WHEN
+      const newName = "new name";
+      await editApeKey(apeKey.uid, apeKeyId, newName, undefined);
+
+      //THENa
+      const readAfterEdit = (await getApeKey(apeKeyId)) as DBApeKey;
+      expect(readAfterEdit).toEqual({
+        ...apeKey,
+        name: newName,
+        modifiedOn: Date.now(),
+      });
+    });
+
+    it("should edit enabled of an existing ape key", async () => {
+      //GIVEN
+      const apeKey = buildApeKey({ useCount: 5, enabled: true });
+      const apeKeyId = await addApeKey(apeKey);
+
+      //WHEN
+
+      await editApeKey(apeKey.uid, apeKeyId, undefined, false);
+
+      //THEN
+      const readAfterEdit = (await getApeKey(apeKeyId)) as DBApeKey;
+      expect(readAfterEdit).toEqual({
+        ...apeKey,
+        enabled: false,
+        modifiedOn: Date.now(),
+      });
+    });
+  });
+
+  describe("updateLastUsedOn", () => {
+    it("should update lastUsedOn and increment useCount when editing with lastUsedOn", async () => {
+      //GIVEN
+      const apeKey = buildApeKey({
+        useCount: 5,
+        lastUsedOn: 42,
+      });
+      const apeKeyId = await addApeKey(apeKey);
+
+      //WHEN
+      await updateLastUsedOn(apeKey.uid, apeKeyId);
+      await updateLastUsedOn(apeKey.uid, apeKeyId);
+
+      //THENa
+      const readAfterEdit = (await getApeKey(apeKeyId)) as DBApeKey;
+      expect(readAfterEdit).toEqual({
+        ...apeKey,
+        modifiedOn: readAfterEdit.modifiedOn,
+        lastUsedOn: Date.now(),
+        useCount: 5 + 2,
+      });
+    });
   });
 });
+
+function buildApeKey(overrides: Partial<DBApeKey> = {}): DBApeKey {
+  return {
+    _id: new ObjectId(),
+    uid: "123",
+    name: "test",
+    hash: "12345",
+    createdOn: Date.now(),
+    modifiedOn: Date.now(),
+    lastUsedOn: Date.now(),
+    useCount: 0,
+    enabled: true,
+    ...overrides,
+  };
+}

backend/__tests__/__integration__/dal/config.spec.ts

@@ -0,0 +1,42 @@
+import { ObjectId } from "mongodb";
+import { describe, expect, it } from "vitest";
+import * as ConfigDal from "../../../src/dal/config";
+
+const getConfigCollection = ConfigDal.__testing.getConfigCollection;
+
+describe("ConfigDal", () => {
+  describe("saveConfig", () => {
+    it("should save and update user configuration correctly", async () => {
+      //GIVEN
+      const uid = new ObjectId().toString();
+      await getConfigCollection().insertOne({
+        uid,
+        config: {
+          ads: "on",
+          time: 60,
+          quickTab: true, //legacy value
+        },
+      } as any);
+
+      //WHEN
+      await ConfigDal.saveConfig(uid, {
+        ads: "on",
+        difficulty: "normal",
+      } as any);
+
+      //WHEN
+      await ConfigDal.saveConfig(uid, { ads: "off" });
+
+      //THEN
+      const savedConfig = (await ConfigDal.getConfig(
+        uid
+      )) as ConfigDal.DBConfig;
+
+      expect(savedConfig.config.ads).toBe("off");
+      expect(savedConfig.config.time).toBe(60);
+
+      //should remove legacy values
+      expect((savedConfig.config as any)["quickTab"]).toBeUndefined();
+    });
+  });
+});

backend/__tests__/__integration__/dal/leaderboards.isolated.spec.ts

@@ -1,5 +1,4 @@
 import { describe, it, expect, afterEach, vi } from "vitest";
-import _ from "lodash";
 import { ObjectId } from "mongodb";
 import * as UserDal from "../../../src/dal/user";
 import * as LeaderboardsDal from "../../../src/dal/leaderboards";
@@ -11,6 +10,7 @@ import * as DB from "../../../src/init/db";
 import { LbPersonalBests } from "../../../src/utils/pb";
 
 import { pb } from "../../__testData__/users";
+import { omit } from "../../../src/utils/misc";
 
 describe("LeaderboardsDal", () => {
   afterEach(async () => {
@@ -59,7 +59,7 @@ describe("LeaderboardsDal", () => {
       )) as DBLeaderboardEntry[];
 
       //THEN
-      const lb = result.map((it) => _.omit(it, ["_id"]));
+      const lb = result.map((it) => omit(it, "_id"));
 
       expect(lb).toEqual([
         expectedLbEntry("15", { rank: 1, user: rank1 }),
@@ -86,7 +86,7 @@ describe("LeaderboardsDal", () => {
       )) as LeaderboardsDal.DBLeaderboardEntry[];
 
       //THEN
-      const lb = result.map((it) => _.omit(it, ["_id"]));
+      const lb = result.map((it) => omit(it, "_id"));
 
       expect(lb).toEqual([
         expectedLbEntry("60", { rank: 1, user: rank1 }),
@@ -200,7 +200,7 @@ describe("LeaderboardsDal", () => {
       )) as DBLeaderboardEntry[];
 
       //THEN
-      const lb = result.map((it) => _.omit(it, ["_id"]));
+      const lb = result.map((it) => omit(it, "_id"));
 
       expect(lb).toEqual([
         expectedLbEntry("15", { rank: 1, user: noBadge }),
@@ -239,7 +239,7 @@ describe("LeaderboardsDal", () => {
       )) as DBLeaderboardEntry[];
 
       //THEN
-      const lb = result.map((it) => _.omit(it, ["_id"]));
+      const lb = result.map((it) => omit(it, "_id"));
 
       expect(lb).toEqual([
         expectedLbEntry("15", { rank: 1, user: noPremium }),

backend/__tests__/__integration__/dal/preset.spec.ts

@@ -1,7 +1,6 @@
 import { describe, it, expect } from "vitest";
 import { ObjectId } from "mongodb";
 import * as PresetDal from "../../../src/dal/preset";
-import _ from "lodash";
 
 describe("PresetDal", () => {
   describe("readPreset", () => {

backend/__tests__/__integration__/dal/result.spec.ts

@@ -50,7 +50,7 @@ async function createDummyData(
         tags: [],
         consistency: 100,
         keyConsistency: 100,
-        chartData: { wpm: [], raw: [], err: [] },
+        chartData: { wpm: [], burst: [], err: [] },
         uid,
         keySpacingStats: { average: 0, sd: 0 },
         keyDurationStats: { average: 0, sd: 0 },