From 16de5a9e648adafca2707256eb0ded0931fd4e7f Mon Sep 17 00:00:00 2001 From: simenen123 Date: Wed, 10 Sep 2025 18:28:00 +0200 Subject: [PATCH 01/12] feat:lagt til meetings table --- db/seeding/seeding-tables.ts | 2 ++ db/tables/meetings.ts | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+) create mode 100644 db/tables/meetings.ts diff --git a/db/seeding/seeding-tables.ts b/db/seeding/seeding-tables.ts index c67ce82..ec2982f 100644 --- a/db/seeding/seeding-tables.ts +++ b/db/seeding/seeding-tables.ts @@ -3,12 +3,14 @@ import { expensesTable } from "@/db/tables/expenses"; import { fieldsOfStudyTable } from "@/db/tables/fields-of-study"; import { teamsTable } from "@/db/tables/teams"; import { usersTable } from "@/db/tables/users"; +import { meetings } from "@/db/tables/meetings"; export const seedingTables = { departmentsTable, fieldsOfStudyTable, teamsTable, usersTable, + meetings, //teamUsersTable, these two tables dont work currently //assistantUsersTable, //teamApplicationsTable, diff --git a/db/tables/meetings.ts b/db/tables/meetings.ts new file mode 100644 index 0000000..9ed9034 --- /dev/null +++ b/db/tables/meetings.ts @@ -0,0 +1,35 @@ +import { mainSchema } from "@/db/tables/schema"; +import { usersTable } from "@/db/tables/users"; +import { relations } from "drizzle-orm"; +import { + boolean, + integer, + numeric, + serial, + text, + timestamp, +} from "drizzle-orm/pg-core"; +import { semestersTable } from "./semesters"; + +export const meetingsTable = mainSchema.table("meetings", { + id: serial("id").primaryKey(), + title: text("title").notNull(), + description: text("description").notNull(), + semesterId: text("semesterId") + .notNull() + .references(() => semestersTable.id), + date: text("date").notNull(), + timestart: text("TimeStart").notNull(), + timeEnd: text("TimeEnd").notNull(), + room: text("room").notNull() +}); + +export const meetingsRelations = relations(meetingsTable, ({ one }) => ({ + semester: one(semestersTable, { + fields: [meetingsTable.semesterId], // FK i meetings + references: [semestersTable.id], // PK i semesters + }), +})); + +export const meetings = relations(meetingsTable, () => ({})); + From 08bf204e063c9e247192beffb20b2c468db26192 Mon Sep 17 00:00:00 2001 From: simenen123 Date: Wed, 10 Sep 2025 18:42:48 +0200 Subject: [PATCH 02/12] fixed:fjerna unused imports --- db/tables/meetings.ts | 5 ----- 1 file changed, 5 deletions(-) diff --git a/db/tables/meetings.ts b/db/tables/meetings.ts index 9ed9034..4485dff 100644 --- a/db/tables/meetings.ts +++ b/db/tables/meetings.ts @@ -1,13 +1,8 @@ import { mainSchema } from "@/db/tables/schema"; -import { usersTable } from "@/db/tables/users"; import { relations } from "drizzle-orm"; import { - boolean, - integer, - numeric, serial, text, - timestamp, } from "drizzle-orm/pg-core"; import { semestersTable } from "./semesters"; From 0a21d7120668bf51cbe84d3db25fe5b911c05b9d Mon Sep 17 00:00:00 2001 From: simenen123 Date: Wed, 10 Sep 2025 18:55:18 +0200 Subject: [PATCH 03/12] =?UTF-8?q?pr=C3=B8ver=20igjen?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/seeding/seeding-tables.ts | 2 +- db/tables/meetings.ts | 35 ++++++++++++++++------------------- 2 files changed, 17 insertions(+), 20 deletions(-) diff --git a/db/seeding/seeding-tables.ts b/db/seeding/seeding-tables.ts index ec2982f..703ba2f 100644 --- a/db/seeding/seeding-tables.ts +++ b/db/seeding/seeding-tables.ts @@ -1,9 +1,9 @@ import { departmentsTable } from "@/db/tables/departments"; import { expensesTable } from "@/db/tables/expenses"; import { fieldsOfStudyTable } from "@/db/tables/fields-of-study"; +import { meetings } from "@/db/tables/meetings"; import { teamsTable } from "@/db/tables/teams"; import { usersTable } from "@/db/tables/users"; -import { meetings } from "@/db/tables/meetings"; export const seedingTables = { departmentsTable, diff --git a/db/tables/meetings.ts b/db/tables/meetings.ts index 4485dff..b20d4e8 100644 --- a/db/tables/meetings.ts +++ b/db/tables/meetings.ts @@ -1,30 +1,27 @@ import { mainSchema } from "@/db/tables/schema"; import { relations } from "drizzle-orm"; -import { - serial, - text, -} from "drizzle-orm/pg-core"; +import { serial, text } from "drizzle-orm/pg-core"; import { semestersTable } from "./semesters"; +import { integer } from "drizzle-orm/sqlite-core"; export const meetingsTable = mainSchema.table("meetings", { - id: serial("id").primaryKey(), - title: text("title").notNull(), - description: text("description").notNull(), - semesterId: text("semesterId") - .notNull() - .references(() => semestersTable.id), - date: text("date").notNull(), - timestart: text("TimeStart").notNull(), - timeEnd: text("TimeEnd").notNull(), - room: text("room").notNull() + id: serial("id").primaryKey(), + title: text("title").notNull(), + description: text("description").notNull(), + semesterId: serial("semesterId") + .notNull() + .references(() => semestersTable.id), + date: text("date").notNull(), + timestart: text("TimeStart").notNull(), + timeEnd: text("TimeEnd").notNull(), + room: text("room").notNull(), }); export const meetingsRelations = relations(meetingsTable, ({ one }) => ({ - semester: one(semestersTable, { - fields: [meetingsTable.semesterId], // FK i meetings - references: [semestersTable.id], // PK i semesters - }), + semester: one(semestersTable, { + fields: [meetingsTable.semesterId], // FK i meetings + references: [semestersTable.id], // PK i semesters + }), })); export const meetings = relations(meetingsTable, () => ({})); - From 25d60bc2d3da37f5ab4a123a6c41eb1e9057fbea Mon Sep 17 00:00:00 2001 From: simenen123 Date: Wed, 10 Sep 2025 18:58:31 +0200 Subject: [PATCH 04/12] bruh --- db/tables/meetings.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/db/tables/meetings.ts b/db/tables/meetings.ts index b20d4e8..94e23e3 100644 --- a/db/tables/meetings.ts +++ b/db/tables/meetings.ts @@ -2,7 +2,6 @@ import { mainSchema } from "@/db/tables/schema"; import { relations } from "drizzle-orm"; import { serial, text } from "drizzle-orm/pg-core"; import { semestersTable } from "./semesters"; -import { integer } from "drizzle-orm/sqlite-core"; export const meetingsTable = mainSchema.table("meetings", { id: serial("id").primaryKey(), From 980dddb45cd7ad7c281c55947c585cb118845d17 Mon Sep 17 00:00:00 2001 From: simenen123 Date: Wed, 8 Oct 2025 18:37:24 +0200 Subject: [PATCH 05/12] =?UTF-8?q?fix:=20endret=20p=C3=A5=20de=20n=C3=B8dve?= =?UTF-8?q?ndige=20delene?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/seeding/seed.sql | 0 db/seeding/seeding-tables.ts | 11 +++++++++-- db/tables/meetings.ts | 10 +++++----- tsconfig.json | 3 ++- 4 files changed, 16 insertions(+), 8 deletions(-) create mode 100644 db/seeding/seed.sql diff --git a/db/seeding/seed.sql b/db/seeding/seed.sql new file mode 100644 index 0000000..e69de29 diff --git a/db/seeding/seeding-tables.ts b/db/seeding/seeding-tables.ts index 703ba2f..2c3c2fd 100644 --- a/db/seeding/seeding-tables.ts +++ b/db/seeding/seeding-tables.ts @@ -1,18 +1,25 @@ import { departmentsTable } from "@/db/tables/departments"; import { expensesTable } from "@/db/tables/expenses"; import { fieldsOfStudyTable } from "@/db/tables/fields-of-study"; -import { meetings } from "@/db/tables/meetings"; +// import { meetings } from "@/db/tables/meetings"; import { teamsTable } from "@/db/tables/teams"; import { usersTable } from "@/db/tables/users"; +import { applicationsTable } from "@/db/tables/applications"; +import { meetingsTable } from "@/db/tables/meetings"; +import { schoolsTable } from "@/db/tables/schools"; export const seedingTables = { departmentsTable, fieldsOfStudyTable, teamsTable, usersTable, - meetings, + // meetings, //teamUsersTable, these two tables dont work currently //assistantUsersTable, //teamApplicationsTable, expensesTable, + applicationsTable, + // meetingsTable, + // schoolsTable + }; diff --git a/db/tables/meetings.ts b/db/tables/meetings.ts index 94e23e3..2fb5cc2 100644 --- a/db/tables/meetings.ts +++ b/db/tables/meetings.ts @@ -1,17 +1,17 @@ import { mainSchema } from "@/db/tables/schema"; import { relations } from "drizzle-orm"; -import { serial, text } from "drizzle-orm/pg-core"; +import { date, integer, serial, text, timestamp } from "drizzle-orm/pg-core"; import { semestersTable } from "./semesters"; export const meetingsTable = mainSchema.table("meetings", { id: serial("id").primaryKey(), title: text("title").notNull(), description: text("description").notNull(), - semesterId: serial("semesterId") + semesterId: integer("semesterId") .notNull() .references(() => semestersTable.id), - date: text("date").notNull(), - timestart: text("TimeStart").notNull(), + date: date("date").notNull(), + timestart: timestamp("TimeStart").notNull(), timeEnd: text("TimeEnd").notNull(), room: text("room").notNull(), }); @@ -23,4 +23,4 @@ export const meetingsRelations = relations(meetingsTable, ({ one }) => ({ }), })); -export const meetings = relations(meetingsTable, () => ({})); + diff --git a/tsconfig.json b/tsconfig.json index 2fb5978..53819b7 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -9,7 +9,7 @@ "module": "esnext", "skipLibCheck": true, // - "moduleResolution": "node", + "moduleResolution": "bundler", // "target": "es2022", // @@ -31,5 +31,6 @@ "@/lib/*": ["./lib/*"], "@/docs/*": ["./openapi/*"] } + } } From 0762530a4f8dec1d935e5e42f2424c143c020045 Mon Sep 17 00:00:00 2001 From: simenen123 Date: Wed, 8 Oct 2025 18:56:47 +0200 Subject: [PATCH 06/12] =?UTF-8?q?Fix:=20finpussinger=20p=C3=A5=20relations?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/tables/meetings.ts | 4 ++-- db/tables/semesters.ts | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/db/tables/meetings.ts b/db/tables/meetings.ts index 2fb5cc2..df6ec5f 100644 --- a/db/tables/meetings.ts +++ b/db/tables/meetings.ts @@ -1,6 +1,6 @@ import { mainSchema } from "@/db/tables/schema"; import { relations } from "drizzle-orm"; -import { date, integer, serial, text, timestamp } from "drizzle-orm/pg-core"; +import { date, integer, serial, text, time, timestamp } from "drizzle-orm/pg-core"; import { semestersTable } from "./semesters"; export const meetingsTable = mainSchema.table("meetings", { @@ -11,7 +11,7 @@ export const meetingsTable = mainSchema.table("meetings", { .notNull() .references(() => semestersTable.id), date: date("date").notNull(), - timestart: timestamp("TimeStart").notNull(), + timestart: time("timeStart").notNull(), timeEnd: text("TimeEnd").notNull(), room: text("room").notNull(), }); diff --git a/db/tables/semesters.ts b/db/tables/semesters.ts index dc9e824..08dcda2 100644 --- a/db/tables/semesters.ts +++ b/db/tables/semesters.ts @@ -10,6 +10,7 @@ import { departmentsTable } from "./departments"; import { mainSchema } from "./schema"; import { schoolSemesterAssistantsTable } from "./school-semester-assistant"; import { teamSemesterUsersTable } from "./team-semester-user"; +import { meetingsTable } from "./meetings"; export const semestersTable = mainSchema.table("semesters", { id: serial("id").primaryKey(), @@ -43,5 +44,6 @@ export const semestersRelations = relations( }), schoolAssistants: many(schoolSemesterAssistantsTable), teamUsers: many(teamSemesterUsersTable), + meetings: many(meetingsTable), }), ); From 4f696eb6865c91fc607ba95c4efc69d0b6f7a7f1 Mon Sep 17 00:00:00 2001 From: simenen123 Date: Mon, 27 Oct 2025 16:48:58 +0100 Subject: [PATCH 07/12] fix: name conventions --- db/tables/meetings.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/db/tables/meetings.ts b/db/tables/meetings.ts index df6ec5f..f38435c 100644 --- a/db/tables/meetings.ts +++ b/db/tables/meetings.ts @@ -11,7 +11,7 @@ export const meetingsTable = mainSchema.table("meetings", { .notNull() .references(() => semestersTable.id), date: date("date").notNull(), - timestart: time("timeStart").notNull(), + timeStart: time("timeStart").notNull(), timeEnd: text("TimeEnd").notNull(), room: text("room").notNull(), }); From f688eadc5db2cd8f52bf56029b517ae666cadc8f Mon Sep 17 00:00:00 2001 From: simenen123 Date: Mon, 27 Oct 2025 16:56:09 +0100 Subject: [PATCH 08/12] =?UTF-8?q?Fix:=20gjort=20ting=20i=20alfabetisk=20re?= =?UTF-8?q?kkef=C3=B8lge?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/seeding/seeding-tables.ts | 6 +++--- db/tables/meetings.ts | 7 ++++++- db/tables/semesters.ts | 3 ++- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/db/seeding/seeding-tables.ts b/db/seeding/seeding-tables.ts index 2c3c2fd..29dcea5 100644 --- a/db/seeding/seeding-tables.ts +++ b/db/seeding/seeding-tables.ts @@ -1,12 +1,12 @@ +import { applicationsTable } from "@/db/tables/applications"; import { departmentsTable } from "@/db/tables/departments"; import { expensesTable } from "@/db/tables/expenses"; import { fieldsOfStudyTable } from "@/db/tables/fields-of-study"; // import { meetings } from "@/db/tables/meetings"; import { teamsTable } from "@/db/tables/teams"; import { usersTable } from "@/db/tables/users"; -import { applicationsTable } from "@/db/tables/applications"; -import { meetingsTable } from "@/db/tables/meetings"; -import { schoolsTable } from "@/db/tables/schools"; +// import { meetingsTable } from "@/db/tables/meetings"; +// import { schoolsTable } from "@/db/tables/schools"; export const seedingTables = { departmentsTable, diff --git a/db/tables/meetings.ts b/db/tables/meetings.ts index f38435c..c6740eb 100644 --- a/db/tables/meetings.ts +++ b/db/tables/meetings.ts @@ -1,6 +1,11 @@ import { mainSchema } from "@/db/tables/schema"; import { relations } from "drizzle-orm"; -import { date, integer, serial, text, time, timestamp } from "drizzle-orm/pg-core"; +import { date, + integer, + serial, + text, + time + } from "drizzle-orm/pg-core"; import { semestersTable } from "./semesters"; export const meetingsTable = mainSchema.table("meetings", { diff --git a/db/tables/semesters.ts b/db/tables/semesters.ts index 08dcda2..3140604 100644 --- a/db/tables/semesters.ts +++ b/db/tables/semesters.ts @@ -7,10 +7,11 @@ import { text, } from "drizzle-orm/pg-core"; import { departmentsTable } from "./departments"; +import { meetingsTable } from "./meetings"; import { mainSchema } from "./schema"; import { schoolSemesterAssistantsTable } from "./school-semester-assistant"; import { teamSemesterUsersTable } from "./team-semester-user"; -import { meetingsTable } from "./meetings"; + export const semestersTable = mainSchema.table("semesters", { id: serial("id").primaryKey(), From 0ae1d3a7d9d896c47172da0a7e04b848f4ed67a7 Mon Sep 17 00:00:00 2001 From: simenen123 Date: Mon, 27 Oct 2025 17:00:21 +0100 Subject: [PATCH 09/12] fix: fikset inlines(biome kan suge kuken min) --- db/seeding/seeding-tables.ts | 3 --- db/tables/meetings.ts | 7 +------ db/tables/semesters.ts | 1 - tsconfig.json | 1 - 4 files changed, 1 insertion(+), 11 deletions(-) diff --git a/db/seeding/seeding-tables.ts b/db/seeding/seeding-tables.ts index 29dcea5..12baecf 100644 --- a/db/seeding/seeding-tables.ts +++ b/db/seeding/seeding-tables.ts @@ -2,11 +2,8 @@ import { applicationsTable } from "@/db/tables/applications"; import { departmentsTable } from "@/db/tables/departments"; import { expensesTable } from "@/db/tables/expenses"; import { fieldsOfStudyTable } from "@/db/tables/fields-of-study"; -// import { meetings } from "@/db/tables/meetings"; import { teamsTable } from "@/db/tables/teams"; import { usersTable } from "@/db/tables/users"; -// import { meetingsTable } from "@/db/tables/meetings"; -// import { schoolsTable } from "@/db/tables/schools"; export const seedingTables = { departmentsTable, diff --git a/db/tables/meetings.ts b/db/tables/meetings.ts index c6740eb..9720e89 100644 --- a/db/tables/meetings.ts +++ b/db/tables/meetings.ts @@ -1,11 +1,6 @@ import { mainSchema } from "@/db/tables/schema"; import { relations } from "drizzle-orm"; -import { date, - integer, - serial, - text, - time - } from "drizzle-orm/pg-core"; +import { date, integer, serial, text, time } from "drizzle-orm/pg-core"; import { semestersTable } from "./semesters"; export const meetingsTable = mainSchema.table("meetings", { diff --git a/db/tables/semesters.ts b/db/tables/semesters.ts index 3140604..8233ca7 100644 --- a/db/tables/semesters.ts +++ b/db/tables/semesters.ts @@ -12,7 +12,6 @@ import { mainSchema } from "./schema"; import { schoolSemesterAssistantsTable } from "./school-semester-assistant"; import { teamSemesterUsersTable } from "./team-semester-user"; - export const semestersTable = mainSchema.table("semesters", { id: serial("id").primaryKey(), lastSemesterId: integer("lastSemesterId").references( diff --git a/tsconfig.json b/tsconfig.json index 53819b7..b28f257 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -31,6 +31,5 @@ "@/lib/*": ["./lib/*"], "@/docs/*": ["./openapi/*"] } - } } From 54b69e1bcbe8e3a23c76991cd20074552c96df64 Mon Sep 17 00:00:00 2001 From: simenen123 Date: Mon, 27 Oct 2025 17:02:31 +0100 Subject: [PATCH 10/12] fix: biome --- db/seeding/seeding-tables.ts | 1 - db/tables/meetings.ts | 4 +--- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/db/seeding/seeding-tables.ts b/db/seeding/seeding-tables.ts index 12baecf..e7340c5 100644 --- a/db/seeding/seeding-tables.ts +++ b/db/seeding/seeding-tables.ts @@ -18,5 +18,4 @@ export const seedingTables = { applicationsTable, // meetingsTable, // schoolsTable - }; diff --git a/db/tables/meetings.ts b/db/tables/meetings.ts index 9720e89..64d0053 100644 --- a/db/tables/meetings.ts +++ b/db/tables/meetings.ts @@ -21,6 +21,4 @@ export const meetingsRelations = relations(meetingsTable, ({ one }) => ({ fields: [meetingsTable.semesterId], // FK i meetings references: [semestersTable.id], // PK i semesters }), -})); - - +})); \ No newline at end of file From 376460980840a947bb9979cf6aaceb03b8bb0375 Mon Sep 17 00:00:00 2001 From: simenen123 Date: Mon, 27 Oct 2025 17:04:51 +0100 Subject: [PATCH 11/12] fix: biome --- db/tables/meetings.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/db/tables/meetings.ts b/db/tables/meetings.ts index 64d0053..b4fb104 100644 --- a/db/tables/meetings.ts +++ b/db/tables/meetings.ts @@ -21,4 +21,4 @@ export const meetingsRelations = relations(meetingsTable, ({ one }) => ({ fields: [meetingsTable.semesterId], // FK i meetings references: [semestersTable.id], // PK i semesters }), -})); \ No newline at end of file +})); From 8c6f78cf1d92a716bc4b64309006e13eb2795aa9 Mon Sep 17 00:00:00 2001 From: simenen123 Date: Mon, 27 Oct 2025 17:20:16 +0100 Subject: [PATCH 12/12] fix: fjernet stor T --- db/tables/meetings.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/db/tables/meetings.ts b/db/tables/meetings.ts index b4fb104..f82c9d0 100644 --- a/db/tables/meetings.ts +++ b/db/tables/meetings.ts @@ -12,7 +12,7 @@ export const meetingsTable = mainSchema.table("meetings", { .references(() => semestersTable.id), date: date("date").notNull(), timeStart: time("timeStart").notNull(), - timeEnd: text("TimeEnd").notNull(), + timeEnd: text("timeEnd").notNull(), room: text("room").notNull(), });