Merge pull request #1167 from rocket-admin/backend_architecture_simplification_version_2

fix: update recountUsersInCompanyRequest to use companyId in RemoveUserFromCompany and VerifyInviteUser use cases

Author: Artuomka

backend/src/entities/company-info/use-cases/remove-user-from-company.use.case.ts

@@ -52,7 +52,7 @@ export class RemoveUserFromCompanyUseCase
     foundCompanyWithUsers.users = foundCompanyWithUsers.users.filter((user) => user.id !== userId);
     await this._dbContext.companyInfoRepository.save(foundCompanyWithUsers);
     await this._dbContext.userRepository.remove(foundUser);
-    await this.saasCompanyGatewayService.recountUsersInCompanyRequest(foundCompanyWithUsers.id);
+    await this.saasCompanyGatewayService.recountUsersInCompanyRequest(companyId);
     return {
       success: true,
     };

backend/src/entities/company-info/use-cases/verify-invite-user-in-company.use.case.ts

@@ -37,7 +37,7 @@ export class VerifyInviteUserInCompanyAndConnectionGroupUseCase
       );
     }
     const {
-      company: { users },
+      company: { users, id: companyId },
       groupId,
       role,
     } = foundInvitation;
@@ -86,7 +86,7 @@ export class VerifyInviteUserInCompanyAndConnectionGroupUseCase
       }
     }
     await this._dbContext.invitationInCompanyRepository.remove(foundInvitation);
-    await this.saasCompanyGatewayService.recountUsersInCompanyRequest(foundInvitation.company.id);
+    await this.saasCompanyGatewayService.recountUsersInCompanyRequest(companyId);
     return generateGwtToken(newUser, get2FaScope(newUser, foundInvitation.company));
   }
 }