chore(database): update db schema

Author: GalvinPython

bun.lock

@@ -16,6 +16,7 @@
         "@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",
@@ -222,6 +223,8 @@
 
     "cron": ["cron@4.3.0", "", { "dependencies": { "@types/luxon": "~3.6.0", "luxon": "~3.6.0" } }, "sha512-ciiYNLfSlF9MrDqnbMdRWFiA6oizSF7kA1osPP9lRzNu0Uu+AWog1UKy7SkckiDY2irrNjeO6qLyKnXC8oxmrw=="],
 
+    "cross-env": ["cross-env@7.0.3", "", { "dependencies": { "cross-spawn": "^7.0.1" }, "bin": { "cross-env": "src/bin/cross-env.js", "cross-env-shell": "src/bin/cross-env-shell.js" } }, "sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw=="],
+
     "cross-spawn": ["cross-spawn@7.0.6", "", { "dependencies": { "path-key": "^3.1.0", "shebang-command": "^2.0.0", "which": "^2.0.1" } }, "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA=="],
 
     "data-view-buffer": ["data-view-buffer@1.0.2", "", { "dependencies": { "call-bound": "^1.0.3", "es-errors": "^1.3.0", "is-data-view": "^1.0.2" } }, "sha512-EmKO5V3OLXh1rtK2wgXRansaK1/mtVdTUEiEI0W8RkvgT05kfxaH29PliLnpLP73yYO6142Q72QNa8Wx/A5CqQ=="],

drizzle.config.ts

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

new.dbml

@@ -9,6 +9,7 @@
     "@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",
@@ -22,6 +23,8 @@
   },
   "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",

package.json

@@ -1,19 +1,21 @@
 // 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";
+import { pgTable, serial, text, boolean, timestamp, decimal, unique, index, pgEnum, jsonb, integer } 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"),
-
+    isInServer: boolean("is_in_server").notNull().default(true),
 });
 
 export const dbBlueskyTable = pgTable("bluesky", {
     blueskyUserId: text("bluesky_user_id").primaryKey(),
     latestPostId: text("latest_post_id"),
     latestReplyId: text("latest_reply_id"),
-});
+}, (table) => [
+    index("idx_bluesky_user_id").on(table.blueskyUserId),
+]);
 
 export const dbYouTubeTable = pgTable("youtube", {
     youtubeChannelId: text("youtube_channel_id").primaryKey(),
@@ -23,13 +25,18 @@ export const dbYouTubeTable = pgTable("youtube", {
     latestShortIdUpdated: timestamp("latest_short_id_updated"),
     latestStreamId: text("latest_stream_id"),
     latestStreamIdUpdated: timestamp("latest_stream_id_updated"),
-    youtubeChannelIsLive: boolean("youtube_channel_is_live"),
-});
+    youtubeChannelIsLive: boolean("youtube_channel_is_live").notNull().default(false),
+    youtubeLiveIds: text("youtube_live_ids").array().notNull().default([]),
+}, (table) => [
+    index("idx_youtube_channel_id").on(table.youtubeChannelId),
+]);
 
 export const dbTwitchTable = pgTable("twitch", {
     twitchChannelId: text("twitch_channel_id").primaryKey(),
-    twitchChannelIsLive: boolean("twitch_channel_is_live").notNull(),
-});
+    twitchChannelIsLive: boolean("twitch_channel_is_live").notNull().default(false),
+}, (table) => [
+    index("idx_twitch_channel_id").on(table.twitchChannelId),
+]);
 
 export const dbGuildBlueskySubscriptionsTable = pgTable("guild_bluesky_subscriptions", {
     id: serial("id").primaryKey(),
@@ -39,7 +46,9 @@ export const dbGuildBlueskySubscriptionsTable = pgTable("guild_bluesky_subscript
     notificationRoleId: text("notification_role_id"),
     isDm: boolean("is_dm").notNull().default(false),
     checkForReplies: boolean("check_for_replies").notNull().default(false),
-});
+}, (table) => [
+    unique("guild_bluesky_subscription").on(table.guildId, table.blueskyUserId),
+]);
 
 export const dbGuildYouTubeSubscriptionsTable = pgTable("guild_youtube_subscriptions", {
     id: serial("id").primaryKey(),
@@ -51,7 +60,9 @@ export const dbGuildYouTubeSubscriptionsTable = pgTable("guild_youtube_subscript
     trackVideos: boolean("track_videos").notNull().default(false),
     trackShorts: boolean("track_shorts").notNull().default(false),
     trackStreams: boolean("track_streams").notNull().default(false),
-});
+}, (table) => [
+    unique("guild_youtube_subscription").on(table.guildId, table.youtubeChannelId),
+]);
 
 export const dbGuildTwitchSubscriptionsTable = pgTable("guild_twitch_subscriptions", {
     id: serial("id").primaryKey(),
@@ -60,42 +71,64 @@ export const dbGuildTwitchSubscriptionsTable = pgTable("guild_twitch_subscriptio
     notificationChannelId: text("notification_channel_id").notNull(),
     notificationRoleId: text("notification_role_id"),
     isDm: boolean("is_dm").notNull().default(false),
-});
+    latestMessageId: text("latest_message_id"),
+}, (table) => [
+    unique("guild_twitch_subscription").on(table.guildId, table.twitchChannelId),
+]);
 
 export const dbBotInfoTable = pgTable("bot_info", {
+    timestamp: timestamp("timestamp").notNull().defaultNow(),
     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(),
+    notificationsSent: integer("notifications_sent").notNull().default(0),
 });
 
 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),
+    timestamp: timestamp("timestamp").notNull(),
+    service: text("service").notNull(),
+    delay: decimal("delay", { precision: 10, scale: 2 }).notNull().default("0.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),
-});
+// Deprecated, but kept for reference
+// 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),
-});
+// Once again, can be aggregated in the API
+// 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),
-});
+// Once again, can be aggregated in the API
+// export const dbBotInfoTopGuildsTable = pgTable("bot_info_top_guilds", {
+//     guildId: text("guild_id").primaryKey().references(() => dbDiscordTable.guildId),
+//     members: integer("members").notNull().default(0),
+// });
+
+export const dbAuditLogsEventTypeEnum = pgEnum("event_type", [
+  "subscription_created",
+  "subscription_deleted",
+  "notification_sent",
+  "guild_joined",
+  "guild_left",
+]);
+
+export const dbAuditLogsSuccessTypeEnum = pgEnum("audit_log_success", [
+    "success",
+    "failure",
+    "info",
+    "warning",
+]);
 
 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"),
+    eventType: dbAuditLogsEventTypeEnum().notNull(),
+    successType: dbAuditLogsSuccessTypeEnum().notNull(),
+    data: jsonb("data"),
     occurredAt: timestamp("occurred_at").defaultNow(),
 });