🐛 fix: 파일 업로드 난수값 이름 생성하도록 변경

Author: Jo-Minseok

server/src/file/controller/file.controller.ts

@@ -44,7 +44,7 @@ export class FileController {
             message: 'file size limit',
           }),
           new FileTypeValidator({
-            fileType: /image\/(png|jpg|jpeg|webp)/,
+            fileType: /image\/(png|jpg|jpeg|webp|gif)/,
             skipMagicNumbersValidation: true,
           }),
         ],
@@ -54,9 +54,7 @@ export class FileController {
     @Query() query: UploadFileQueryRequestDto,
     @CurrentUser() user: Payload,
   ) {
-    file.path = (
-      await this.fileService.handleUpload(file, query.uploadType)
-    ).savedPath;
+    file.path = await this.fileService.handleUpload(file, query.uploadType);
 
     return ApiResponse.responseWithData(
       '파일 업로드에 성공했습니다.',

server/src/file/service/file.service.ts

@@ -7,6 +7,7 @@ import { WinstonLoggerService } from '../../common/logger/logger.service';
 import * as fs from 'fs/promises';
 import * as path from 'path';
 import { FileUploadType } from '../../common/disk/file-type';
+import * as uuid from 'uuid';
 
 @Injectable()
 export class FileService {
@@ -23,14 +24,13 @@ export class FileService {
 
     await this.ensureDirectory(targetDir);
 
-    const filePath = path.join(targetDir, file.originalname);
+    const ext = path.extname(file.originalname);
+    const fileName = `${uuid.v4()}${ext}`;
+    const filePath = path.join(targetDir, fileName);
+
     await fs.writeFile(filePath, file.buffer);
 
-    return {
-      success: true,
-      uploadType,
-      savedPath: filePath,
-    };
+    return filePath;
   }
 
   private async ensureDirectory(dir: string) {

server/test/file/e2e/upload.e2e-spec.ts

@@ -8,11 +8,11 @@ import {
 import { User } from '../../../src/user/entity/user.entity';
 import { UserRepository } from '../../../src/user/repository/user.repository';
 import { UserFixture } from '../../fixture/user.fixture';
-import * as path from 'path';
 import TestAgent from 'supertest/lib/agent';
 import { FileRepository } from '../../../src/file/repository/file.repository';
 import { createAccessToken } from '../../jest.setup';
 import * as fs from 'fs/promises';
+import * as uuid from 'uuid';
 
 const URL = '/api/file';
 
@@ -21,6 +21,7 @@ describe(`POST ${URL} E2E Test`, () => {
   let agent: TestAgent;
   let user: User;
   let fileRepository: FileRepository;
+  const fileRandomName = 'test-random-uuid-file-name';
 
   beforeAll(async () => {
     app = global.testApp;
@@ -35,6 +36,7 @@ describe(`POST ${URL} E2E Test`, () => {
   beforeEach(() => {
     jest.spyOn(fs, 'writeFile').mockResolvedValue(undefined);
     jest.spyOn(fs, 'mkdir').mockResolvedValue(undefined);
+    jest.spyOn(uuid, 'v4').mockReturnValue(fileRandomName as any);
   });
 
   it('[401] 인증되지 않은 사용자가 요청할 경우 파일 업로드를 실패한다.', async () => {
@@ -69,6 +71,15 @@ describe(`POST ${URL} E2E Test`, () => {
     const { data } = response.body;
     expect(response.status).toBe(HttpStatus.BAD_REQUEST);
     expect(data).toBeUndefined();
+
+    // DB, Redis when
+    const savedFile = await fileRepository.findOneBy({
+      originalName: 'test.png',
+      mimetype: 'image/png',
+    });
+
+    // DB, Redis then
+    expect(savedFile).toBeNull();
   });
 
   it('[400] 파일 타입이 일치하지 않을 경우 파일 업로드를 실패한다. ', async () => {
@@ -90,6 +101,15 @@ describe(`POST ${URL} E2E Test`, () => {
     const { data } = response.body;
     expect(response.status).toBe(HttpStatus.BAD_REQUEST);
     expect(data).toBeUndefined();
+
+    // DB, Redis when
+    const savedFile = await fileRepository.findOneBy({
+      originalName: 'test.png',
+      mimetype: 'image/png',
+    });
+
+    // DB, Redis then
+    expect(savedFile).toBeNull();
   });
 
   it('[400] 파일 크기가 일치하지 않을 경우 파일 업로드를 실패한다. ', async () => {
@@ -111,6 +131,15 @@ describe(`POST ${URL} E2E Test`, () => {
     const { data } = response.body;
     expect(response.status).toBe(HttpStatus.BAD_REQUEST);
     expect(data).toBeUndefined();
+
+    // DB, Redis when
+    const savedFile = await fileRepository.findOneBy({
+      originalName: 'test.png',
+      mimetype: 'image/png',
+    });
+
+    // DB, Redis then
+    expect(savedFile).toBeNull();
   });
 
   it('[201] 파일을 포함할 경우 파일 업로드를 성공한다.', async () => {
@@ -135,8 +164,8 @@ describe(`POST ${URL} E2E Test`, () => {
       id: expect.any(Number),
       originalName: 'test.png',
       mimetype: 'image/png',
-      size: expect.any(Number),
-      url: expect.any(String),
+      size: 1024,
+      url: expect.stringContaining(fileRandomName),
       userId: user.id,
       createdAt: expect.any(String),
     });