Test remove old birthday model

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

Hide file tree

Showing 6 changed files with 11 additions and 62 deletions.
diff --git a/src/commands/geburtstag.ts b/src/commands/geburtstag.ts
@@ -7,7 +7,6 @@ import {
 } from "discord.js";
 
 import type { ApplicationCommand } from "./command.js";
-import { isOneBasedMonth } from "../storage/model/Birthday.js";
 import log from "../utils/logger.js";
 import * as birthday from "../storage/birthday.js";
 
@@ -47,7 +46,9 @@ export class GeburtstagCommand implements ApplicationCommand {
         const day = command.options.getInteger("day", true);
         const month = command.options.getInteger("month", true);
 
-        if (!isOneBasedMonth(month)) return;
+        if (!birthday.isOneBasedMonth(month)) {
+            return;
+        }
 
         const date = moment(`${month}-${day}`, "MM-DD");
 

diff --git a/src/handler/bdayHandler.ts b/src/handler/bdayHandler.ts
@@ -1,7 +1,6 @@
 import type { GuildMember, Role } from "discord.js";
 
 import log from "../utils/logger.js";
-import Birthday from "../storage/model/Birthday.js";
 import * as birthday from "../storage/birthday.js";
 
 import type { BotContext } from "../context.js";

diff --git a/src/storage/birthday.ts b/src/storage/birthday.ts
@@ -1,8 +1,7 @@
 import type { Snowflake } from "discord.js";
-import type { Birthday } from "./model";
-import type { OneBasedMonth } from "./model/Birthday";
 
-import db from "./kysely";
+import type { Birthday } from "./model.js";
+import db from "./kysely.js";
 
 export function getBirthday(
     userId: Snowflake,
@@ -60,3 +59,8 @@ export function getAll(ctx = db()) {
 function convertMonth(monthId: number): OneBasedMonth {
     return (monthId + 1) as OneBasedMonth;
 }
+
+export type OneBasedMonth = 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12;
+export function isOneBasedMonth(v: unknown): v is OneBasedMonth {
+    return typeof v === "number" && Number.isInteger(v) && v >= 1 && v <= 12;
+}
diff --git a/src/storage/model.ts b/src/storage/model.ts
@@ -1,7 +1,7 @@
 import type { Snowflake } from "discord.js";
 import type { ColumnType, GeneratedAlways, Selectable } from "kysely";
 
-import type { OneBasedMonth } from "./model/Birthday";
+import type { OneBasedMonth } from "./birthday.js";
 
 export interface Database {
     birthdays: BirthdayTable;

diff --git a/src/storage/model/Birthday.ts b/src/storage/model/Birthday.ts
diff --git a/src/storage/storage.ts b/src/storage/storage.ts
@@ -1,7 +1,6 @@
 import { Sequelize } from "sequelize";
 
 import AdditionalMessageData from "./model/AdditionalMessageData.js";
-import Birthday from "./model/Birthday.js";
 import FadingMessage from "./model/FadingMessage.js";
 import GuildRagequit from "./model/GuildRagequit.js";
 import Stempel from "./model/Stempel.js";
@@ -36,7 +35,6 @@ export async function initialize(databasePath: string) {
     AdditionalMessageData.initialize(sequelize);
     GuildRagequit.initialize(sequelize);
     Stempel.initialize(sequelize);
-    Birthday.initialize(sequelize);
     Ban.initialize(sequelize);
     Penis.initialize(sequelize);
     Boob.initialize(sequelize);