Merge pull request #386 from boostcampwm2023/BE-Refactor-#380

[BE/#380] 파일 용량 제한 로직 수정
boostcampwm2023 · Dec 7, 2023 · 9e57370 · 9e57370
2 parents c5c00d0 + f1c4c58
commit 9e57370
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 11 deletions.
diff --git a/BE/src/post/post.controller.ts b/BE/src/post/post.controller.ts
@@ -24,7 +24,7 @@ import { MultiPartBody } from '../utils/multiPartBody.decorator';
 import { PostListDto } from './dto/postList.dto';
 import { AuthGuard } from 'src/utils/auth.guard';
 import { UserHash } from 'src/utils/auth.decorator';
-import { FileSizeValidator } from '../utils/files.validator';
+import { FilesSizeValidator } from '../utils/files.validator';
 
 @Controller('posts')
 @ApiTags('posts')
@@ -41,7 +41,7 @@ export class PostController {
   @Post()
   @UseInterceptors(FilesInterceptor('image', 12))
   async postsCreate(
-    @UploadedFiles(new FileSizeValidator())
+    @UploadedFiles(new FilesSizeValidator())
     files: Array<Express.Multer.File>,
     @MultiPartBody(
       'post_info',
@@ -68,7 +68,7 @@ export class PostController {
   @UseInterceptors(FilesInterceptor('image', 12))
   async postModify(
     @Param('id') id: number,
-    @UploadedFiles(new FileSizeValidator())
+    @UploadedFiles(new FilesSizeValidator())
     files: Array<Express.Multer.File>,
     @MultiPartBody(
       'post_info',

diff --git a/BE/src/users/users.controller.ts b/BE/src/users/users.controller.ts
@@ -41,11 +41,7 @@ export class UsersController {
   @Post()
   @UseInterceptors(FileInterceptor('profileImage'))
   async usersCreate(
-    @UploadedFile(
-      new ParseFilePipe({
-        validators: [new MaxFileSizeValidator({ maxSize: 1024 * 1024 * 20 })],
-      }),
-    )
+    @UploadedFile(new FileSizeValidator())
     file: Express.Multer.File,
     @MultiPartBody(
       'profile',

diff --git a/BE/src/utils/files.validator.ts b/BE/src/utils/files.validator.ts
@@ -6,9 +6,9 @@ import {
 } from '@nestjs/common';
 
 @Injectable()
-export class FileSizeValidator implements PipeTransform {
+export class FilesSizeValidator implements PipeTransform {
   transform(value: any, metadata: ArgumentMetadata): any {
-    if (value === undefined || value.length === 0) {
+    if (value.length === 0) {
       return value;
     }
     const maxSize = 1024 * 1024 * 20;
@@ -20,6 +20,22 @@ export class FileSizeValidator implements PipeTransform {
         );
       }
     }
-    return undefined;
+    return value;
+  }
+}
+
+export class FileSizeValidator implements PipeTransform {
+  transform(value: any, metadata: ArgumentMetadata): any {
+    if (value === undefined) {
+      return value;
+    }
+    const maxSize = 1024 * 1024 * 20;
+    const file: Express.Multer.File = value;
+    if (file.size > maxSize) {
+      throw new BadRequestException(
+        `File ${file.originalname} exceeds the allowed size limit`,
+      );
+    }
+    return value;
   }
 }