Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 30 additions & 0 deletions src/db-access/users.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import type {
UserKey,
} from "@/src/response-handling/users";
import { eq, inArray } from "drizzle-orm";
import type { TeamKey } from "../response-handling/teams";

export async function selectUsersById(
userIds: UserKey[],
Expand Down Expand Up @@ -138,6 +139,35 @@ export async function selectTeamUsers(
.then(handleDatabaseFullfillment, handleDatabaseRejection);
}

export async function selectTeamUsersByTeamid(
queryParameters: QueryParameters,
teamIds: TeamKey[],
): Promise<OrmResult<TeamUser[]>> {
return await database
.transaction(async (tx) => {
const selectResult = await tx
.select({
id: usersTable.id,
firstName: usersTable.firstName,
lastName: usersTable.lastName,
fieldOfStudyId: usersTable.fieldOfStudyId,
bankAccountNumber: usersTable.bankAccountNumber,
phoneNumber: usersTable.phoneNumber,
personalEmail: usersTable.personalEmail,
teamId: teamUsersTable.teamId,
username: teamUsersTable.username,
})
.from(teamUsersTable)
.innerJoin(usersTable, eq(teamUsersTable.id, usersTable.id))
.limit(queryParameters.limit)
.offset(queryParameters.offset)
.where(inArray(teamUsersTable.teamId, teamIds));

return selectResult;
})
.then(handleDatabaseFullfillment, handleDatabaseRejection);
}

export async function selectAssistantUsers(
queryParameters: QueryParameters,
): Promise<OrmResult<AssistantUser[]>> {
Expand Down
49 changes: 49 additions & 0 deletions src/routers/users.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import {
selectAssistantUsersById,
selectTeamUsers,
selectTeamUsersById,
selectTeamUsersByTeamid,
selectUsers,
selectUsersById,
} from "@/src/db-access/users";
Expand Down Expand Up @@ -213,6 +214,54 @@ teamUsersRouter.get("", async (req, res, next) => {
res.json(databaseResult.data);
});

/**
* @openapi
* /users/team-members:
* get:
* tags: [users]
* summary: Get team member users for spesific team
* description: Get team member users for spesific team
* parameters:
* - $ref: "#/components/parameters/limit"
* - $ref: "#/components/parameters/offset"
* - $ref: "#/components/parameters/sort"
* responses:
* 200:
* description: Successfull response
* content:
* application/json:
* schema:
* $ref: "#/components/schemas/teamUser/{teamId}"
*/
teamUsersRouter.get("/teamId/:teamId", async (req, res, next) => {
const queryParameterResult = toListQueryParser.safeParse(req.query);
const teamIdRequest = toSerialIdParser.safeParse(req.params.teamId);
if (!queryParameterResult.success) {
return next(
clientError(400, "Invalid request format", queryParameterResult.error),
);
}
if (!teamIdRequest.success) {
return next(
clientError(400, "Invalid request format", teamIdRequest.error),
);
}
const databaseResult = await selectTeamUsersByTeamid(
queryParameterResult.data,
[teamIdRequest.data],
);
if (!databaseResult.success) {
return next(
clientError(
400,
"Failed to retrieve data from the database",
databaseResult.error,
),
);
}
res.json(databaseResult.data);
});

/**
* @openapi
* /users/assistants:
Expand Down