Improve schema readability & maintainability

src/db/drizzle.ts

@@ -1,6 +1,6 @@
 import { drizzle } from "drizzle-orm/bun-sqlite";
 import { Database } from "bun:sqlite";
-import * as schema from "./schema";
+import * as schema from "./schema/schema";
 
 const sqlite = new Database("data/tipilan.db");
 export const db = drizzle(sqlite, { schema });

src/db/schema.ts

@@ -1,138 +0,0 @@
-import {
-  sqliteTable,
-  text,
-  integer,
-  uniqueIndex,
-} from "drizzle-orm/sqlite-core";
-import { relations } from "drizzle-orm";
-import { createId } from "@paralleldrive/cuid2";
-
-// Roles enum equivalent
-export const RoleEnum = {
-  VISITOR: "VISITOR",
-  PARTICIPANT: "PARTICIPANT",
-  TEAMMATE: "TEAMMATE",
-  CAPTAIN: "CAPTAIN",
-  ADMIN: "ADMIN",
-} as const;
-
-export type Role = (typeof RoleEnum)[keyof typeof RoleEnum];
-
-// User table
-export const users = sqliteTable("user", {
-  id: text("id")
-    .primaryKey()
-    .notNull()
-    .$defaultFn(() => createId()),
-  email: text("email").notNull(),
-  steamId: text("steam_id").unique(),
-  firstName: text("first_name").notNull(),
-  lastName: text("last_name").notNull(),
-  ticketId: text("ticket_id").unique(),
-  ticketType: text("ticket_type"),
-});
-
-// Team table
-export const teams = sqliteTable("team", {
-  id: text("id")
-    .primaryKey()
-    .notNull()
-    .$defaultFn(() => createId()),
-  name: text("name").notNull(),
-});
-
-// Member table (join table for User and Team with role)
-export const members = sqliteTable(
-  "member",
-  {
-    id: text("id")
-      .primaryKey()
-      .notNull()
-      .$defaultFn(() => createId()),
-    userId: text("user_id")
-      .notNull()
-      .references(() => users.id, { onDelete: "cascade" }),
-    teamId: text("team_id").references(() => teams.id, { onDelete: "cascade" }),
-    role: text("role", {
-      enum: Object.values(RoleEnum) as [string, ...string[]],
-    }).notNull(),
-  },
-  (table) => {
-    return {
-      userTeamUnique: uniqueIndex("user_team_unique").on(
-        table.userId,
-        table.teamId,
-      ),
-    };
-  },
-);
-
-// Tournament table
-export const tournaments = sqliteTable("tournament", {
-  id: text("id")
-    .primaryKey()
-    .notNull()
-    .$defaultFn(() => createId()),
-  name: text("name").notNull(),
-});
-
-// TournamentTeam join table
-export const tournamentTeams = sqliteTable(
-  "tournament_team",
-  {
-    id: text("id")
-      .primaryKey()
-      .notNull()
-      .$defaultFn(() => createId()),
-    tournamentId: text("tournament_id")
-      .notNull()
-      .references(() => tournaments.id, { onDelete: "cascade" }),
-    teamId: text("team_id")
-      .notNull()
-      .references(() => teams.id, { onDelete: "cascade" }),
-    registrationDate: integer("registration_date", { mode: "timestamp" })
-      .notNull()
-      .$defaultFn(() => new Date()),
-  },
-  (table) => {
-    return {
-      tournamentTeamUnique: uniqueIndex("tournament_team_unique").on(
-        table.tournamentId,
-        table.teamId,
-      ),
-    };
-  },
-);
-
-// Relations
-export const usersRelations = relations(users, ({ many }) => ({
-  members: many(members),
-}));
-
-export const teamsRelations = relations(teams, ({ many }) => ({
-  members: many(members),
-  tournamentTeams: many(tournamentTeams),
-}));
-
-export const membersRelations = relations(members, ({ one }) => ({
-  user: one(users, { fields: [members.userId], references: [users.id] }),
-  team: one(teams, { fields: [members.teamId], references: [teams.id] }),
-}));
-
-export const tournamentsRelations = relations(tournaments, ({ many }) => ({
-  tournamentTeams: many(tournamentTeams),
-}));
-
-export const tournamentTeamsRelations = relations(
-  tournamentTeams,
-  ({ one }) => ({
-    tournament: one(tournaments, {
-      fields: [tournamentTeams.tournamentId],
-      references: [tournaments.id],
-    }),
-    team: one(teams, {
-      fields: [tournamentTeams.teamId],
-      references: [teams.id],
-    }),
-  }),
-);

src/db/schema/index.ts

@@ -0,0 +1,14 @@
+// Export all types
+export * from "./types";
+
+// Export all tables
+export * from "./users";
+export * from "./teams";
+export * from "./members";
+export * from "./tournaments";
+
+// Export session table
+// export * from ./session";
+
+// Export all relations
+export * from "./relations";

src/db/schema/members.ts

@@ -0,0 +1,31 @@
+import { sqliteTable, text, uniqueIndex } from "drizzle-orm/sqlite-core";
+import { createId } from "@paralleldrive/cuid2";
+import { users } from "./users";
+import { teams } from "./teams";
+import { RoleEnum } from "./types";
+
+// Member table (join table for User and Team with role)
+export const members = sqliteTable(
+  "member",
+  {
+    id: text("id")
+      .primaryKey()
+      .notNull()
+      .$defaultFn(() => createId()),
+    userId: text("user_id")
+      .notNull()
+      .references(() => users.id, { onDelete: "cascade" }),
+    teamId: text("team_id").references(() => teams.id, { onDelete: "cascade" }),
+    role: text("role", {
+      enum: Object.values(RoleEnum) as [string, ...string[]],
+    }).notNull(),
+  },
+  (table) => {
+    return {
+      userTeamUnique: uniqueIndex("user_team_unique").on(
+        table.userId,
+        table.teamId,
+      ),
+    };
+  },
+);

src/db/schema/relations.ts

@@ -0,0 +1,42 @@
+import { relations } from "drizzle-orm";
+import { users } from "./users";
+import { teams } from "./teams";
+import { members } from "./members";
+import { tournaments, tournamentTeams } from "./tournaments";
+
+// User relations
+export const usersRelations = relations(users, ({ many }) => ({
+  members: many(members),
+}));
+
+// Team relations
+export const teamsRelations = relations(teams, ({ many }) => ({
+  members: many(members),
+  tournamentTeams: many(tournamentTeams),
+}));
+
+// Member relations
+export const membersRelations = relations(members, ({ one }) => ({
+  user: one(users, { fields: [members.userId], references: [users.id] }),
+  team: one(teams, { fields: [members.teamId], references: [teams.id] }),
+}));
+
+// Tournament relations
+export const tournamentsRelations = relations(tournaments, ({ many }) => ({
+  tournamentTeams: many(tournamentTeams),
+}));
+
+// Tournament team relations
+export const tournamentTeamsRelations = relations(
+  tournamentTeams,
+  ({ one }) => ({
+    tournament: one(tournaments, {
+      fields: [tournamentTeams.tournamentId],
+      references: [tournaments.id],
+    }),
+    team: one(teams, {
+      fields: [tournamentTeams.teamId],
+      references: [teams.id],
+    }),
+  }),
+);

src/db/schema/schema.ts

@@ -0,0 +1,2 @@
+// Re-export all schema components from modular files
+export * from "./index";

src/db/schema/teams.ts

@@ -0,0 +1,11 @@
+import { sqliteTable, text } from "drizzle-orm/sqlite-core";
+import { createId } from "@paralleldrive/cuid2";
+
+// Team table
+export const teams = sqliteTable("team", {
+  id: text("id")
+    .primaryKey()
+    .notNull()
+    .$defaultFn(() => createId()),
+  name: text("name").notNull(),
+});

src/db/schema/tournaments.ts

@@ -0,0 +1,46 @@
+import {
+  sqliteTable,
+  text,
+  integer,
+  uniqueIndex,
+} from "drizzle-orm/sqlite-core";
+
+import { createId } from "@paralleldrive/cuid2";
+import { teams } from "./teams";
+
+// Tournament table
+export const tournaments = sqliteTable("tournament", {
+  id: text("id")
+    .primaryKey()
+    .notNull()
+    .$defaultFn(() => createId()),
+  name: text("name").notNull(),
+});
+
+// TournamentTeam join table
+export const tournamentTeams = sqliteTable(
+  "tournament_team",
+  {
+    id: text("id")
+      .primaryKey()
+      .notNull()
+      .$defaultFn(() => createId()),
+    tournamentId: text("tournament_id")
+      .notNull()
+      .references(() => tournaments.id, { onDelete: "cascade" }),
+    teamId: text("team_id")
+      .notNull()
+      .references(() => teams.id, { onDelete: "cascade" }),
+    registrationDate: integer("registration_date", { mode: "timestamp" })
+      .notNull()
+      .$defaultFn(() => new Date()),
+  },
+  (table) => {
+    return {
+      tournamentTeamUnique: uniqueIndex("tournament_team_unique").on(
+        table.tournamentId,
+        table.teamId,
+      ),
+    };
+  },
+);

src/db/schema/types.ts

@@ -0,0 +1,10 @@
+// Roles enum equivalent
+export const RoleEnum = {
+  VISITOR: "VISITOR",
+  PARTICIPANT: "PARTICIPANT",
+  TEAMMATE: "TEAMMATE",
+  CAPTAIN: "CAPTAIN",
+  ADMIN: "ADMIN",
+} as const;
+
+export type Role = (typeof RoleEnum)[keyof typeof RoleEnum];

src/db/schema/users.ts

@@ -0,0 +1,18 @@
+import { sqliteTable, text } from "drizzle-orm/sqlite-core";
+import { createId } from "@paralleldrive/cuid2";
+
+// User table
+export const users = sqliteTable("user", {
+  id: text("id")
+    .primaryKey()
+    .notNull()
+    .$defaultFn(() => createId()),
+  email: text("email").notNull(),
+
+  // Other information
+  steamId: text("steam_id"),
+  firstName: text("first_name").notNull(),
+  lastName: text("last_name").notNull(),
+  ticketId: text("ticket_id").unique(),
+  ticketType: text("ticket_type"),
+});