feat: added textid column to games table

vycdev · Jul 16, 2020 · 4a72b79 · 4a72b79
1 parent e661bc6
commit 4a72b79
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 16 deletions.
diff --git a/packages/api/db/migrations/20200716182727_add_text_id_to_games.ts b/packages/api/db/migrations/20200716182727_add_text_id_to_games.ts
@@ -0,0 +1,16 @@
+import Knex from "knex";
+
+export const up = async (knex: Knex) => {
+    return knex.schema.alterTable("games", table => {
+        table
+            .integer("textid")
+            .notNullable()
+            .defaultTo(11);
+    });
+};
+
+export const down = async (knex: Knex) => {
+    return knex.schema.alterTable("games", table => {
+        return table.dropColumn("textid");
+    });
+};
diff --git a/packages/api/src/modules/games/actions/createGame.ts b/packages/api/src/modules/games/actions/createGame.ts
@@ -10,7 +10,8 @@ export const createGame = async (
     wpm: number,
     rawwpm: number,
     accuracy: number,
-    difficulty: number
+    difficulty: number,
+    textid: number
 ): Promise<Game> => {
     const newGame = {
         gameid: (await highestGameId()) + 1,
@@ -19,6 +20,7 @@ export const createGame = async (
         rawwpm,
         accuracy,
         difficulty,
+        textid,
         date: Date.now()
     };
     const possibleAchievements: Achievement[] = await findAchievementsByRequirement(

diff --git a/packages/api/src/modules/games/router.test.ts b/packages/api/src/modules/games/router.test.ts
@@ -42,18 +42,18 @@ describe("Game routes", async () => {
     it("Deletes games past 10 games", async function() {
         this.timeout(5000);
 
-        await createGame(4, 0, 0, 0, 1);
-        await createGame(4, 0, 0, 0, 1);
-        await createGame(4, 0, 0, 0, 1);
-        await createGame(4, 0, 0, 0, 1);
-        await createGame(4, 0, 0, 0, 1);
-        await createGame(4, 0, 0, 0, 1);
-        await createGame(4, 0, 0, 0, 1);
-        await createGame(4, 0, 0, 0, 1);
-        await createGame(4, 0, 0, 0, 1);
-        await createGame(4, 0, 0, 0, 1);
-        await createGame(4, 0, 0, 0, 1);
-        await createGame(4, 0, 0, 0, 1);
+        await createGame(4, 0, 0, 0, 1, 11);
+        await createGame(4, 0, 0, 0, 1, 11);
+        await createGame(4, 0, 0, 0, 1, 11);
+        await createGame(4, 0, 0, 0, 1, 11);
+        await createGame(4, 0, 0, 0, 1, 11);
+        await createGame(4, 0, 0, 0, 1, 11);
+        await createGame(4, 0, 0, 0, 1, 11);
+        await createGame(4, 0, 0, 0, 1, 11);
+        await createGame(4, 0, 0, 0, 1, 11);
+        await createGame(4, 0, 0, 0, 1, 11);
+        await createGame(4, 0, 0, 0, 1, 11);
+        await createGame(4, 0, 0, 0, 1, 11);
 
         await Promise.all([
             removeOldGame(4),
@@ -67,7 +67,7 @@ describe("Game routes", async () => {
     });
 
     it("Checks for achievements", async () => {
-        await createGame(4, 32, 40, 80, 5);
+        await createGame(4, 32, 40, 80, 5, 11);
         await removeOldGame(4);
 
         const achievements = await agent.get("/api/users/achievements/4");

diff --git a/packages/api/src/modules/games/router.ts b/packages/api/src/modules/games/router.ts
@@ -13,14 +13,15 @@ router.post(
     requireAuthenticated(),
     validateSchema(newGameBody, "body"),
     async (ctx, next) => {
-        const { wpm, rawwpm, accuracy, difficulty } = ctx.request.body;
+        const { wpm, rawwpm, accuracy, difficulty, textid } = ctx.request.body;
         const { user } = ctx.session!;
         const newGame = await createGame(
             user,
             wpm,
             rawwpm,
             accuracy,
-            difficulty
+            difficulty,
+            textid
         );
         await removeOldGame(user);
         await checkPB(newGame);