fix: ORV2-2202 Fix Account Claim for a deleted user (#1305)

bcgov · Apr 4, 2024 · b7f9132 · b7f9132
1 parent e5b21c7
commit b7f9132
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 0 deletions.
diff --git a/vehicles/src/modules/company-user-management/users/users.service.ts b/vehicles/src/modules/company-user-management/users/users.service.ts
@@ -114,6 +114,16 @@ export class UsersService {
     await queryRunner.connect();
     await queryRunner.startTransaction();
     try {
+      const existingUser = await queryRunner.manager.findOne<User>(User, {
+        where: {
+          userGUID: currentUser.userGUID,
+        },
+        relations: {
+          companyUsers: true,
+          userContact: true,
+        },
+      });
+
       let user = this.classMapper.map(createUserDto, CreateUserDto, User, {
         extraArgs: () => ({
           userAuthGroup: GenericUserAuthGroup.PUBLIC_VERIFIED,
@@ -124,7 +134,11 @@ export class UsersService {
         }),
       });
 
+      user.userContact.contactId = existingUser?.userContact?.contactId;
+
       const newCompanyUser = new CompanyUser();
+      newCompanyUser.companyUserId =
+        existingUser?.companyUsers?.at(0)?.companyUserId;
       newCompanyUser.company = new Company();
       newCompanyUser.company.companyId = companyId;
       newCompanyUser.statusCode = UserStatus.ACTIVE;

diff --git a/vehicles/test/unit/users/users.service.spec.ts b/vehicles/test/unit/users/users.service.spec.ts
@@ -69,6 +69,7 @@ describe('UsersService', () => {
     delete: jest.fn(),
     update: jest.fn(),
     find: jest.fn(),
+    findOne: jest.fn(),
     save: jest.fn(),
   };
 

diff --git a/vehicles/test/util/mocks/factory/dataSource.factory.mock.ts b/vehicles/test/util/mocks/factory/dataSource.factory.mock.ts
@@ -21,6 +21,7 @@ export type MockQueryRunnerManager = {
   delete: jest.Mock;
   update: jest.Mock;
   find: jest.Mock;
+  findOne?: jest.Mock;
   save: jest.Mock;
 };
 
@@ -37,6 +38,7 @@ export const dataSourceMockFactory = () => {
       manager: {
         delete: jest.fn(),
         update: jest.fn(),
+        findOne: jest.fn(),
         save: jest.fn((saveObject: object) => {
           if (saveObject instanceof Company) {
             if (saveObject.legalName === constants.RED_COMPANY_LEGAL_NAME) {