Merge pull request #59 from uwblueprint/INTS25-refactor-user-resolvers-and-services

[INTS25] - Refactor Current User Resolvers and Services

Author: eric-martin-wpfm

backend/typescript/graphql/types/userType.ts

@@ -12,6 +12,7 @@ const userType = gql`
     lastName: String!
     email: String!
     role: Role!
+    position: String
   }
 
   input CreateUserDTO {
@@ -20,13 +21,15 @@ const userType = gql`
     email: String!
     role: Role!
     password: String!
+    position: String
   }
 
   input UpdateUserDTO {
     firstName: String!
     lastName: String!
     email: String!
     role: Role!
+    position: String
   }
 
   extend type Query {

backend/typescript/migrations/20250705172630-delete-bad-seeded-user-data.ts

@@ -5,7 +5,7 @@ const USER_SEED_DATA = [
     first_name: "Carolyn",
     last_name: "Zhang",
     email: "carolynzhang@uwblueprint.org",
-    auth_id: "ATd5GMzp8IPJzQzuQYkaavcelb32",
+    auth_id: "ATd5GMzp8IPJzQzuQYkaavcelb32", // NOTE: this id is wrong, it is corrected in the next migration
     role: "Admin",
     position: "VP Engineering",
   },

backend/typescript/migrations/20250719164317-correct-auth-id-for-user-id-1.ts

@@ -0,0 +1,19 @@
+import { Migration } from "../umzug";
+
+const TABLE_NAME = "users";
+
+export const up: Migration = async ({ context: sequelize }) => {
+  await sequelize.getQueryInterface().bulkUpdate(
+    TABLE_NAME,
+    { auth_id: "fx49Ei9zxbQf4rWrXp7ZqEk8cLi2" }, // Replace with the correct auth_id value
+    { id: 1 },
+  );
+};
+
+export const down: Migration = async ({ context: sequelize }) => {
+  await sequelize.getQueryInterface().bulkUpdate(
+    TABLE_NAME,
+    { auth_id: "ATd5GMzp8IPJzQzuQYkaavcelb32" }, // this is the previous auth_id for user with id 1
+    { id: 1 },
+  );
+};

backend/typescript/services/implementations/userService.ts

@@ -15,7 +15,9 @@ class UserService implements IUserService {
     // let firebaseUser: firebaseAdmin.auth.UserRecord;
 
     try {
-      user = await User.findByPk(Number(userId));
+      user = await User.findOne({
+        where: { id: userId },
+      });
 
       if (!user) {
         throw new Error(`userId ${userId} not found.`);
@@ -31,6 +33,7 @@ class UserService implements IUserService {
       firstName: user.first_name,
       lastName: user.last_name,
       email: "firebaseUser.email ?? ",
+      position: user.position ?? undefined,
       role: user.role,
     };
   }
@@ -58,6 +61,7 @@ class UserService implements IUserService {
       firstName: user.first_name,
       lastName: user.last_name,
       email: email ?? "",
+      position: user.position ?? undefined,
       role: user.role,
     };
   }
@@ -130,6 +134,7 @@ class UserService implements IUserService {
             firstName: user.first_name,
             lastName: user.last_name,
             email: firebaseUser.email ?? "",
+            position: user.position ?? undefined,
             role: user.role,
           };
         }),
@@ -160,6 +165,7 @@ class UserService implements IUserService {
           auth_id: firebaseUser.uid,
           email: firebaseUser.email,
           role: user.role,
+          position: user.position ?? undefined,
         });
       } catch (postgresError) {
         try {
@@ -186,6 +192,7 @@ class UserService implements IUserService {
       firstName: newUser.first_name,
       lastName: newUser.last_name,
       email: firebaseUser.email ?? "",
+      position: user.position ?? undefined,
       role: newUser.role,
     };
   }
@@ -198,6 +205,7 @@ class UserService implements IUserService {
         {
           first_name: user.firstName,
           last_name: user.lastName,
+          position: user.position ?? undefined,
           role: user.role,
         },
         {
@@ -227,6 +235,7 @@ class UserService implements IUserService {
             {
               first_name: oldUser.first_name,
               last_name: oldUser.last_name,
+              position: user.position ?? undefined,
               role: oldUser.role,
             },
             {
@@ -255,6 +264,7 @@ class UserService implements IUserService {
       firstName: user.firstName,
       lastName: user.lastName,
       email: updatedFirebaseUser.email ?? "",
+      position: user.position ?? undefined,
       role: user.role,
     };
   }
@@ -285,6 +295,7 @@ class UserService implements IUserService {
             first_name: deletedUser.first_name,
             last_name: deletedUser.last_name,
             auth_id: deletedUser.auth_id,
+            position: deletedUser.position ?? undefined,
             role: deletedUser.role,
           });
         } catch (postgresError: unknown) {
@@ -337,6 +348,7 @@ class UserService implements IUserService {
             first_name: deletedUser.first_name,
             last_name: deletedUser.last_name,
             auth_id: deletedUser.auth_id,
+            position: deletedUser.position ?? undefined,
             role: deletedUser.role,
           });
         } catch (postgresError: unknown) {

backend/typescript/types.ts

@@ -29,6 +29,7 @@ export type UserDTO = {
   firstName: string;
   lastName: string;
   email: string;
+  position?: PositionTitle;
   role: Role;
 };
 
@@ -98,7 +99,7 @@ export type ApplicantDTO = {
 export type ApplicantRecordDTO = {
   id: number;
   applicantId: string;
-  position: string; // EDIT LATER
+  position: PositionTitle; // EDIT LATER
   roleSpecificQuestions: string[];
   choice: number;
   status: ApplicationStatus;