Merge pull request #425 from internxt/fix/accept-invite-incorrect-fre…

…espace-calculation [PB-3262]: fix/correctly calculate available space in workspace when accepting an invite
internxt · Nov 6, 2024 · 5c3252c · 5c3252c
2 parents c0b10b8 + 8d80314
commit 5c3252c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 19 deletions.
diff --git a/src/modules/workspaces/workspaces.usecase.spec.ts b/src/modules/workspaces/workspaces.usecase.spec.ts
@@ -1289,9 +1289,7 @@ describe('WorkspacesUsecases', () => {
       jest
         .spyOn(userRepository, 'findByUuid')
         .mockResolvedValueOnce(workspaceUser);
-      jest
-        .spyOn(service, 'getAssignableSpaceInWorkspace')
-        .mockResolvedValueOnce(3000);
+      jest.spyOn(service, 'getOwnerAvailableSpace').mockResolvedValueOnce(3000);
 
       await expect(
         service.acceptWorkspaceInvite(invitedUser, 'anyUuid'),
@@ -1317,9 +1315,7 @@ describe('WorkspacesUsecases', () => {
       jest
         .spyOn(userRepository, 'findByUuid')
         .mockResolvedValueOnce(workspaceUser);
-      jest
-        .spyOn(service, 'getAssignableSpaceInWorkspace')
-        .mockResolvedValueOnce(3000);
+      jest.spyOn(service, 'getOwnerAvailableSpace').mockResolvedValueOnce(3000);
       jest.spyOn(service, 'adjustOwnerStorage').mockResolvedValueOnce();
 
       await service.acceptWorkspaceInvite(invitedUser, 'anyUuid');
@@ -1356,9 +1352,7 @@ describe('WorkspacesUsecases', () => {
       jest
         .spyOn(userRepository, 'findByUuid')
         .mockResolvedValueOnce(workspaceUser);
-      jest
-        .spyOn(service, 'getAssignableSpaceInWorkspace')
-        .mockResolvedValueOnce(3000);
+      jest.spyOn(service, 'getOwnerAvailableSpace').mockResolvedValueOnce(3000);
       jest.spyOn(service, 'adjustOwnerStorage').mockResolvedValueOnce();
 
       await service.acceptWorkspaceInvite(invitedUser, 'anyUuid');
@@ -1389,9 +1383,7 @@ describe('WorkspacesUsecases', () => {
       jest
         .spyOn(userRepository, 'findByUuid')
         .mockResolvedValueOnce(workspaceUser);
-      jest
-        .spyOn(service, 'getAssignableSpaceInWorkspace')
-        .mockResolvedValueOnce(3000);
+      jest.spyOn(service, 'getOwnerAvailableSpace').mockResolvedValueOnce(3000);
       jest
         .spyOn(teamRepository, 'addUserToTeam')
         .mockRejectedValueOnce(
@@ -1432,9 +1424,7 @@ describe('WorkspacesUsecases', () => {
       jest
         .spyOn(userRepository, 'findByUuid')
         .mockResolvedValueOnce(workspaceUser);
-      jest
-        .spyOn(service, 'getAssignableSpaceInWorkspace')
-        .mockResolvedValueOnce(3000);
+      jest.spyOn(service, 'getOwnerAvailableSpace').mockResolvedValueOnce(3000);
       jest
         .spyOn(workspaceRepository, 'addUserToWorkspace')
         .mockRejectedValueOnce(
@@ -1474,9 +1464,7 @@ describe('WorkspacesUsecases', () => {
       jest
         .spyOn(userRepository, 'findByUuid')
         .mockResolvedValueOnce(workspaceUser);
-      jest
-        .spyOn(service, 'getAssignableSpaceInWorkspace')
-        .mockResolvedValueOnce(3000);
+      jest.spyOn(service, 'getOwnerAvailableSpace').mockResolvedValueOnce(3000);
       jest.spyOn(service, 'adjustOwnerStorage').mockResolvedValueOnce();
 
       await service.acceptWorkspaceInvite(invitedUser, 'anyUuid');

diff --git a/src/modules/workspaces/workspaces.usecase.ts b/src/modules/workspaces/workspaces.usecase.ts
@@ -1525,7 +1525,7 @@ export class WorkspacesUsecases {
       );
     }
 
-    const spaceLeft = await this.getAssignableSpaceInWorkspace(workspace);
+    const spaceLeft = await this.getOwnerAvailableSpace(workspace);
 
     if (invite.spaceLimit > spaceLeft) {
       throw new BadRequestException(