Fix update user resolver to exclude branches as it is only changed by…

… super admin via other resolvers
uwblueprint · Aug 30, 2022 · 516b7ba · 516b7ba
1 parent d34f3c1
commit 516b7ba
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 16 deletions.
diff --git a/backend/graphql/types/userType.ts b/backend/graphql/types/userType.ts
@@ -130,7 +130,6 @@ const userType = gql`
     dateOfBirth: Date
     pronouns: String!
     skills: [ID!]!
-    branches: [ID!]!
     languages: [ID!]!
   }
 
@@ -160,7 +159,6 @@ const userType = gql`
     emergencyContactEmail: String
     dateOfBirth: Date
     pronouns: String!
-    branches: [ID!]!
     languages: [ID!]!
   }
 

diff --git a/backend/services/implementations/userService.ts b/backend/services/implementations/userService.ts
@@ -964,10 +964,6 @@ class UserService implements IUserService {
           },
           data: {
             hireDate: volunteerUser.hireDate,
-            branches: {
-              set: [], // setting the related branches to be [] before connecting the passed in values
-              connect: convertToNumberIds(volunteerUser.branches),
-            },
             skills: {
               set: [], // setting the related skills to be [] before connecting the passed in values
               connect: convertToNumberIds(volunteerUser.skills),
@@ -1452,10 +1448,6 @@ class UserService implements IUserService {
               dateOfBirth: employeeUser.dateOfBirth,
             },
           },
-          branches: {
-            set: [],
-            connect: convertToNumberIds(employeeUser.branches),
-          },
         },
         include: {
           branches: true,

diff --git a/backend/types.ts b/backend/types.ts
@@ -77,7 +77,10 @@ export type CreateVolunteerUserDTO = Omit<VolunteerUserRequestDTO, "id"> & {
   token: string;
 };
 
-export type UpdateVolunteerUserDTO = Omit<VolunteerUserRequestDTO, "id">;
+export type UpdateVolunteerUserDTO = Omit<
+  VolunteerUserRequestDTO,
+  "id" | "branches"
+>;
 
 export type EmployeeUserDTO = {
   id: string;
@@ -99,7 +102,10 @@ export type CreateEmployeeUserDTO = Omit<EmployeeUserRequestDTO, "id"> & {
   token: string;
 };
 
-export type UpdateEmployeeUserDTO = Omit<EmployeeUserRequestDTO, "id">;
+export type UpdateEmployeeUserDTO = Omit<
+  EmployeeUserRequestDTO,
+  "id" | "branches"
+>;
 
 export type CreateUserDTO = Omit<UserDTO, "id" | "languages"> & {
   password: string;

diff --git a/frontend/src/components/user/AccountForm.tsx b/frontend/src/components/user/AccountForm.tsx
@@ -244,7 +244,6 @@ const AccountForm = ({
           pronouns: values.pronouns,
           dateOfBirth: values.dateOfBirth,
           languages: values.languages.map((language) => language.id),
-          branches: [],
         });
       } else {
         onVolunteerEdit({
@@ -260,7 +259,6 @@ const AccountForm = ({
           dateOfBirth: moment(values.dateOfBirth).format("YYYY-MM-DD"),
           skills: values.skills.map((skill) => skill.id),
           languages: values.languages.map((language) => language.id),
-          branches: [],
         });
       }
     }

diff --git a/frontend/src/types/api/UserType.ts b/frontend/src/types/api/UserType.ts
@@ -51,7 +51,10 @@ export type CreateVolunteerUserDTO = Omit<VolunteerUserRequestDTO, "id"> & {
   token: string | null;
 };
 
-export type UpdateVolunteerUserDTO = Omit<VolunteerUserRequestDTO, "id">;
+export type UpdateVolunteerUserDTO = Omit<
+  VolunteerUserRequestDTO,
+  "id" | "branches"
+>;
 
 export type EmployeeDTO = {
   id: string;
@@ -74,7 +77,10 @@ export type CreateEmployeeUserDTO = Omit<EmployeeUserRequestDTO, "id"> & {
   token: string | null;
 };
 
-export type UpdateEmployeeUserDTO = Omit<EmployeeUserRequestDTO, "id">;
+export type UpdateEmployeeUserDTO = Omit<
+  EmployeeUserRequestDTO,
+  "id" | "branches"
+>;
 
 export type UserInviteResponseDTO = {
   uuid: string;