refactor(namespace-resources): update listChildren

Author: ycdzj

src/namespace-resources/dto/list-children-resp.dto.ts

@@ -0,0 +1,13 @@
+import { Expose } from 'class-transformer';
+import { ResourceMetaDto } from 'omniboxd/resources/dto/resource-meta.dto';
+
+export class ListChildrenRespDto extends ResourceMetaDto {
+  @Expose({ name: 'has_children' })
+  hasChildren: boolean;
+
+  constructor(resourceMeta: ResourceMetaDto, hasChildren: boolean) {
+    super();
+    Object.assign(this, resourceMeta);
+    this.hasChildren = hasChildren;
+  }
+}

src/namespace-resources/namespace-resources.controller.ts

@@ -18,6 +18,7 @@ import {
 import { UserId } from 'omniboxd/decorators/user-id.decorator';
 import { Request } from 'express';
 import { ResourceMetaDto } from 'omniboxd/resources/dto/resource-meta.dto';
+import { ListChildrenRespDto } from './dto/list-children-resp.dto';
 
 @Controller('api/v1/namespaces/:namespaceId/resources')
 export class NamespaceResourcesController {
@@ -91,8 +92,8 @@ export class NamespaceResourcesController {
     @UserId() userId: string,
     @Param('namespaceId') namespaceId: string,
     @Param('resourceId') resourceId: string,
-  ): Promise<ResourceMetaDto[]> {
-    return this.namespaceResourcesService.getAndFilterSubResources(
+  ): Promise<ListChildrenRespDto[]> {
+    return this.namespaceResourcesService.listChildren(
       namespaceId,
       resourceId,
       userId,

src/namespace-resources/namespace-resources.service.ts

@@ -40,6 +40,7 @@ import { TagDto } from 'omniboxd/tag/dto/tag.dto';
 import { ResourceAttachmentsService } from 'omniboxd/resource-attachments/resource-attachments.service';
 import { ResourcesService } from 'omniboxd/resources/resources.service';
 import { ResourceMetaDto } from 'omniboxd/resources/dto/resource-meta.dto';
+import { ListChildrenRespDto } from './dto/list-children-resp.dto';
 
 const TASK_PRIORITY = 5;
 
@@ -129,6 +130,28 @@ export class NamespaceResourcesService {
     return resources.map((resource) => resource.id);
   }
 
+  private async hasChildren(
+    namespaceId: string,
+    parents: ResourceMetaDto[],
+    userId: string,
+  ): Promise<boolean> {
+    const children = await this.resourcesService.getSubResources(
+      namespaceId,
+      parents[0].id,
+    );
+    for (const child of children) {
+      const permission = await this.permissionsService.getCurrentPermission(
+        namespaceId,
+        [child, ...parents],
+        userId,
+      );
+      if (permission !== ResourcePermission.NO_ACCESS) {
+        return true;
+      }
+    }
+    return false;
+  }
+
   async findByIds(namespaceId: string, ids: Array<string>) {
     if (ids.length <= 0) {
       return [];
@@ -385,7 +408,7 @@ export class NamespaceResourcesService {
     };
     // Self and child exclusions
     if (excludeResourceId) {
-      const resourceChildren = await this.getAndFilterSubResources(
+      const resourceChildren = await this.getSubResourcesByUser(
         namespaceId,
         excludeResourceId,
         userId,
@@ -410,7 +433,7 @@ export class NamespaceResourcesService {
     return filteredResources.map((res) => ResourceMetaDto.fromEntity(res));
   }
 
-  async getAndFilterSubResources(
+  async getSubResourcesByUser(
     namespaceId: string,
     resourceId: string,
     userId: string,
@@ -420,6 +443,25 @@ export class NamespaceResourcesService {
       namespaceId,
       resourceId,
     );
+    const children = await this.getSubResourcesByParents(
+      namespaceId,
+      parents,
+      userId,
+    );
+    if (includeParent) {
+      return [parents[0], ...children];
+    }
+    return children;
+  }
+
+  async getSubResourcesByParents(
+    namespaceId: string,
+    parents: ResourceMetaDto[],
+    userId: string,
+  ): Promise<ResourceMetaDto[]> {
+    if (!parents) {
+      return [];
+    }
     const permission = await this.permissionsService.getCurrentPermission(
       namespaceId,
       parents,
@@ -430,7 +472,7 @@ export class NamespaceResourcesService {
     }
     const children = await this.resourcesService.getSubResources(
       namespaceId,
-      resourceId,
+      parents[0].id,
     );
     const filteredChildren: ResourceMetaDto[] = [];
     for (const child of children) {
@@ -443,12 +485,35 @@ export class NamespaceResourcesService {
         filteredChildren.push(child);
       }
     }
-    if (includeParent) {
-      return [parents[0], ...filteredChildren];
-    }
     return filteredChildren;
   }
 
+  async listChildren(
+    namespaceId: string,
+    resourceId: string,
+    userId: string,
+  ): Promise<ListChildrenRespDto[]> {
+    const parents = await this.resourcesService.getParentResources(
+      namespaceId,
+      resourceId,
+    );
+    const children = await this.getSubResourcesByParents(
+      namespaceId,
+      parents,
+      userId,
+    );
+    const resps: ListChildrenRespDto[] = [];
+    for (const child of children) {
+      const hasChildren = await this.hasChildren(
+        namespaceId,
+        [child, ...parents],
+        userId,
+      );
+      resps.push(new ListChildrenRespDto(child, hasChildren));
+    }
+    return resps;
+  }
+
   async getSpaceType(
     namespaceId: string,
     rootResourceId: string,

src/namespaces/namespaces.service.ts

@@ -305,18 +305,17 @@ export class NamespacesService {
 
   async getRoot(namespaceId: string, userId: string) {
     const privateRoot = await this.getPrivateRoot(userId, namespaceId);
-    const privateChildren = await this.resourceService.getAndFilterSubResources(
+    const privateChildren = await this.resourceService.getSubResourcesByUser(
       namespaceId,
       privateRoot.id,
       userId,
     );
     const teamspaceRoot = await this.getTeamspaceRoot(namespaceId);
-    const teamspaceChildren =
-      await this.resourceService.getAndFilterSubResources(
-        namespaceId,
-        teamspaceRoot.id,
-        userId,
-      );
+    const teamspaceChildren = await this.resourceService.getSubResourcesByUser(
+      namespaceId,
+      teamspaceRoot.id,
+      userId,
+    );
     return {
       private: { ...privateRoot, parentId: '0', children: privateChildren },
       teamspace: {

src/wizard/stream.service.ts

@@ -250,7 +250,7 @@ export class StreamService {
             for (const resource of tool.resources) {
               if (resource.type === 'folder') {
                 const resources =
-                  await this.namespaceResourcesService.getAndFilterSubResources(
+                  await this.namespaceResourcesService.getSubResourcesByUser(
                     tool.namespace_id,
                     resource.id,
                     user.id,