Merge pull request #147 from import-ai/refactor/attachments

refactor(attachments): update API

Author: LucienShui

src/app/app.module.ts

@@ -37,6 +37,7 @@ import { AttachmentsModule } from 'omniboxd/attachments/attachments.module';
 import { Shares1753866547335 } from 'omniboxd/migrations/1753866547335-shares';
 import { SharesModule } from 'omniboxd/shares/shares.module';
 import { ApiKeys1754550165406 } from 'omniboxd/migrations/1754550165406-api-keys';
+import { ResourceAttachments1755059371000 } from 'omniboxd/migrations/1755059371000-resource-attachments';
 
 @Module({})
 export class AppModule implements NestModule {
@@ -104,6 +105,7 @@ export class AppModule implements NestModule {
               NullUserEmail1752814358259,
               Shares1753866547335,
               ApiKeys1754550165406,
+              ResourceAttachments1755059371000,
               ...extraMigrations,
             ],
             migrationsRun: true,

src/attachments/attachments.controller.ts

@@ -5,7 +5,6 @@ import {
   HttpStatus,
   Param,
   Post,
-  Query,
   Req,
   Res,
   UploadedFiles,
@@ -15,20 +14,21 @@ import { FilesInterceptor } from '@nestjs/platform-express';
 import { AttachmentsService } from 'omniboxd/attachments/attachments.service';
 import { Request, Response } from 'express';
 import { UserId } from 'omniboxd/decorators/user-id.decorator';
-import { CookieAuth } from 'omniboxd/auth';
+import { UploadAttachmentsResponseDto } from './dto/upload-attachments-response.dto';
+import { CookieAuth } from 'omniboxd/auth/decorators';
 
-@Controller('api/v1/attachments')
+@Controller('api/v1/namespaces/:namespaceId/resources/:resourceId/attachments')
 export class AttachmentsController {
   constructor(private readonly attachmentsService: AttachmentsService) {}
 
   @Post()
   @UseInterceptors(FilesInterceptor('file[]'))
   async uploadAttachments(
     @UserId() userId: string,
+    @Param('namespaceId') namespaceId: string,
+    @Param('resourceId') resourceId: string,
     @UploadedFiles() files: Express.Multer.File[],
-    @Query('namespaceId') namespaceId: string,
-    @Query('resourceId') resourceId: string,
-  ) {
+  ): Promise<UploadAttachmentsResponseDto> {
     return await this.attachmentsService.uploadAttachments(
       namespaceId,
       resourceId,
@@ -38,13 +38,19 @@ export class AttachmentsController {
   }
 
   @Get(':attachmentId')
+  @CookieAuth({ onAuthFail: 'continue' })
   async downloadAttachment(
-    @UserId() userId: string,
-    @Res() res: Response,
-    @Query('namespaceId') namespaceId: string,
-    @Query('resourceId') resourceId: string,
+    @Req() req: Request,
+    @UserId({ optional: true }) userId: string | undefined,
+    @Param('namespaceId') namespaceId: string,
+    @Param('resourceId') resourceId: string,
     @Param('attachmentId') attachmentId: string,
+    @Res() res: Response,
   ) {
+    if (!userId) {
+      this.setRedirect(req, res);
+      return;
+    }
     return await this.attachmentsService.downloadAttachment(
       namespaceId,
       resourceId,
@@ -61,47 +67,11 @@ export class AttachmentsController {
       .redirect(`/user/login?redirect=${encodeURIComponent(req.url)}`);
   }
 
-  @CookieAuth({ onAuthFail: 'continue' })
-  @Get('images/:attachmentId')
-  async displayImage(
-    @UserId({ optional: true }) userId: string | undefined,
-    @Req() req: Request,
-    @Res() res: Response,
-    @Param('attachmentId') attachmentId: string,
-  ) {
-    if (userId) {
-      return await this.attachmentsService.displayMedia(
-        attachmentId,
-        userId,
-        res,
-      );
-    }
-    this.setRedirect(req, res);
-  }
-
-  @CookieAuth({ onAuthFail: 'continue' })
-  @Get('media/:attachmentId')
-  async displayMedia(
-    @UserId({ optional: true }) userId: string | undefined,
-    @Req() req: Request,
-    @Res() res: Response,
-    @Param('attachmentId') attachmentId: string,
-  ) {
-    if (userId) {
-      return await this.attachmentsService.displayMedia(
-        attachmentId,
-        userId,
-        res,
-      );
-    }
-    this.setRedirect(req, res);
-  }
-
   @Delete(':attachmentId')
   async deleteAttachment(
     @UserId() userId: string,
-    @Query('namespaceId') namespaceId: string,
-    @Query('resourceId') resourceId: string,
+    @Param('namespaceId') namespaceId: string,
+    @Param('resourceId') resourceId: string,
     @Param('attachmentId') attachmentId: string,
   ) {
     return await this.attachmentsService.deleteAttachment(