make assistant application and team application work

db/seeding/seeding-tables.ts

@@ -1,7 +1,6 @@
 import { departmentsTable } from "@/db/tables/departments";
 import { expensesTable } from "@/db/tables/expenses";
 import { fieldsOfStudyTable } from "@/db/tables/fields-of-study";
-import { teamApplicationsTable } from "@/db/tables/team-applications";
 import { teamsTable } from "@/db/tables/teams";
 import { usersTable } from "@/db/tables/users";
 
@@ -12,6 +11,6 @@ export const seedingTables = {
 	usersTable,
 	//teamUsersTable, these two tables dont work currently
 	//assistantUsersTable,
-	teamApplicationsTable,
+	//teamApplicationsTable,
 	expensesTable,
 };

db/tables/applications.ts

@@ -0,0 +1,85 @@
+import { mainSchema } from "@/db/tables/schema";
+import { relations } from "drizzle-orm";
+import { date, integer, serial, text } from "drizzle-orm/pg-core";
+
+import { teamsTable } from "@/db/tables/teams";
+import { fieldsOfStudyTable } from "./fields-of-study";
+
+export const gendersEnum = mainSchema.enum("gender", [
+	"female",
+	"male",
+	"other",
+]);
+
+export const applicationsTable = mainSchema.table("applications", {
+	id: serial("id").primaryKey(),
+	firstName: text("firstname").notNull(),
+	lastName: text("lastname").notNull(),
+	gender: gendersEnum("gender").notNull(),
+	email: text("email").notNull(),
+	fieldOfStudyId: integer("fieldOfStudyId")
+		.notNull()
+		.references(() => fieldsOfStudyTable.id),
+	yearOfStudy: integer("yearOfStudy").notNull(),
+	phonenumber: text("phonenumber").notNull(),
+	submitDate: date("submitDate", { mode: "date" }).defaultNow().notNull(),
+});
+
+export const applicationsRelations = relations(
+	applicationsTable,
+	({ one, many }) => ({
+		fieldOfStudy: one(fieldsOfStudyTable, {
+			fields: [applicationsTable.fieldOfStudyId],
+			references: [fieldsOfStudyTable.id],
+		}),
+		assistantApplication: one(assistantApplicationsTable, {
+			fields: [applicationsTable.id],
+			references: [assistantApplicationsTable.id],
+		}),
+		teamApplication: many(teamApplicationsTable),
+	}),
+);
+
+export const teamApplicationsTable = mainSchema.table("teamApplications", {
+	id: integer("id")
+		.primaryKey()
+		.references(() => applicationsTable.id),
+	teamId: integer("teamId")
+		.notNull()
+		.references(() => teamsTable.id),
+	motivationText: text("motivationText").notNull(),
+	biography: text("biography").notNull(),
+});
+
+export const teamApplicationsRelations = relations(
+	teamApplicationsTable,
+	({ one }) => ({
+		superApplication: one(applicationsTable, {
+			fields: [teamApplicationsTable.id],
+			references: [applicationsTable.id],
+		}),
+		team: one(teamsTable, {
+			fields: [teamApplicationsTable.teamId],
+			references: [teamsTable.id],
+		}),
+	}),
+);
+
+export const assistantApplicationsTable = mainSchema.table(
+	"assistantApplications",
+	{
+		id: integer("id")
+			.primaryKey()
+			.references(() => applicationsTable.id),
+	},
+);
+
+export const assistantApplicationsRelations = relations(
+	assistantApplicationsTable,
+	({ one }) => ({
+		superApplication: one(applicationsTable, {
+			fields: [assistantApplicationsTable.id],
+			references: [applicationsTable.id],
+		}),
+	}),
+);

db/tables/fields-of-study.ts

@@ -1,8 +1,8 @@
 import { departmentsTable } from "@/db/tables/departments";
 import { mainSchema } from "@/db/tables/schema";
-import { teamApplicationsTable } from "@/db/tables/team-applications";
 import { relations } from "drizzle-orm";
 import { integer, serial, text } from "drizzle-orm/pg-core";
+import { applicationsTable } from "./applications";
 
 export const fieldsOfStudyTable = mainSchema.table("fieldsOfStudy", {
 	id: serial("id").primaryKey(),
@@ -20,6 +20,6 @@ export const fieldsOfStudyRelations = relations(
 			fields: [fieldsOfStudyTable.departmentId],
 			references: [departmentsTable.id],
 		}),
-		teamApplication: many(teamApplicationsTable),
+		applications: many(applicationsTable),
 	}),
 );

db/tables/teams.ts

@@ -1,6 +1,6 @@
+import { teamApplicationsTable } from "@/db/tables/applications";
 import { departmentsTable } from "@/db/tables/departments";
 import { mainSchema } from "@/db/tables/schema";
-import { teamApplicationsTable } from "@/db/tables/team-applications";
 import { teamUsersTable } from "@/db/tables/users";
 import { relations } from "drizzle-orm";
 import { boolean, serial, text, timestamp } from "drizzle-orm/pg-core";

src/db-access/applications.ts

@@ -0,0 +1,147 @@
+import { database } from "@/db/setup/query-postgres";
+import {
+	applicationsTable,
+	teamApplicationsTable,
+} from "@/db/tables/applications";
+import type { OrmResult } from "@/src/error/orm-error";
+import type {
+	NewApplication,
+	NewTeamApplication,
+} from "@/src/request-handling/applications";
+import type { QueryParameters } from "@/src/request-handling/common";
+import type {
+	ApplicationKey,
+	TeamApplication,
+	TeamKey,
+} from "@/src/response-handling/applications";
+import { eq, inArray } from "drizzle-orm";
+import { newDatabaseTransaction } from "./common";
+
+export const selectTeamApplications = async (
+	parameters: QueryParameters,
+): Promise<OrmResult<TeamApplication[]>> => {
+	return await newDatabaseTransaction(database, async (tx) => {
+		const teamApplications = await tx
+			.select({
+				id: applicationsTable.id,
+				teamId: teamApplicationsTable.teamId,
+				firstName: applicationsTable.firstName,
+				lastName: applicationsTable.lastName,
+				gender: applicationsTable.gender,
+				email: applicationsTable.email,
+				fieldOfStudyId: applicationsTable.fieldOfStudyId,
+				yearOfStudy: applicationsTable.yearOfStudy,
+				phonenumber: applicationsTable.phonenumber,
+				motivationText: teamApplicationsTable.motivationText,
+				biography: teamApplicationsTable.biography,
+				submitDate: applicationsTable.submitDate,
+			})
+			.from(teamApplicationsTable)
+			.innerJoin(
+				applicationsTable,
+				eq(teamApplicationsTable.id, applicationsTable.id),
+			)
+			.limit(parameters.limit)
+			.offset(parameters.offset);
+
+		return teamApplications;
+	});
+};
+
+export const selectTeamApplicationsByTeamId = async (
+	teamId: TeamKey[],
+	parameters: QueryParameters,
+): Promise<OrmResult<TeamApplication[]>> => {
+	return await newDatabaseTransaction(database, async (tx) => {
+		const selectResult = await tx
+			.select({
+				id: applicationsTable.id,
+				teamId: teamApplicationsTable.teamId,
+				firstName: applicationsTable.firstName,
+				lastName: applicationsTable.lastName,
+				gender: applicationsTable.gender,
+				email: applicationsTable.email,
+				fieldOfStudyId: applicationsTable.fieldOfStudyId,
+				yearOfStudy: applicationsTable.yearOfStudy,
+				phonenumber: applicationsTable.phonenumber,
+				motivationText: teamApplicationsTable.motivationText,
+				biography: teamApplicationsTable.biography,
+				submitDate: applicationsTable.submitDate,
+			})
+			.from(teamApplicationsTable)
+			.where(inArray(teamApplicationsTable.id, teamId))
+			.innerJoin(
+				applicationsTable,
+				eq(teamApplicationsTable.id, applicationsTable.id),
+			)
+			.limit(parameters.limit)
+			.offset(parameters.offset);
+
+		return selectResult;
+	});
+};
+
+export const selectTeamApplicationsById = async (
+	applicationIds: ApplicationKey[],
+): Promise<OrmResult<TeamApplication[]>> => {
+	return await newDatabaseTransaction(database, async (tx) => {
+		const selectResult = await tx
+			.select({
+				id: applicationsTable.id,
+				teamId: teamApplicationsTable.teamId,
+				firstName: applicationsTable.firstName,
+				lastName: applicationsTable.lastName,
+				gender: applicationsTable.gender,
+				email: applicationsTable.email,
+				fieldOfStudyId: applicationsTable.fieldOfStudyId,
+				yearOfStudy: applicationsTable.yearOfStudy,
+				phonenumber: applicationsTable.phonenumber,
+				motivationText: teamApplicationsTable.motivationText,
+				biography: teamApplicationsTable.biography,
+				submitDate: applicationsTable.submitDate,
+			})
+			.from(teamApplicationsTable)
+			.where(inArray(teamApplicationsTable.id, applicationIds))
+			.innerJoin(
+				applicationsTable,
+				eq(teamApplicationsTable.id, applicationsTable.id),
+			);
+
+		return selectResult;
+	});
+};
+
+export async function insertTeamApplication(
+	teamApplication: NewTeamApplication & NewApplication,
+): Promise<OrmResult<TeamApplication>> {
+	return await newDatabaseTransaction(database, async (tx) => {
+		const newApplication = await tx
+			.insert(applicationsTable)
+			.values({
+				firstName: teamApplication.firstName,
+				lastName: teamApplication.lastName,
+				gender: teamApplication.gender,
+				email: teamApplication.email,
+				fieldOfStudyId: teamApplication.fieldOfStudyId,
+				yearOfStudy: teamApplication.yearOfStudy,
+				phonenumber: teamApplication.phonenumber,
+			})
+			.returning();
+		const newApplicationId = newApplication[0].id;
+
+		const newTeamApplicationResult = await tx
+			.insert(teamApplicationsTable)
+			.values({
+				id: newApplicationId,
+				teamId: teamApplication.teamId,
+				motivationText: teamApplication.motivationText,
+				biography: teamApplication.biography,
+			})
+			.returning();
+
+		return {
+			...newApplication[0],
+			...newTeamApplicationResult[0],
+		};
+	});
+}

src/error/error-messages.ts

@@ -29,6 +29,7 @@ const ORM_ERROR_MESSAGES = [
 	"Couln't find all entries",
 	"Wrong database response format",
 	"Failed to insert all entries",
+	"Error when inserting team users",
 ] as const;
 const HTTP_CLIENT_ERROR_MESSAGES = [
 	"Invalid request format",

src/main.ts

@@ -6,11 +6,10 @@ import {
 import { logger } from "@/src/middleware/logging-middleware";
 import express from "express";
 
+import { teamApplicationRouter } from "@/src/routers/applications";
 import { expensesRouter } from "@/src/routers/expenses";
 import { customCors, customHelmetSecurity } from "@/src/security";
 
-import { teamApplicationRouter } from "@/src/routers/team-applications";
-
 import { openapiSpecification } from "@/src/openapi/config";
 import { sponsorsRouter } from "@/src/routers/sponsors";
 import { teamsRouter } from "@/src/routers/teams";