Merge pull request #427 from internxt/fix/old-invites-block-new-invites

[_]: fix/stop counting invites as used seats/space in workspaces
internxt · Nov 8, 2024 · 78c67c8 · 78c67c8
2 parents 78c2dfb + 1fada0a
commit 78c67c8
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 18 deletions.
diff --git a/src/modules/workspaces/domains/workspaces.domain.ts b/src/modules/workspaces/domains/workspaces.domain.ts
@@ -62,8 +62,8 @@ export class Workspace implements WorkspaceAttributes {
     return this.setupCompleted === true;
   }
 
-  isWorkspaceFull(currentUsersCount: number, numberOfInvites: number = 0) {
-    return this.numberOfSeats <= currentUsersCount + numberOfInvites;
+  isWorkspaceFull(currentUsersCount: number /*, numberOfInvites: number = 0*/) {
+    return this.numberOfSeats <= currentUsersCount /* + numberOfInvites*/;
   }
 
   isDefaultTeam(team: WorkspaceTeam) {

diff --git a/src/modules/workspaces/workspaces.usecase.spec.ts b/src/modules/workspaces/workspaces.usecase.spec.ts
@@ -173,7 +173,7 @@ describe('WorkspacesUsecases', () => {
       jest.spyOn(service, 'isWorkspaceFull').mockResolvedValueOnce(false);
       jest.spyOn(userRepository, 'findByUuid').mockResolvedValueOnce(user);
       jest
-        .spyOn(service, 'getAssignableSpaceInWorkspace')
+        .spyOn(service, 'getOwnerAvailableSpace')
         .mockResolvedValueOnce(6000000);
 
       jest
@@ -216,7 +216,7 @@ describe('WorkspacesUsecases', () => {
       jest.spyOn(service, 'isWorkspaceFull').mockResolvedValueOnce(false);
       jest.spyOn(userRepository, 'findByUuid').mockResolvedValueOnce(user);
       jest
-        .spyOn(service, 'getAssignableSpaceInWorkspace')
+        .spyOn(service, 'getOwnerAvailableSpace')
         .mockResolvedValueOnce(6000000);
       jest
         .spyOn(service, 'getWorkspaceFixedStoragePerUser')
@@ -368,7 +368,7 @@ describe('WorkspacesUsecases', () => {
         .mockResolvedValueOnce(null);
       jest.spyOn(service, 'isWorkspaceFull').mockResolvedValueOnce(false);
       jest
-        .spyOn(service, 'getAssignableSpaceInWorkspace')
+        .spyOn(service, 'getOwnerAvailableSpace')
         .mockResolvedValueOnce(spaceLeft);
       jest.spyOn(workspaceRepository, 'findInvite').mockResolvedValueOnce(null);
       jest
@@ -2004,7 +2004,7 @@ describe('WorkspacesUsecases', () => {
 
       expect(workspaceUsage).toEqual({
         totalWorkspaceSpace: 1000000,
-        spaceAssigned: 900000,
+        spaceAssigned: 700000,
         spaceUsed: 400000,
       });
     });

diff --git a/src/modules/workspaces/workspaces.usecase.ts b/src/modules/workspaces/workspaces.usecase.ts
@@ -387,7 +387,7 @@ export class WorkspacesUsecases {
       );
     }
 
-    const spaceLeft = await this.getAssignableSpaceInWorkspace(workspace);
+    const spaceLeft = await this.getOwnerAvailableSpace(workspace);
 
     const spaceToAssign =
       createInviteDto.spaceLimit ??
@@ -1517,7 +1517,7 @@ export class WorkspacesUsecases {
       return userAlreadyInWorkspace.toJSON();
     }
 
-    const isWorkspaceFull = await this.isWorkspaceFull(workspace, true);
+    const isWorkspaceFull = await this.isWorkspaceFull(workspace);
 
     if (isWorkspaceFull) {
       throw new BadRequestException(
@@ -1758,35 +1758,35 @@ export class WorkspacesUsecases {
     const [
       spaceLimit,
       totalSpaceLimitAssigned,
-      totalSpaceAssignedInInvitations,
+      //totalSpaceAssignedInInvitations,
       spaceUsed,
     ] = await Promise.all([
       this.getWorkspaceNetworkLimit(workspace),
       this.workspaceRepository.getTotalSpaceLimitInWorkspaceUsers(workspace.id),
-      this.workspaceRepository.getSpaceLimitInInvitations(workspace.id),
+      /*this.workspaceRepository.getSpaceLimitInInvitations(workspace.id),*/
       this.workspaceRepository.getTotalDriveAndBackupUsageWorkspaceUsers(
         workspace.id,
       ),
     ]);
 
-    const spaceAssigned =
-      totalSpaceLimitAssigned + totalSpaceAssignedInInvitations;
+    const spaceAssigned = totalSpaceLimitAssigned;
 
     return { totalWorkspaceSpace: spaceLimit, spaceAssigned, spaceUsed };
   }
 
   async isWorkspaceFull(
     workspace: Workspace,
-    skipOneInvite = false,
+    //skipOneInvite = false,
   ): Promise<boolean> {
-    const [workspaceUsersCount, workspaceInvitationsCount] = await Promise.all([
-      this.workspaceRepository.getWorkspaceUsersCount(workspace.id),
-      this.workspaceRepository.getWorkspaceInvitationsCount(workspace.id),
-    ]);
+    const [workspaceUsersCount /*workspaceInvitationsCount*/] =
+      await Promise.all([
+        this.workspaceRepository.getWorkspaceUsersCount(workspace.id),
+        //this.workspaceRepository.getWorkspaceInvitationsCount(workspace.id),
+      ]);
 
     return workspace.isWorkspaceFull(
       workspaceUsersCount,
-      skipOneInvite ? workspaceInvitationsCount - 1 : workspaceInvitationsCount,
+      /*skipOneInvite ? workspaceInvitationsCount - 1 : workspaceInvitationsCount,*/
     );
   }