chore(database): start move to drizzle

GalvinPython · GalvinPython · commit 9593b92843d3 · 2025-07-13T19:26:15.000+01:00
diff --git a/.env.example b/.env.example
@@ -18,16 +18,6 @@ CONFIG_UPDATE_INTERVAL_YOUTUBE='10'
 CONFIG_UPDATE_INTERVAL_TWITCH='2'
 CONFIG_DISCORD_LOGS_CHANNEL='YOUR_DISCORD_LOGS_CHANNEL'
 
-# 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'
diff --git a/.gitignore b/.gitignore
@@ -5,10 +5,10 @@ dist/
 target/
 
 # Database stuff
-/backups
 *.db
 *.sqlite
 *.sqlite3*
 *.sql
 dbtests.ts
-perftesting.ts
+perftesting.ts
+drizzle/
diff --git a/bun.lock b/bun.lock
diff --git a/drizzle.config.ts b/drizzle.config.ts
@@ -0,0 +1,14 @@
+import { defineConfig } from "drizzle-kit";
+
+import { config } from "./src/config";
+
+console.log("Using database URL:", config.databaseUrl);
+
+export default defineConfig({
+    out: "./drizzle",
+    schema: "./src/db/schema.ts",
+    dialect: "postgresql",
+    dbCredentials: {
+        url: config.databaseUrl!,
+    },
+});
diff --git a/package.json b/package.json
@@ -9,6 +9,7 @@
     "@typescript-eslint/eslint-plugin": "8.11.0",
     "@typescript-eslint/parser": "8.11.0",
     "concurrently": "^9.1.2",
+    "drizzle-kit": "^0.31.4",
     "eslint": "^8.57.0",
     "eslint-config-prettier": "9.1.0",
     "eslint-plugin-import": "^2.26.0",
@@ -20,6 +21,7 @@
     "typescript": "^5.0.0"
   },
   "scripts": {
+    "db:generate": "bun drizzle-kit generate",
     "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",
@@ -35,6 +37,7 @@
   "dependencies": {
     "cron": "^4.3.0",
     "discord.js": "^14.19.1",
+    "drizzle-orm": "^0.44.2",
     "hfksdjfskfhsjdfhkasfdhksf": "^1.0.5",
     "pg": "^8.15.6"
   }
diff --git a/src/commands.ts b/src/commands.ts
@@ -26,19 +26,19 @@ 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 ".";
 
@@ -681,9 +681,9 @@ const commands: Record<string, Command> = {
                 const query =
                     platform === "youtube"
                         ? (interaction.options.get("channel_id")
-                              ?.value as string)
+                            ?.value as string)
                         : (interaction.options.get("streamer_id")
-                              ?.value as string);
+                            ?.value as string);
 
                 // If the query is empty or not a string, return an empty array
                 if (!query || typeof query !== "string") {
diff --git a/src/config.ts b/src/config.ts
@@ -3,6 +3,7 @@ export const runningInDevMode: boolean = process.argv.includes("--dev");
 export interface Config {
     updateIntervalYouTube: number;
     updateIntervalTwitch: number;
+    databaseUrl: string | undefined;
 }
 
 export const config: Config = {
@@ -12,6 +13,9 @@ 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,
 };
 
 interface Env {
@@ -29,29 +33,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,
-};
diff --git a/src/db/audit.ts b/src/db/audit.ts
diff --git a/src/db/botinfo.ts b/src/db/botinfo.ts
@@ -1,7 +1,7 @@
 import type { PoolClient, QueryResult } from "pg";
-import type { dbBotInfo } from "../../types/database";
+import type { dbBotInfo } from "../types/database";
 
-import { pool } from "../database";
+import { pool } from "../utils/database";
 
 export async function updateBotInfo(
     guilds_total: number = 0,
diff --git a/src/db/cron.ts b/src/db/cron.ts
@@ -1,4 +1,4 @@
-import { pool } from "../database";
+import { pool } from "../utils/database";
 
 export async function cronUpdateTopChannels(): Promise<void> {
     const query = `
diff --git a/src/db/discord.ts b/src/db/discord.ts
@@ -1,5 +1,5 @@
-import { Platform } from "../../types/types.d";
-import { pool } from "../database";
+import { Platform } from "../types/types";
+import { pool } from "../utils/database";
 
 export async function checkIfGuildIsTrackingUserAlready(
     platform: Platform,
diff --git a/src/db/schema.ts b/src/db/schema.ts
@@ -0,0 +1,101 @@
+// To make it easier to work with the database, disable prettier for this file
+/* eslint-disable prettier/prettier */
+import { pgTable, serial, text, boolean, integer, timestamp, date } from "drizzle-orm/pg-core";
+
+export const dbDiscordTable = pgTable("discord", {
+    guildId: text("guild_id").primaryKey(),
+    allowedPublicSharing: boolean("allowed_public_sharing").notNull().default(false),
+    feedrUpdatesChannelId: text("feedr_updates_channel_id"),
+
+});
+
+export const dbBlueskyTable = pgTable("bluesky", {
+    blueskyUserId: text("bluesky_user_id").primaryKey(),
+    latestPostId: text("latest_post_id"),
+    latestReplyId: text("latest_reply_id"),
+});
+
+export const dbYouTubeTable = pgTable("youtube", {
+    youtubeChannelId: text("youtube_channel_id").primaryKey(),
+    latestVideoId: text("latest_video_id"),
+    latestVideoIdUpdated: timestamp("latest_video_id_updated"),
+    latestShortId: text("latest_short_id"),
+    latestShortIdUpdated: timestamp("latest_short_id_updated"),
+    latestStreamId: text("latest_stream_id"),
+    latestStreamIdUpdated: timestamp("latest_stream_id_updated"),
+    youtubeChannelIsLive: boolean("youtube_channel_is_live"),
+});
+
+export const dbTwitchTable = pgTable("twitch", {
+    twitchChannelId: text("twitch_channel_id").primaryKey(),
+    twitchChannelIsLive: boolean("twitch_channel_is_live").notNull(),
+});
+
+export const dbGuildBlueskySubscriptionsTable = pgTable("guild_bluesky_subscriptions", {
+    id: serial("id").primaryKey(),
+    guildId: text("guild_id").notNull().references(() => dbDiscordTable.guildId),
+    blueskyUserId: text("bluesky_user_id").notNull().references(() => dbBlueskyTable.blueskyUserId),
+    notificationChannelId: text("notification_channel_id").notNull(),
+    notificationRoleId: text("notification_role_id"),
+    isDm: boolean("is_dm").notNull().default(false),
+    checkForReplies: boolean("check_for_replies").notNull().default(false),
+});
+
+export const dbGuildYouTubeSubscriptionsTable = pgTable("guild_youtube_subscriptions", {
+    id: serial("id").primaryKey(),
+    guildId: text("guild_id").notNull().references(() => dbDiscordTable.guildId),
+    youtubeChannelId: text("youtube_channel_id").notNull().references(() => dbYouTubeTable.youtubeChannelId),
+    notificationChannelId: text("notification_channel_id").notNull(),
+    notificationRoleId: text("notification_role_id"),
+    isDm: boolean("is_dm").notNull().default(false),
+    trackVideos: boolean("track_videos").notNull().default(false),
+    trackShorts: boolean("track_shorts").notNull().default(false),
+    trackStreams: boolean("track_streams").notNull().default(false),
+});
+
+export const dbGuildTwitchSubscriptionsTable = pgTable("guild_twitch_subscriptions", {
+    id: serial("id").primaryKey(),
+    guildId: text("guild_id").notNull().references(() => dbDiscordTable.guildId),
+    twitchChannelId: text("twitch_channel_id").notNull().references(() => dbTwitchTable.twitchChannelId),
+    notificationChannelId: text("notification_channel_id").notNull(),
+    notificationRoleId: text("notification_role_id"),
+    isDm: boolean("is_dm").notNull().default(false),
+});
+
+export const dbBotInfoTable = pgTable("bot_info", {
+    guildsTotal: integer("guilds_total").notNull().default(0),
+    channelsTracked: integer("channels_tracked").notNull().default(0),
+    totalMembers: integer("total_members").notNull().default(0),
+    time: timestamp("time").notNull().defaultNow(),
+});
+
+export const dbBotInfoNotificationsTable = pgTable("bot_info_notifications", {
+    date: date("date").notNull(),
+    totalYouTube: integer("total_youtube").notNull().default(0),
+    totalTwitch: integer("total_twitch").notNull().default(0),
+});
+
+export const dbBotInfoNotificationsTimingsTable = pgTable("bot_info_notifications_timings", {
+    time: timestamp("time").notNull(),
+    channelId: text("channel_id").notNull().references(() => dbYouTubeTable.youtubeChannelId),
+    timeMs: integer("time_ms").notNull().default(0),
+});
+
+export const dbBotInfoTopChannelsTable = pgTable("bot_info_top_channels", {
+    youtubeChannelId: text("youtube_channel_id").primaryKey().references(() => dbYouTubeTable.youtubeChannelId),
+    guildsTracking: integer("guilds_tracking").notNull().default(0),
+});
+
+export const dbBotInfoTopGuildsTable = pgTable("bot_info_top_guilds", {
+    guildId: text("guild_id").primaryKey().references(() => dbDiscordTable.guildId),
+    members: integer("members").notNull().default(0),
+});
+
+export const dbAuditLogsTable = pgTable("audit_logs", {
+    id: serial("id").primaryKey(),
+    eventType: text("event_type").notNull(),
+    guildId: text("guild_id").notNull().references(() => dbDiscordTable.guildId),
+    relatedId: text("related_id").notNull(),
+    note: text("note"),
+    occurredAt: timestamp("occurred_at").defaultNow(),
+});
diff --git a/src/db/twitch.ts b/src/db/twitch.ts
@@ -1,6 +1,6 @@
-import type { dbTwitch } from "../../types/database";
+import type { dbTwitch } from "../types/database";
 
-import { pool } from "../database";
+import { pool } from "../utils/database";
 
 export async function dbTwitchGetAllChannelsToTrack(): Promise<{
     success: boolean;
diff --git a/src/db/youtube.ts b/src/db/youtube.ts
@@ -1,9 +1,9 @@
-import type { dbYouTube } from "../../types/database";
+import type { dbYouTube } from "../types/database";
 
-import { pool } from "../database";
+import { pool } from "../utils/database";
 import getSinglePlaylistAndReturnVideoId, {
     PlaylistType,
-} from "../youtube/getSinglePlaylistAndReturnVideoData";
+} from "../utils/youtube/getSinglePlaylistAndReturnVideoData";
 
 export async function dbYouTubeGetAllChannelsToTrack(): Promise<{
     success: boolean;
diff --git a/src/index.ts b/src/index.ts
@@ -13,7 +13,7 @@ import {
 
 import { env } from "./config.ts";
 import commandsMap from "./commands.ts";
-import initTables from "./utils/db/init.ts";
+import initTables from "./db/schema.ts";
 import { getTwitchToken } from "./utils/twitch/auth.ts";
 
 if (!env.discordToken || env.discordToken === "YOUR_DISCORD_TOKEN") {
diff --git a/src/utils/cronJobs.ts b/src/utils/cronJobs.ts
@@ -2,7 +2,7 @@ import { ActivityType, Guild, PresenceUpdateStatus } from "discord.js";
 
 import client from "..";
 
-import { updateBotInfo } from "./db/botinfo";
+import { updateBotInfo } from "../db/botinfo";
 
 export async function cronUpdateBotInfo() {
     if (!client?.user) return;
diff --git a/src/utils/database.ts b/src/utils/database.ts
@@ -18,6 +18,9 @@ if (
     throw new Error("Database credentials are not set");
 }
 
+/**
+ * @deprecated This pool is deprecated and being removed in the future.
+ */
 export const pool: Pool = new Pool({
     host: dbCredentials.host,
     port: parseInt(dbCredentials.port),
diff --git a/src/utils/db/init.ts b/src/utils/db/init.ts
diff --git a/src/utils/youtube/fetchLatestUploads.ts b/src/utils/youtube/fetchLatestUploads.ts

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { pool } from "../database";`
	`1`	`+import { pool } from "../utils/database";`
`2`	`2`
`3`	`3`	`export async function cronUpdateTopChannels(): Promise<void> {`
`4`	`4`	const query = `