Created a new teamRole table

.github/workflows/pull-request-check.yml

@@ -44,7 +44,7 @@ jobs:
       - name: Install pnpm
         run: pnpm install
       - name: Docker compose
-        run: docker compose up -d
+        run: docker compose up -d --wait
       - name: Generate migration files
         run: pnpm db:generate
       - name: Migrate database
@@ -76,7 +76,7 @@ jobs:
       - name: Install pnpm
         run: pnpm install
       - name: Docker compose
-        run: docker compose up -d
+        run: docker compose up -d --wait
       - name: Generate migration files
         run: pnpm db:generate
       - name: Migrate database

db/tables/team-roles.ts

@@ -0,0 +1,7 @@
+import { mainSchema } from "@/db/tables/schema";
+import { serial, text } from "drizzle-orm/pg-core";
+
+export const teamUserRolesTable = mainSchema.table("teamUserRoles", {
+	id: serial("id").primaryKey(),
+	name: text("name").notNull().unique(),
+});

db/tables/teams.ts

@@ -2,23 +2,32 @@ import { teamApplicationsTable } from "@/db/tables/applications";
 import { departmentsTable } from "@/db/tables/departments";
 import { mainSchema } from "@/db/tables/schema";
 import { relations } from "drizzle-orm";
-import { boolean, serial, text, timestamp } from "drizzle-orm/pg-core";
+import { boolean, serial, text, timestamp, unique } from "drizzle-orm/pg-core";
 import { integer } from "drizzle-orm/pg-core";
 import { teamSemesterUsersTable } from "./team-semester-user";
 
-export const teamsTable = mainSchema.table("teams", {
-	id: serial("id").primaryKey(),
-	departmentId: integer("departmentId")
-		.notNull()
-		.references(() => departmentsTable.id),
-	name: text("name").notNull().unique(),
-	email: text("email").notNull().unique(),
-	description: text("description").notNull(),
-	shortDescription: text("shortDescription").notNull(),
-	acceptApplication: boolean("acceptApplication").notNull(),
-	active: boolean("active").notNull(),
-	deadline: timestamp("deadline"),
-});
+export const teamsTable = mainSchema.table(
+	"teams",
+	{
+		id: serial("id").primaryKey(),
+		departmentId: integer("departmentId")
+			.notNull()
+			.references(() => departmentsTable.id),
+		name: text("name").notNull(),
+		email: text("email").notNull().unique(),
+		description: text("description").notNull(),
+		shortDescription: text("shortDescription").notNull(),
+		acceptApplication: boolean("acceptApplication").notNull(),
+		active: boolean("active").notNull(),
+		deadline: timestamp("deadline"),
+	},
+	(table) => ({
+		departmentIdNameUnique: unique("teams_departmentId_name_unique").on(
+			table.departmentId,
+			table.name,
+		),
+	}),
+);
 
 export const teamRelations = relations(teamsTable, ({ one, many }) => ({
 	department: one(departmentsTable, {

db/tables/users.ts

@@ -1,11 +1,12 @@
 import { mainSchema } from "@/db/tables/schema";
 import { relations } from "drizzle-orm";
-import { integer, serial, text } from "drizzle-orm/pg-core";
+import { boolean, integer, serial, text } from "drizzle-orm/pg-core";
 
 import { expensesTable } from "@/db/tables/expenses";
 import { fieldsOfStudyTable } from "@/db/tables/fields-of-study";
 import { teamsTable } from "@/db/tables/teams";
 import { schoolAssignmentsTable } from "./school-assignments";
+import { teamUserRolesTable } from "./team-roles";
 import { teamSemesterUsersTable } from "./team-semester-user";
 
 export const usersTable = mainSchema.table("users", {
@@ -18,6 +19,8 @@ export const usersTable = mainSchema.table("users", {
 	bankAccountNumber: text("accountNumber").unique(),
 	personalEmail: text("personalEmail").notNull().unique(),
 	phoneNumber: text("phoneNumber").notNull().unique(),
+	profilePictureUrl: text("profilePictureUrl"),
+	companyEmail: text("companyEmail").unique(),
 });
 export const usersRelations = relations(usersTable, ({ one, many }) => ({
 	fieldOfStudy: one(fieldsOfStudyTable, {
@@ -37,6 +40,10 @@ export const teamUsersTable = mainSchema.table("teamUsers", {
 		.notNull()
 		.references(() => teamsTable.id),
 	username: text("username").notNull().unique(),
+	teamUserRoleId: integer("teamUserRoleId")
+		.notNull()
+		.references(() => teamUserRolesTable.id),
+	isTeamLeader: boolean("isTeamLeader").notNull().default(false),
 });
 export const teamUsersRelations = relations(
 	teamUsersTable,
@@ -50,6 +57,10 @@ export const teamUsersRelations = relations(
 			references: [teamsTable.id],
 		}),
 		teamSemesters: many(teamSemesterUsersTable),
+		teamUserRole: one(teamUserRolesTable, {
+			fields: [teamUsersTable.teamUserRoleId],
+			references: [teamUserRolesTable.id],
+		}),
 	}),
 );
 

docker-compose.yml

@@ -5,6 +5,12 @@ services:
       - POSTGRES_PASSWORD=${DATABASE_PASSWORD}
       - POSTGRES_USER=${DATABASE_USER}
       - POSTGRES_DB=${DATABASE_NAME}
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U $$POSTGRES_USER -d $$POSTGRES_DB"]
+      interval: 5s
+      timeout: 5s
+      retries: 5
+      start_period: 10s
     ports:
       - ${DATABASE_PORT}:5432
     volumes:

package.json

@@ -18,7 +18,8 @@
 		"db:migrate": "drizzle-kit migrate --config=db/config/drizzle.config.ts",
 		"db:studio": "drizzle-kit studio --config=db/config/drizzle.config.ts",
 		"db:seed": "tsx ./db/seeding/seeding.ts",
-		"docs:generate": "tsx ./openapi/generate-document.ts"
+		"docs:generate": "tsx ./openapi/generate-document.ts",
+		"db:push": "drizzle-kit push --config=db/config/drizzle.config.ts"
 	},
 	"license": "ISC",
 	"dependencies": {

src/db-access/users.ts

@@ -1,4 +1,5 @@
 import { database } from "@/db/setup/query-postgres";
+import { teamUserRolesTable } from "@/db/tables/team-roles";
 import {
 	assistantUsersTable,
 	teamUsersTable,
@@ -56,12 +57,21 @@ export async function selectTeamUsersById(
 					bankAccountNumber: usersTable.bankAccountNumber,
 					phoneNumber: usersTable.phoneNumber,
 					personalEmail: usersTable.personalEmail,
+					profilePictureUrl: usersTable.profilePictureUrl,
+					companyEmail: usersTable.companyEmail,
 					teamId: teamUsersTable.teamId,
 					username: teamUsersTable.username,
+					teamUserRoleId: teamUsersTable.teamUserRoleId,
+					teamUserRoleName: teamUserRolesTable.name,
+					isTeamLeader: teamUsersTable.isTeamLeader,
 				})
 				.from(teamUsersTable)
-				.where(inArray(assistantUsersTable.id, userIds))
-				.innerJoin(usersTable, eq(teamUsersTable.id, usersTable.id));
+				.innerJoin(usersTable, eq(teamUsersTable.id, usersTable.id))
+				.innerJoin(
+					teamUserRolesTable,
+					eq(teamUsersTable.teamUserRoleId, teamUserRolesTable.id),
+				)
+				.where(inArray(teamUsersTable.id, userIds));
 			if (users.length !== userIds.length) {
 				throw ormError("Couln't find all entries");
 			}
@@ -84,6 +94,8 @@ export async function selectAssistantUsersById(
 					phoneNumber: usersTable.phoneNumber,
 					personalEmail: usersTable.personalEmail,
 					bankAccountNumber: usersTable.bankAccountNumber,
+					profilePictureUrl: usersTable.profilePictureUrl,
+					companyEmail: usersTable.companyEmail,
 				})
 				.from(assistantUsersTable)
 				.where(inArray(assistantUsersTable.id, userIds))
@@ -126,11 +138,20 @@ export async function selectTeamUsers(
 					bankAccountNumber: usersTable.bankAccountNumber,
 					phoneNumber: usersTable.phoneNumber,
 					personalEmail: usersTable.personalEmail,
+					profilePictureUrl: usersTable.profilePictureUrl,
+					companyEmail: usersTable.companyEmail,
 					teamId: teamUsersTable.teamId,
 					username: teamUsersTable.username,
+					teamUserRoleId: teamUsersTable.teamUserRoleId,
+					teamUserRoleName: teamUserRolesTable.name,
+					isTeamLeader: teamUsersTable.isTeamLeader,
 				})
 				.from(teamUsersTable)
 				.innerJoin(usersTable, eq(teamUsersTable.id, usersTable.id))
+				.innerJoin(
+					teamUserRolesTable,
+					eq(teamUsersTable.teamUserRoleId, teamUserRolesTable.id),
+				)
 				.limit(queryParameters.limit)
 				.offset(queryParameters.offset);
 
@@ -154,11 +175,20 @@ export async function selectTeamUsersByTeamid(
 					bankAccountNumber: usersTable.bankAccountNumber,
 					phoneNumber: usersTable.phoneNumber,
 					personalEmail: usersTable.personalEmail,
+					profilePictureUrl: usersTable.profilePictureUrl,
+					companyEmail: usersTable.companyEmail,
 					teamId: teamUsersTable.teamId,
 					username: teamUsersTable.username,
+					teamUserRoleId: teamUsersTable.teamUserRoleId,
+					teamUserRoleName: teamUserRolesTable.name,
+					isTeamLeader: teamUsersTable.isTeamLeader,
 				})
 				.from(teamUsersTable)
 				.innerJoin(usersTable, eq(teamUsersTable.id, usersTable.id))
+				.innerJoin(
+					teamUserRolesTable,
+					eq(teamUsersTable.teamUserRoleId, teamUserRolesTable.id),
+				)
 				.limit(queryParameters.limit)
 				.offset(queryParameters.offset)
 				.where(inArray(teamUsersTable.teamId, teamIds));
@@ -182,6 +212,8 @@ export async function selectAssistantUsers(
 					bankAccountNumber: usersTable.bankAccountNumber,
 					phoneNumber: usersTable.phoneNumber,
 					personalEmail: usersTable.personalEmail,
+					profilePictureUrl: usersTable.profilePictureUrl,
+					companyEmail: usersTable.companyEmail,
 				})
 				.from(assistantUsersTable)
 				.innerJoin(usersTable, eq(assistantUsersTable.id, usersTable.id))

src/request-handling/users.ts

@@ -16,13 +16,16 @@ export const userRequestParser = z
 		bankAccountNumber: z.string().length(11),
 		personalEmail: z.string().email(),
 		phoneNumber: z.string().min(8),
+		profilePictureUrl: z.string().nullable().optional(),
 	})
 	.strict();
 
 export const teamUserRequestParser = z
 	.object({
 		id: serialIdParser,
 		teamId: serialIdParser,
+		teamUserRoleId: serialIdParser,
+		isTeamLeader: z.boolean().optional(),
 		username: z.string().nonempty(),
 	})
 	.strict();

src/response-handling/users.ts

@@ -1,5 +1,5 @@
 import { createSelectSchema } from "drizzle-zod";
-import type { z } from "zod";
+import { z } from "zod";
 
 import {
 	assistantUsersTable,
@@ -16,6 +16,7 @@ export type UserKey = User["id"];
 
 export const teamUserSelectSchema = createSelectSchema(teamUsersTable)
 	.merge(createSelectSchema(usersTable))
+	.extend({ teamUserRoleName: z.string() })
 	.strict()
 	.readonly();
 export type TeamUser = z.infer<typeof teamUserSelectSchema>;

src/routers/teams.ts

@@ -96,9 +96,6 @@ teamsRouter.get("/inactive", async (req, res, next) => {
  *   tags: [teams]
  *   summary: Get all active teams with department name and number of members
  *   description: Return all active teams with extra info
- *   parameters:
- *    - $ref: "#/components/parameters/offset"
- *    - $ref: "#/components/parameters/limit"
  *   responses:
  *    200:
  *     description: Successfull response