Merge pull request #145 from GalvinPython/refactor/database

Author: GalvinPython

.env.example

@@ -17,17 +17,8 @@ TWITCH_CLIENT_SECRET='YOUR_TWITCH_CLIENT_SECRET'
 CONFIG_UPDATE_INTERVAL_YOUTUBE='10'
 CONFIG_UPDATE_INTERVAL_TWITCH='2'
 CONFIG_DISCORD_LOGS_CHANNEL='YOUR_DISCORD_LOGS_CHANNEL'
+CONFIG_DISCORD_WAIT_FOR_GUILD_CACHE_TIME='YOUR_TIME_IN_SECONDS'
 
-# Postgres
-POSTGRES_HOST='YOUR_POSTGRES_HOST'
-POSTGRES_PORT='YOUR_POSTGRES_PORT'
-POSTGRES_USER='YOUR_POSTGRES_USER'
-POSTGRES_PASSWORD='YOUR_POSTGRES_PASSWORD'
-POSTGRES_DB='YOUR_POSTGRES_DB'
-
-# Postgres Dev
-POSTGRES_DEV_HOST='YOUR_POSTGRES_DEV_HOST'
-POSTGRES_DEV_PORT='YOUR_POSTGRES_DEV_PORT'
-POSTGRES_DEV_USER='YOUR_POSTGRES_DEV_USER'
-POSTGRES_DEV_PASSWORD='YOUR_POSTGRES_DEV_PASSWORD'
-POSTGRES_DEV_DB='YOUR_POSTGRES_DEV_DB'
+# Postgres URLs
+POSTGRES_URL='postgresql://user:password@server:port/database'
+POSTGRES_DEV_URL='postgresql://user:password@server:port/database'

.gitignore

@@ -5,10 +5,10 @@ dist/
 target/
 
 # Database stuff
-/backups
 *.db
 *.sqlite
 *.sqlite3*
 *.sql
 dbtests.ts
-perftesting.ts
+perftesting.ts
+drizzle/

bun.lock

@@ -0,0 +1,17 @@
+import { defineConfig } from "drizzle-kit";
+
+const databaseUrl =
+    process.env.NODE_ENV === "development"
+        ? process.env.POSTGRES_DEV_URL
+        : process.env.POSTGRES_URL;
+
+console.log("Using database URL:", databaseUrl);
+
+export default defineConfig({
+    out: "./drizzle",
+    schema: "./src/db/schema.ts",
+    dialect: "postgresql",
+    dbCredentials: {
+        url: databaseUrl!,
+    },
+});

drizzle.config.ts

@@ -9,6 +9,8 @@
     "@typescript-eslint/eslint-plugin": "8.11.0",
     "@typescript-eslint/parser": "8.11.0",
     "concurrently": "^9.1.2",
+    "cross-env": "^7.0.3",
+    "drizzle-kit": "^0.31.4",
     "eslint": "^8.57.0",
     "eslint-config-prettier": "9.1.0",
     "eslint-plugin-import": "^2.26.0",
@@ -20,10 +22,13 @@
     "typescript": "^5.0.0"
   },
   "scripts": {
+    "db:generate": "bun drizzle-kit generate",
+    "db:push:dev": "cross-env NODE_ENV=development bun drizzle-kit push",
+    "db:push:prod": "bun drizzle-kit push",
     "dev": "concurrently --names \"WEB,API,BOT\" --prefix-colors \"blue,green,magenta\" \"cd web && bun dev\" \"cd api && cargo watch -x \\\"run -- --dev\\\"\" \"bun --watch . --dev\"",
     "dev:bot": "bun --watch . --dev",
     "test:jetstream": "bun --watch src/utils/bluesky/jetstream.ts",
-    "lint": "eslint . --ext .ts -c .eslintrc.json",
+    "lint": "eslint src/ --ext .ts -c .eslintrc.json --debug",
     "lint:fix": "eslint . --ext .ts -c .eslintrc.json --fix",
     "cargo:api:dev": "cd api && cargo watch -x \"run -- --dev\"",
     "web:dev": "concurrently --names \"WEB,API\" --prefix-colors \"blue,green\" \"cd web && bun dev\" \"cd api && cargo watch -x \\\"run -- --dev\\\"\"",
@@ -35,6 +40,7 @@
   "dependencies": {
     "cron": "^4.3.0",
     "discord.js": "^14.19.1",
+    "drizzle-orm": "^0.44.2",
     "hfksdjfskfhsjdfhkasfdhksf": "^1.0.5",
     "pg": "^8.15.6"
   }

new.dbml

@@ -16,29 +16,24 @@ import { PermissionFlagsBits } from "discord-api-types/v8";
 import hfksdjfskfhsjdfhkasfdhksf from "hfksdjfskfhsjdfhkasfdhksf";
 
 import checkIfChannelIdIsValid from "./utils/youtube/checkIfChannelIdIsValid";
-import {
-    getAllTrackedInGuild,
-    stopGuildTrackingChannel,
-    twitchStopGuildTrackingChannel,
-} from "./utils/database";
 import getChannelDetails from "./utils/youtube/getChannelDetails";
 import { checkIfStreamerIsLive } from "./utils/twitch/checkIfStreamerIsLive";
 import {
     checkIfChannelIsAlreadyTracked,
     addNewChannelToTrack,
-} from "./utils/db/youtube";
+} from "./db/youtube";
 import search from "./utils/youtube/search";
 import {
     checkIfGuildIsTrackingUserAlready,
     discordAddGuildTrackingUser,
-} from "./utils/db/discord";
+} from "./db/discord";
 import { Platform, YouTubeContentType } from "./types/types.d";
 import searchTwitch from "./utils/twitch/searchTwitch";
 import { getStreamerName } from "./utils/twitch/getStreamerName";
 import {
     addNewStreamerToTrack,
     checkIfStreamerIsAlreadyTracked,
-} from "./utils/db/twitch";
+} from "./db/twitch";
 
 import client from ".";
 

package.json

@@ -3,6 +3,8 @@ export const runningInDevMode: boolean = process.argv.includes("--dev");
 export interface Config {
     updateIntervalYouTube: number;
     updateIntervalTwitch: number;
+    databaseUrl: string | undefined;
+    discordWaitForGuildCacheTime: number;
 }
 
 export const config: Config = {
@@ -12,6 +14,13 @@ export const config: Config = {
     updateIntervalTwitch: process.env?.CONFIG_UPDATE_INTERVAL_TWITCH
         ? parseInt(process.env?.CONFIG_UPDATE_INTERVAL_TWITCH) * 1000
         : 60_000,
+    databaseUrl: runningInDevMode
+        ? process.env?.POSTGRES_DEV_URL
+        : process.env?.POSTGRES_URL,
+    discordWaitForGuildCacheTime: process.env
+        ?.CONFIG_DISCORD_WAIT_FOR_GUILD_CACHE_TIME
+        ? parseInt(process.env?.CONFIG_DISCORD_WAIT_FOR_GUILD_CACHE_TIME) * 1000
+        : 10_000,
 };
 
 interface Env {
@@ -29,29 +38,3 @@ export const env: Env = {
     twitchClientId: process.env?.TWITCH_CLIENT_ID,
     twitchClientSecret: process.env?.TWITCH_CLIENT_SECRET,
 };
-
-interface DatabaseConfig {
-    host: string | undefined;
-    port: string | undefined;
-    user: string | undefined;
-    password: string | undefined;
-    database: string | undefined;
-}
-
-export const dbCredentials: DatabaseConfig = {
-    host: runningInDevMode
-        ? process.env?.POSTGRES_DEV_HOST
-        : process.env?.POSTGRES_HOST,
-    port: runningInDevMode
-        ? process.env?.POSTGRES_DEV_PORT
-        : process.env?.POSTGRES_PORT,
-    user: runningInDevMode
-        ? process.env?.POSTGRES_DEV_USER
-        : process.env?.POSTGRES_USER,
-    password: runningInDevMode
-        ? process.env?.POSTGRES_DEV_PASSWORD
-        : process.env?.POSTGRES_PASSWORD,
-    database: runningInDevMode
-        ? process.env?.POSTGRES_DEV_DB
-        : process.env?.POSTGRES_DB,
-};

src/commands.ts

@@ -0,0 +1,25 @@
+import {
+    dbAuditLogsEventTypeEnum,
+    dbAuditLogsSuccessTypeEnum,
+    dbAuditLogsTable,
+} from "./schema";
+import { db } from "./db";
+
+export async function dbAuditLogCreate(
+    guildId: string,
+    eventType: (typeof dbAuditLogsEventTypeEnum)["enumValues"][number],
+    successType: (typeof dbAuditLogsSuccessTypeEnum)["enumValues"][number],
+    data: Record<string, unknown> | null = null,
+): Promise<void> {
+    try {
+        await db.insert(dbAuditLogsTable).values({
+            guildId,
+            eventType,
+            successType,
+            data,
+            occurredAt: new Date(),
+        });
+    } catch (error) {
+        console.error("Error creating audit log entry:", error);
+    }
+}

src/config.ts

@@ -0,0 +1 @@
+// Rewriting