Merge pull request #216 from import-ai/refactor/namespaces

fix(namespaces): fix member count

Author: ycdzj

src/i18n/en/namespace.json

@@ -5,6 +5,7 @@
     "workspaceNotFound": "Workspace not found",
     "rootResourceNotFound": "Root resource not found",
     "namespaceConflict": "Namespace conflict",
-    "userNotOwner": "Current user is not owner of this namespace"
+    "userNotOwner": "Current user is not owner of this namespace",
+    "noOwnerAfterwards": "The namespace requires at least one owner"
   }
 }

src/i18n/zh/namespace.json

@@ -5,6 +5,7 @@
     "workspaceNotFound": "工作空间未找到",
     "rootResourceNotFound": "根资源未找到",
     "namespaceConflict": "命名空间冲突",
-    "userNotOwner": "当前用户不是该命名空间的所有者"
+    "userNotOwner": "当前用户不是该命名空间的所有者",
+    "noOwnerAfterwards": "需要保留至少一个所有者"
   }
 }

src/namespaces/namespaces.controller.ts

@@ -35,6 +35,12 @@ export class NamespacesController {
     return await this.namespacesService.listMembers(namespaceId);
   }
 
+  @Get(':namespaceId/members/count')
+  async countMembers(@Param('namespaceId') namespaceId: string) {
+    const count = await this.namespacesService.countMembers(namespaceId);
+    return { count };
+  }
+
   @NamespaceOwner()
   @Get(':namespaceId/members/:userId')
   async getMemberByUserId(

src/namespaces/namespaces.e2e-spec.ts

@@ -204,19 +204,13 @@ describe('NamespacesController (e2e)', () => {
 
       const tempNamespaceId = tempNamespace.body.id;
 
-      // Test updating role (this will test the endpoint but may fail due to business logic)
-      // The actual implementation might prevent changing the last owner's role
+      // Should fail because user is the only owner in the namespace.
       await client
         .patch(
           `/api/v1/namespaces/${tempNamespaceId}/members/${client.user.id}`,
         )
         .send({ role: NamespaceRole.MEMBER })
-        .expect(HttpStatus.OK);
-
-      // Members are not allowed to delete the namespace.
-      await client
-        .delete(`/api/v1/namespaces/${tempNamespaceId}`)
-        .expect(HttpStatus.FORBIDDEN);
+        .expect(HttpStatus.UNPROCESSABLE_ENTITY);
     });
 
     it('should fail for non-existent member', async () => {
@@ -256,17 +250,16 @@ describe('NamespacesController (e2e)', () => {
 
       const tempNamespaceId = tempNamespace.body.id;
 
-      // For this test, we'll try to remove the owner (should work but may have business logic constraints)
+      // Should fail because user is the only owner in the namespace.
       await client
         .delete(
           `/api/v1/namespaces/${tempNamespaceId}/members/${client.user.id}`,
         )
-        .expect(HttpStatus.OK);
+        .expect(HttpStatus.UNPROCESSABLE_ENTITY);
 
-      // Verify member was removed by checking if they can still access the namespace
       await client
         .delete(`/api/v1/namespaces/${tempNamespaceId}`)
-        .expect(HttpStatus.FORBIDDEN);
+        .expect(HttpStatus.OK);
     });
   });
 

src/namespaces/namespaces.service.ts

@@ -39,6 +39,16 @@ export class NamespacesService {
     private readonly i18n: I18nService,
   ) {}
 
+  private async hasOwner(
+    namespaceId: string,
+    entityManager: EntityManager,
+  ): Promise<boolean> {
+    const count = await entityManager.count(NamespaceMember, {
+      where: { namespaceId, role: NamespaceRole.OWNER },
+    });
+    return count > 0;
+  }
+
   async getPrivateRootId(userId: string, namespaceId: string): Promise<string> {
     const member = await this.namespaceMemberRepository.findOne({
       where: {
@@ -307,10 +317,17 @@ export class NamespacesService {
     userId: string,
     role: NamespaceRole,
   ) {
-    await this.namespaceMemberRepository.update(
-      { namespaceId, userId },
-      { role },
-    );
+    await this.dataSource.transaction(async (manager) => {
+      await manager.update(NamespaceMember, { namespaceId, userId }, { role });
+      const hasOwner = await this.hasOwner(namespaceId, manager);
+      if (!hasOwner) {
+        throw new AppException(
+          this.i18n.t('namespace.errors.noOwnerAfterwards'),
+          'NO_OWNER_AFTERWARDS',
+          HttpStatus.UNPROCESSABLE_ENTITY,
+        );
+      }
+    });
   }
 
   async listNamespaces(userId: string): Promise<Namespace[]> {
@@ -329,6 +346,10 @@ export class NamespacesService {
     });
   }
 
+  async countMembers(namespaceId: string): Promise<number> {
+    return await this.namespaceMemberRepository.countBy({ namespaceId });
+  }
+
   async listMembers(namespaceId: string): Promise<NamespaceMemberDto[]> {
     const members = await this.namespaceMemberRepository.find({
       where: { namespaceId },
@@ -399,6 +420,14 @@ export class NamespacesService {
       });
       // Delete namespace member record
       await manager.softDelete(NamespaceMember, { id: member.id });
+      const hasOwner = await this.hasOwner(namespaceId, manager);
+      if (!hasOwner) {
+        throw new AppException(
+          this.i18n.t('namespace.errors.noOwnerAfterwards'),
+          'NO_OWNER_AFTERWARDS',
+          HttpStatus.UNPROCESSABLE_ENTITY,
+        );
+      }
     });
   }