Skip to content

[SWEP-96] 메모장 사진 업로드 및 저장 로직 개선 (#200) #201

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jjiinaaa merged 3 commits into from
Feb 13, 2025
Merged

[SWEP-96] 메모장 사진 업로드 및 저장 로직 개선 (#200) #201

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5c11a52
[SWEP-96] 메모장 사진 업로드 및 저장 로직 개선 (#200)
asjasj3964 Feb 12, 2025
b373303
fix: 폴더 생성 및 사진 저장 API 주석처리 + multer 미들웨어 실행 전에 폴더 ID 검사 (#202)
asjasj3964 Feb 13, 2025
1a34df1
fix: tsoa.json 폴더 생성 및 사진 저장 spec requestBody 삭제 (#203)
asjasj3964 Feb 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 30 additions & 25 deletions src/s3/image.uploader.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import {Request} from 'express';
import {v4 as uuidv4} from 'uuid'; // 고유한 식별자(UUID) 생성
import path from 'path'; // 확장자 처리
import process from 'process';

import {s3} from './awsS3Client.js';
import {
createMemoFolder,
Expand Down Expand Up @@ -33,7 +32,7 @@ export const imageUploader = multer({
s3: s3, // AWS S3 객체 설정
bucket: process.env.AWS_S3_BUCKET_NAME, // 업로드할 S3 버킷 이름
contentType: multerS3.AUTO_CONTENT_TYPE, // 업로드 파일의 MIME 타입 자동 설정
key: async (req: Request, file, callback) => {
key: (req: Request, file, callback) => {
// S3 버킷에 저장될 경로와 이름 정의
const userId = req.user!.id; // 사용자 ID

Expand All @@ -47,32 +46,38 @@ export const imageUploader = multer({
// 디렉토리 path 설정 과정
let uploadDirectory = null;
if (req.body.folderName) {
const createdMemoFolderId = await createMemoFolder(
bodyToMemoFolder(req.body),
userId,
);
if (createdMemoFolderId === null) {
return callback(
new FolderDuplicateError({folderName: req.body.folderName}),
);
}
uploadDirectory = createdMemoFolderId;
req.uploadDirectory = uploadDirectory; // 디렉토리 정보 저장
Promise.all([createMemoFolder(bodyToMemoFolder(req.body), userId)])
.then(([createdMemoFolderId]) => {
if (createdMemoFolderId === null) {
return callback(
new FolderDuplicateError({folderName: req.body.folderName}),
);
}
uploadDirectory = createdMemoFolderId;
req.uploadDirectory = uploadDirectory; // 디렉토리 정보 저장
callback(
null,
`${userId}/${uploadDirectory}/${uuid}_${file.originalname}`,
); // S3 버킷에서 파일이 저장될 key
})
.catch(err => callback(err));
} else {
const folderId = req.params.folderId;
const checkFolder = await getMemoFolder(BigInt(folderId));
if (checkFolder === null || checkFolder.userId !== userId) {
return callback(
new FolderNotFoundError({folderId: BigInt(folderId)}),
);
}
uploadDirectory = folderId;
Promise.all([getMemoFolder(BigInt(folderId))])
.then(([checkFolder]) => {
if (checkFolder === null || checkFolder.userId !== userId) {
return callback(
new FolderNotFoundError({folderId: BigInt(folderId)}),
);
}
uploadDirectory = folderId;
callback(
null,
`${userId}/${uploadDirectory}/${uuid}_${file.originalname}`,
); // S3 버킷에서 파일이 저장될 key
})
.catch(err => callback(err));
}

callback(
null,
`${userId}/${uploadDirectory}/${uuid}_${file.originalname}`,
); // S3 버킷에서 파일이 저장될 key
},
acl: 'private', // 비공개 설정 (업로드 파일을 버킷 소유자만 접근 가능)
}),
Expand Down