chore(merge): Merge main

Author: LucienShui

src/api-key/api-key.e2e-spec.ts

@@ -197,7 +197,7 @@ describe('APIKeyController (e2e)', () => {
     await client.post('/api/v1/api-keys').send(apiKeyData).expect(403);
   });
 
-  it('should return 403 when user tries to create API key with resource they do not have write access to', async () => {
+  it('should return 404 when user tries to create API key with resource they do not have write access to', async () => {
     const apiKeyData = {
       user_id: client.user.id,
       namespace_id: client.namespace.id,
@@ -212,6 +212,6 @@ describe('APIKeyController (e2e)', () => {
       },
     };
 
-    await client.post('/api/v1/api-keys').send(apiKeyData).expect(403);
+    await client.post('/api/v1/api-keys').send(apiKeyData).expect(404);
   });
 });

src/app/app.module.ts

@@ -17,7 +17,7 @@ import { TasksModule } from 'omniboxd/tasks/tasks.module';
 import { WizardModule } from 'omniboxd/wizard/wizard.module';
 import { APIKeyModule } from 'omniboxd/api-key/api-key.module';
 import { ConfigModule, ConfigService } from '@nestjs/config';
-import { ResourcesModule } from 'omniboxd/resources/resources.module';
+import { NamespaceResourcesModule } from 'omniboxd/namespace-resources/namespace-resources.module';
 import { SnakeCaseInterceptor } from 'omniboxd/interceptor/snake-case';
 import { NamespacesModule } from 'omniboxd/namespaces/namespaces.module';
 import { PermissionsModule } from 'omniboxd/permissions/permissions.module';
@@ -46,6 +46,7 @@ import { UpdateAttachmentUrls1755499552000 } from 'omniboxd/migrations/175549955
 import { ScanResourceAttachments1755504936756 } from 'omniboxd/migrations/1755504936756-scan-resource-attachments';
 import { OAuthModule } from 'omniboxd/oauth2/oauth.module';
 import { SharesAllResources1754471311959 } from 'omniboxd/migrations/1754471311959-shares-all-resources';
+import { ResourcesModule } from 'omniboxd/resources/resources.module';
 
 @Module({})
 export class AppModule implements NestModule {
@@ -75,6 +76,7 @@ export class AppModule implements NestModule {
         UserModule,
         APIKeyModule,
         NamespacesModule,
+        NamespaceResourcesModule,
         ResourcesModule,
         TasksModule,
         WizardModule,

src/attachments/attachments.e2e-spec.ts

@@ -1,6 +1,6 @@
 import { TestClient } from 'test/test-client';
 import { HttpStatus } from '@nestjs/common';
-import { uploadLanguageDatasets } from 'omniboxd/resources/file-resources.e2e-spec';
+import { uploadLanguageDatasets } from 'omniboxd/namespace-resources/file-resources.e2e-spec';
 
 describe('AttachmentsController (e2e)', () => {
   let client: TestClient;
@@ -114,7 +114,7 @@ describe('AttachmentsController (e2e)', () => {
           `/api/v1/namespaces/${client.namespace.id}/resources/${nonExistentResourceId}/attachments`,
         )
         .attach('file[]', Buffer.from(testContent), 'test.txt')
-        .expect(403);
+        .expect(HttpStatus.NOT_FOUND);
     });
   });
 

src/resources/dto/create-resource.dto.ts renamed to src/namespace-resources/dto/create-resource.dto.ts

@@ -6,7 +6,7 @@ import {
   IsOptional,
   IsNotEmpty,
 } from 'class-validator';
-import { ResourceType } from 'omniboxd/resources/resources.entity';
+import { ResourceType } from 'omniboxd/resources/entities/resource.entity';
 
 export class CreateResourceDto {
   @IsString()

src/resources/dto/open.create-resource.dto.ts renamed to src/namespace-resources/dto/open.create-resource.dto.ts

@@ -1,5 +1,8 @@
 import { ResourcePermission } from 'omniboxd/permissions/resource-permission.enum';
-import { Resource, ResourceType } from '../resources.entity';
+import {
+  Resource,
+  ResourceType,
+} from 'omniboxd/resources/entities/resource.entity';
 import { TagDto } from 'omniboxd/tag/dto/tag.dto';
 
 export enum SpaceType {

src/resources/dto/resource.dto.ts renamed to src/namespace-resources/dto/resource.dto.ts

@@ -6,7 +6,7 @@ import {
   IsOptional,
   IsNotEmpty,
 } from 'class-validator';
-import { ResourceType } from 'omniboxd/resources/resources.entity';
+import { ResourceType } from 'omniboxd/resources/entities/resource.entity';
 
 export class UpdateResourceDto {
   @IsString()

src/resources/dto/update-resource.dto.ts renamed to src/namespace-resources/dto/update-resource.dto.ts

@@ -1,6 +1,6 @@
 import { Request, Response } from 'express';
 import { FileInterceptor } from '@nestjs/platform-express';
-import { ResourcesService } from 'omniboxd/resources/resources.service';
+import { NamespaceResourcesService } from 'omniboxd/namespace-resources/namespace-resources.service';
 import {
   Body,
   Controller,
@@ -18,7 +18,9 @@ import { UserId } from 'omniboxd/decorators/user-id.decorator';
 
 @Controller('api/v1/namespaces/:namespaceId/resources/files')
 export class FileResourcesController {
-  constructor(private readonly resourcesService: ResourcesService) {}
+  constructor(
+    private readonly namespaceResourcesService: NamespaceResourcesService,
+  ) {}
 
   @Post()
   @UseInterceptors(FileInterceptor('file'))
@@ -28,14 +30,14 @@ export class FileResourcesController {
     @Body('namespace_id') namespaceId: string,
     @Body('parent_id') parentId: string,
   ) {
-    const newResource = await this.resourcesService.uploadFile(
+    const newResource = await this.namespaceResourcesService.uploadFile(
       userId,
       namespaceId,
       file,
       parentId,
       undefined,
     );
-    return await this.resourcesService.getPath({
+    return await this.namespaceResourcesService.getPath({
       namespaceId,
       userId,
       resourceId: newResource.id,
@@ -50,7 +52,7 @@ export class FileResourcesController {
     @Body('file_hash') fileHash: string,
     @Body('namespace_id') namespaceId: string,
   ) {
-    return this.resourcesService.uploadFileChunk(
+    return this.namespaceResourcesService.uploadFileChunk(
       namespaceId,
       chunk,
       chunkNumber,
@@ -64,7 +66,7 @@ export class FileResourcesController {
     @Body('chunks_number') chunksNumber: string,
     @Body('file_hash') fileHash: string,
   ) {
-    return this.resourcesService.cleanFileChunks(
+    return this.namespaceResourcesService.cleanFileChunks(
       namespaceId,
       chunksNumber,
       fileHash,
@@ -81,7 +83,7 @@ export class FileResourcesController {
     @Body('mimetype') mimetype: string,
     @Body('parent_id') parentId: string,
   ) {
-    const newResource = await this.resourcesService.mergeFileChunks(
+    const newResource = await this.namespaceResourcesService.mergeFileChunks(
       req.user!.id,
       namespaceId,
       totalChunks,
@@ -90,7 +92,7 @@ export class FileResourcesController {
       mimetype,
       parentId,
     );
-    return await this.resourcesService.getPath({
+    return await this.namespaceResourcesService.getPath({
       namespaceId,
       userId: req.user!.id,
       resourceId: newResource.id,
@@ -105,7 +107,7 @@ export class FileResourcesController {
     @Body('namespace_id') namespaceId: string,
     @Body('resource_id') resourceId: string,
   ) {
-    return this.resourcesService.uploadFile(
+    return this.namespaceResourcesService.uploadFile(
       userId,
       namespaceId,
       file,
@@ -119,6 +121,6 @@ export class FileResourcesController {
     @Param('resourceId') resourceId: string,
     @Res() res: Response,
   ) {
-    return await this.resourcesService.fileResponse(resourceId, res);
+    return await this.namespaceResourcesService.fileResponse(resourceId, res);
   }
 }

src/resources/file-resources.controller.ts renamed to src/namespace-resources/file-resources.controller.ts

@@ -1,15 +1,17 @@
 import { Response } from 'express';
 import { Controller, Get, Param, Res } from '@nestjs/common';
-import { ResourcesService } from 'omniboxd/resources/resources.service';
+import { NamespaceResourcesService } from 'omniboxd/namespace-resources/namespace-resources.service';
 import { Public } from 'omniboxd/auth/decorators/public.auth.decorator';
 
 @Controller('internal/api/v1/resources')
 export class InternalResourcesController {
-  constructor(private readonly resourcesService: ResourcesService) {}
+  constructor(
+    private readonly namespaceResourcesService: NamespaceResourcesService,
+  ) {}
 
   @Public()
   @Get('files/:id')
   async downloadFile(@Param('id') resourceId: string, @Res() res: Response) {
-    return await this.resourcesService.fileResponse(resourceId, res);
+    return await this.namespaceResourcesService.fileResponse(resourceId, res);
   }
 }