Merge pull request #170 from import-ai/refactor/search

fix(search): fix non-existing resources

Author: ycdzj

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

@@ -440,7 +440,7 @@ export class NamespaceResourcesService {
     resourceId: string,
     userId: string,
   ): Promise<ResourceMetaDto[]> {
-    const parents = await this.resourcesService.getParentResources(
+    const parents = await this.resourcesService.getParentResourcesOrFail(
       namespaceId,
       resourceId,
     );
@@ -491,7 +491,7 @@ export class NamespaceResourcesService {
     resourceId: string,
     userId: string,
   ): Promise<ListChildrenRespDto[]> {
-    const parents = await this.resourcesService.getParentResources(
+    const parents = await this.resourcesService.getParentResourcesOrFail(
       namespaceId,
       resourceId,
     );
@@ -538,7 +538,7 @@ export class NamespaceResourcesService {
     if (resource.namespaceId !== namespaceId) {
       throw new NotFoundException('Not found');
     }
-    const parentResources = await this.resourcesService.getParentResources(
+    const parentResources = await this.resourcesService.getParentResourcesOrFail(
       namespaceId,
       resource.parentId,
     );

src/permissions/permissions.service.ts

@@ -233,7 +233,7 @@ export class PermissionsService {
     userId: string,
   ): Promise<ListRespDto> {
     // Get resources
-    const resources = await this.resourcesService.getParentResources(
+    const resources = await this.resourcesService.getParentResourcesOrFail(
       namespaceId,
       resourceId,
     );
@@ -320,7 +320,7 @@ export class PermissionsService {
       return false;
     }
     if (!resources) {
-      resources = await this.resourcesService.getParentResources(
+      resources = await this.resourcesService.getParentResourcesOrFail(
         namespaceId,
         resourceId,
       );

src/resources/resources.service.ts

@@ -16,15 +16,26 @@ export class ResourcesService {
     private readonly wizardTaskService: WizardTaskService,
   ) {}
 
-  async getParentResources(
+  async getParentResourcesOrFail(
     namespaceId: string,
     resourceId: string | null,
   ): Promise<ResourceMetaDto[]> {
     if (!resourceId) {
       return [];
     }
+    const resources = await this.getParentResources(namespaceId, resourceId);
+    if (resources.length === 0) {
+      throw new NotFoundException('Resource not found');
+    }
+    return resources;
+  }
+
+  async getParentResources(
+    namespaceId: string,
+    resourceId: string | null,
+  ): Promise<ResourceMetaDto[]> {
     const resources: Resource[] = [];
-    while (true) {
+    while (resourceId) {
       const resource = await this.resourceRepository.findOne({
         select: [
           'id',
@@ -38,12 +49,9 @@ export class ResourcesService {
         where: { namespaceId, id: resourceId },
       });
       if (!resource) {
-        throw new NotFoundException('Resource not found');
+        return [];
       }
       resources.push(resource);
-      if (!resource.parentId) {
-        break;
-      }
       resourceId = resource.parentId;
     }
     return resources.map((r) => ResourceMetaDto.fromEntity(r));

src/search/search.e2e-spec.ts

@@ -17,6 +17,7 @@ import { ConfigService } from '@nestjs/config';
 import { getRepositoryToken } from '@nestjs/typeorm';
 import { WizardTaskService } from 'omniboxd/tasks/wizard-task.service';
 import { Task } from 'omniboxd/tasks/tasks.entity';
+import { ResourcesService } from 'omniboxd/resources/resources.service';
 
 // Set environment variable to avoid the error in SearchService constructor
 process.env.OBB_WIZARD_BASE_URL = 'http://localhost:8000';
@@ -111,6 +112,12 @@ describe('SearchController (e2e)', () => {
             listAllResources: jest.fn().mockResolvedValue([]),
           },
         },
+        {
+          provide: ResourcesService,
+          useValue: {
+            getParentResources: jest.fn().mockResolvedValue([]),
+          },
+        },
         {
           provide: MessagesService,
           useValue: {

src/search/search.module.ts

@@ -11,6 +11,7 @@ import { ConversationsModule } from 'omniboxd/conversations/conversations.module
 import { TypeOrmModule } from '@nestjs/typeorm';
 import { Task } from 'omniboxd/tasks/tasks.entity';
 import { TasksModule } from 'omniboxd/tasks/tasks.module';
+import { ResourcesModule } from 'omniboxd/resources/resources.module';
 
 @Module({
   exports: [SearchService],
@@ -19,6 +20,7 @@ import { TasksModule } from 'omniboxd/tasks/tasks.module';
   imports: [
     PermissionsModule,
     NamespaceResourcesModule,
+    ResourcesModule,
     MessagesModule,
     ConversationsModule,
     TasksModule,

src/search/search.service.ts

@@ -18,6 +18,7 @@ import { InjectRepository } from '@nestjs/typeorm';
 import { WizardTaskService } from 'omniboxd/tasks/wizard-task.service';
 import { MessagesService } from 'omniboxd/messages/messages.service';
 import { ConversationsService } from 'omniboxd/conversations/conversations.service';
+import { ResourcesService } from 'omniboxd/resources/resources.service';
 
 const TASK_PRIORITY = 4;
 
@@ -28,6 +29,7 @@ export class SearchService {
   constructor(
     private readonly permissionsService: PermissionsService,
     private readonly namespaceResourcesService: NamespaceResourcesService,
+    private readonly resourcesService: ResourcesService,
     private readonly messagesService: MessagesService,
     private readonly conversationsService: ConversationsService,
     private readonly configService: ConfigService,
@@ -70,12 +72,20 @@ export class SearchService {
           continue;
         }
         seenResourceIds.add(chunk.resourceId);
+        const parentResources = await this.resourcesService.getParentResources(
+          namespaceId,
+          chunk.resourceId,
+        );
+        if (!parentResources) {
+          continue;
+        }
         if (userId) {
           const hasPermission = await this.permissionsService.userHasPermission(
             namespaceId,
             chunk.resourceId,
             userId,
             ResourcePermission.CAN_VIEW,
+            parentResources,
           );
           if (!hasPermission) {
             continue;

src/shared-resources/shared-resources.service.ts

@@ -61,7 +61,7 @@ export class SharedResourcesService {
       throw new NotFoundException('Resource not found');
     }
     if (resource.id !== share.resourceId) {
-      const parents = await this.resourcesService.getParentResources(
+      const parents = await this.resourcesService.getParentResourcesOrFail(
         share.namespaceId,
         resource.parentId,
       );