Test migrate stempeln to kysely

NullDev · Mar 25, 2024 · f5d9efa · f5d9efa
1 parent b8d4230
commit f5d9efa
Show file tree

Hide file tree

Showing 5 changed files with 61 additions and 47 deletions.
diff --git a/src/commands/stempelkarte.ts b/src/commands/stempelkarte.ts
@@ -10,7 +10,7 @@ import {
     SlashCommandUserOption,
 } from "discord.js";
 
-import Stempel from "../storage/model/Stempel.js";
+import * as stempel from "../storage/stempel.js";
 import log from "../utils/logger.js";
 import type { ApplicationCommand, CommandResult } from "./command.js";
 import { chunkArray } from "../utils/arrayUtils.js";
@@ -140,7 +140,7 @@ export class StempelkarteCommand implements ApplicationCommand {
         const getUserById = (id: Snowflake) =>
             command.guild?.members.cache.find(member => member.id === id);
 
-        const allInvitees = await Stempel.getStempelByInvitator(ofMember.id);
+        const allInvitees = await stempel.getStempelByInvitator(ofMember);
 
         if (allInvitees.length === 0) {
             await command.reply({

diff --git a/src/commands/stempeln.ts b/src/commands/stempeln.ts
@@ -1,20 +1,12 @@
 import {
     type CommandInteraction,
     type Client,
-    type GuildMember,
     SlashCommandBuilder,
     SlashCommandUserOption,
 } from "discord.js";
 
 import type { ApplicationCommand, CommandResult } from "./command.js";
-import Stempel from "../storage/model/Stempel.js";
-
-const stempelUser = async (
-    invitator: GuildMember,
-    invitedMember: GuildMember,
-): Promise<boolean> => {
-    return Stempel.insertStempel(invitator.id, invitedMember.id);
-};
+import * as stempel from "../storage/stempel.js";
 
 const replies = [
     "Der Bruder {0} hat den neuen Bruder {1} eingeladen und du hast dies so eben bestätigt!",
@@ -67,7 +59,7 @@ export class StempelCommand implements ApplicationCommand {
             return;
         }
 
-        const isNewInvite = await stempelUser(invitator, invitedUser);
+        const isNewInvite = await stempel.insertStempel(invitator, invitedUser);
         if (isNewInvite) {
             const reply = replies[Math.floor(Math.random() * replies.length)]
                 .replace("{0}", invitator.toString())

diff --git a/src/storage/model.ts b/src/storage/model.ts
@@ -5,6 +5,7 @@ import type { OneBasedMonth } from "./birthday.js";
 
 export interface Database {
     birthdays: BirthdayTable;
+    stempels: StempelTable;
 }
 
 export type Uuid = string;
@@ -25,3 +26,19 @@ export interface BirthdayTable {
     createdAt: ColumnType<string, string, never>;
     updatedAt: ColumnType<string, string, never>;
 }
+
+export type Stempel = Selectable<StempelTable>;
+
+export interface StempelTable {
+    // Cannot use GeneratedAlways because sequelize generated the ID on the client side
+    // id: GeneratedAlways<Uuid>;
+    id: ColumnType<Uuid, Uuid, never>;
+
+    invitator: Snowflake;
+    invitedMember: Snowflake;
+
+    // TODO: These don't seem to be taken care of by the database, so we need to insert them manually
+    // Also, Date is not supported by the DB driver
+    createdAt: ColumnType<string, string, never>;
+    updatedAt: ColumnType<string, string, never>;
+}
diff --git a/src/storage/model/Stempel.ts b/src/storage/model/Stempel.ts
@@ -1,8 +1,6 @@
 import { type Sequelize, Model, DataTypes, type Optional } from "sequelize";
 import type { Snowflake } from "discord.js";
 
-import log from "../../utils/logger.js";
-
 export interface StempelAttributes {
     id: string;
     invitator: Snowflake;
@@ -19,39 +17,6 @@ export default class Stempel
     declare invitator: Snowflake;
     declare invitedMember: Snowflake;
 
-    /**
-     * @returns true/false depending if the invitedMember is already in the database
-     */
-    static async insertStempel(
-        invitator: Snowflake,
-        invitedMember: Snowflake,
-    ): Promise<boolean> {
-        log.debug(
-            `Inserting Stempel into Database with ${invitator} invitator and ${invitedMember} as invited member`,
-        );
-        try {
-            await Stempel.create({
-                invitator,
-                invitedMember,
-            });
-            return true;
-        } catch {
-            log.debug("Stempel does already exist");
-            return false;
-        }
-    }
-
-    /**
-     * @param {Snowflake} invitator Snowflake ID of the inviter.
-     */
-    static getStempelByInvitator(invitator: Snowflake) {
-        return Stempel.findAll({
-            where: {
-                invitator,
-            },
-        });
-    }
-
     static initialize(sequelize: Sequelize) {
         Stempel.init(
             {

diff --git a/src/storage/stempel.ts b/src/storage/stempel.ts
@@ -0,0 +1,40 @@
+import type { GuildMember, Snowflake } from "discord.js";
+
+import type { Stempel } from "./model.js";
+import db from "./kysely.js";
+
+/**
+ * @returns true/false depending if the invitedMember is already in the database
+ */
+export async function insertStempel(
+    invitator: GuildMember,
+    invitedMember: GuildMember,
+    ctx = db(),
+): Promise<boolean> {
+    const now = new Date().toISOString();
+
+    const res = await ctx
+        .insertInto("stempels")
+        .values({
+            id: crypto.randomUUID(),
+            invitator: invitator.id,
+            invitedMember: invitedMember.id,
+            createdAt: now,
+            updatedAt: now,
+        })
+        .returning("id")
+        .executeTakeFirst();
+
+    return typeof res?.id === "string";
+}
+
+export function getStempelByInvitator(
+    invitator: GuildMember,
+    ctx = db(),
+): Promise<Stempel[]> {
+    return ctx
+        .selectFrom("stempels")
+        .where("invitator", "=", invitator.id)
+        .selectAll()
+        .execute();
+}