Skip to content

Commit e89ccca

Browse files
committed
added position fields to userService
1 parent 8a6c796 commit e89ccca

File tree

2 files changed

+12
-1
lines changed

2 files changed

+12
-1
lines changed

backend/typescript/services/implementations/userService.ts

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ class UserService implements IUserService {
3131
firstName: user.first_name,
3232
lastName: user.last_name,
3333
email: "firebaseUser.email ?? ",
34+
position: user.position ?? undefined,
3435
role: user.role,
3536
};
3637
}
@@ -58,6 +59,7 @@ class UserService implements IUserService {
5859
firstName: user.first_name,
5960
lastName: user.last_name,
6061
email: email ?? "",
62+
position: user.position ?? undefined,
6163
role: user.role,
6264
};
6365
}
@@ -130,6 +132,7 @@ class UserService implements IUserService {
130132
firstName: user.first_name,
131133
lastName: user.last_name,
132134
email: firebaseUser.email ?? "",
135+
position: user.position ?? undefined,
133136
role: user.role,
134137
};
135138
}),
@@ -160,6 +163,7 @@ class UserService implements IUserService {
160163
auth_id: firebaseUser.uid,
161164
email: firebaseUser.email,
162165
role: user.role,
166+
position: user.position ?? undefined,
163167
});
164168
} catch (postgresError) {
165169
try {
@@ -186,6 +190,7 @@ class UserService implements IUserService {
186190
firstName: newUser.first_name,
187191
lastName: newUser.last_name,
188192
email: firebaseUser.email ?? "",
193+
position: user.position ?? undefined,
189194
role: newUser.role,
190195
};
191196
}
@@ -198,6 +203,7 @@ class UserService implements IUserService {
198203
{
199204
first_name: user.firstName,
200205
last_name: user.lastName,
206+
position: user.position ?? undefined,
201207
role: user.role,
202208
},
203209
{
@@ -227,6 +233,7 @@ class UserService implements IUserService {
227233
{
228234
first_name: oldUser.first_name,
229235
last_name: oldUser.last_name,
236+
position: user.position ?? undefined,
230237
role: oldUser.role,
231238
},
232239
{
@@ -255,6 +262,7 @@ class UserService implements IUserService {
255262
firstName: user.firstName,
256263
lastName: user.lastName,
257264
email: updatedFirebaseUser.email ?? "",
265+
position: user.position ?? undefined,
258266
role: user.role,
259267
};
260268
}
@@ -285,6 +293,7 @@ class UserService implements IUserService {
285293
first_name: deletedUser.first_name,
286294
last_name: deletedUser.last_name,
287295
auth_id: deletedUser.auth_id,
296+
position: deletedUser.position ?? undefined,
288297
role: deletedUser.role,
289298
});
290299
} catch (postgresError: unknown) {
@@ -337,6 +346,7 @@ class UserService implements IUserService {
337346
first_name: deletedUser.first_name,
338347
last_name: deletedUser.last_name,
339348
auth_id: deletedUser.auth_id,
349+
position: deletedUser.position ?? undefined,
340350
role: deletedUser.role,
341351
});
342352
} catch (postgresError: unknown) {

backend/typescript/types.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ export type UserDTO = {
2929
firstName: string;
3030
lastName: string;
3131
email: string;
32+
position?: PositionTitle;
3233
role: Role;
3334
};
3435

@@ -98,7 +99,7 @@ export type ApplicantDTO = {
9899
export type ApplicantRecordDTO = {
99100
id: number;
100101
applicantId: string;
101-
position: string; // EDIT LATER
102+
position: PositionTitle; // EDIT LATER
102103
roleSpecificQuestions: string[];
103104
choice: number;
104105
status: ApplicationStatus;

0 commit comments

Comments
 (0)