[Feat/#72] "S3 설정, 에러 코드 수정"

package.json

@@ -43,12 +43,13 @@
     "joi": "^18.0.2",
     "jsonwebtoken": "^9.0.3",
     "multer": "^2.0.2",
+    "multer-s3": "^3.0.1",
     "passport": "^0.7.0",
     "passport-jwt": "^4.0.1",
     "passport-kakao": "^1.0.1"
   },
   "devDependencies": {
-    "@aws-sdk/client-s3": "^3.971.0",
+    "@aws-sdk/client-s3": "^3.972.0",
     "@types/express": "^5.0.6",
     "@types/jsonwebtoken": "^9.0.10",
     "nodemon": "^3.1.11",

src/controllers/user.controller.js

@@ -1,4 +1,5 @@
 import userService from "../services/user.service.js";
+import { uploadToS3 } from "../middlewares/upload.middleware.js";
 
 class UserController {
   async getMyInfo(req, res, next) {
@@ -15,9 +16,23 @@ class UserController {
   // 프로필 수정
   async updateProfile(req, res, next) {
     try {
-      const userId = req.user.id; // 토큰에서 내 ID 추출
-      const body = req.body;      // 클라이언트가 보낸 수정할 데이터  
-      const result = await userService.updateProfile(userId, body);
+      const userId = req.user.id; 
+      const body = req.body;      
+
+      let imageUrl = null;
+
+      if (req.file) {
+        // S3에 업로드하고 URL 받기
+        imageUrl = await uploadToS3(req.file);
+      }
+
+      // 서비스에 전달할 데이터 객체 생성 (이미지가 있으면 덮어씌움)
+      const updateData = {
+        ...body,
+        ...(imageUrl && { profileImage: imageUrl }), // imageUrl이 있을 때만 추가
+      };
+
+      const result = await userService.updateProfile(userId, updateData);
 
       return res.success(result, "프로필 수정 성공");
     } catch (error) {

src/dtos/folder.dto.js

@@ -1,6 +1,8 @@
+import { BadRequestError } from "../errors/custom.error.js";
+
 export const bodyToFolderDto = (body) => {
-  if (!body.folderTitle) {
-    throw new Error("폴더 이름(folderTitle)은 필수입니다.");
+  if (!body.folderTitle || body.folderTitle.trim() === "") {
+    throw new BadRequestError("INVALID_INPUT_VALUE", "폴더 이름은 필수입니다.");
   }
 
   return {

src/dtos/user.dto.js

@@ -4,6 +4,8 @@ export const bodyToProfileDto = (body) => {
     phoneNum: body.phoneNum,
     email: body.email,
     profileImage: body.profileImage,
+    deadlineAlarm: body.deadlineAlarm, 
+    taskAlarm: body.taskAlarm,
   };
 };
 

src/middlewares/authenticate.middleware.js

@@ -6,19 +6,19 @@ export default function authenticate(req, res, next) {
     const authHeader = req.headers.authorization;
 
     if (!authHeader) {
-      throw new UnauthorizedError('인증 토큰이 없습니다.');
+      throw new UnauthorizedError("TOKEN_NOT_FOUND", "인증 토큰이 없습니다.");
     }
 
     if (!authHeader.startsWith('Bearer ')) {
-      throw new BadRequestError('인증 토큰이 형식에 맞지 않습니다.');
+      throw new BadRequestError("BAD_REQUEST", "인증 토큰이 형식에 맞지 않습니다.");
     }
 
     const token = authHeader.split(' ')[1];
     const secret = process.env.JWT_SECRET;
 
     const decoded = jwt.verify(token, secret);
     if (!decoded.id) {
-      throw new UnauthorizedError('유효하지 않은 토큰입니다.--');
+      throw new UnauthorizedError('유효하지 않은 토큰입니다.');
     }
 
     const userIdInt = parseInt(decoded.id, 10);
@@ -29,6 +29,10 @@ export default function authenticate(req, res, next) {
     req.user = { id: userIdInt };
     next();
   } catch (error) {
-    next(error);
+    if (error.name === 'JsonWebTokenError') { 
+      next(new UnauthorizedError("TOKEN_INVALID", "토큰이 유효하지 않습니다."));
+    } else {
+      next(error);
+    }
   }
 }

src/middlewares/upload.middleware.js

@@ -1,8 +1,19 @@
 import { PutObjectCommand } from '@aws-sdk/client-s3';
 import s3 from '../config/s3.config.js';
+import multer from "multer";
+import dotenv from 'dotenv';
 
-const uploadToS3 = async (file) => {
-  const key = `reference/${Date.now()}-${file.originalname}`;
+dotenv.config();
+
+const storage = multer.memoryStorage();
+
+const upload = multer({
+  storage: storage,
+  limits: { fileSize: 100 * 1024 * 1024 },
+});
+
+export const uploadToS3 = async (file) => {
+  const key = `profile/${Date.now()}-${file.originalname}`;
 
   const command = new PutObjectCommand({
     Bucket: process.env.S3_BUCKET_NAME,
@@ -16,4 +27,4 @@ const uploadToS3 = async (file) => {
   return `https://${process.env.S3_BUCKET_NAME}.s3.${process.env.AWS_REGION}.amazonaws.com/${key}`;
 };
 
-export default uploadToS3;
+export default upload;

src/repositories/folder.repository.js

@@ -1,5 +1,11 @@
 import { prisma } from "../db.config.js";
 
+export const getFolderById = async (folderId) => {
+  return await prisma.folder.findUnique({
+    where: { id: parseInt(folderId) },
+  });
+};
+
 // 1. 폴더 생성
 export const addFolder = async (userId, data) => {
   const newFolder = await prisma.folder.create({
@@ -22,17 +28,16 @@ export const updateFolder = async (userId, folderId, data) => {
   const updatedFolder = await prisma.folder.update({
     where: {
       id: parseInt(folderId),
-      userId: userId, // 내 폴더인지 확인
+      userId: userId,
     },
     data: {
-      folderTitle: data.folderTitle,
-      color: data.color,
+      ...data 
     },
     select: {
-        id: true,
-        folderTitle: true,
-        color: true,
-      }
+      id: true,
+      folderTitle: true,
+      color: true,
+    }
   });
   return updatedFolder;
 };

src/repositories/user.repository.js

@@ -18,6 +18,8 @@ export const updateProfile = async (userId, data) => {
       phoneNum: data.phoneNum,
       email: data.email,
       profileImage: data.profileImage,
+      deadlineAlarm: data.deadlineAlarm,
+      taskAlarm: data.taskAlarm,
     },
   });
 

src/routes/user.route.js

@@ -1,10 +1,12 @@
 import express from "express";
 import userController from "../controllers/user.controller.js";
 import authenticate from "../middlewares/authenticate.middleware.js";
+import upload from "../middlewares/upload.middleware.js";
+
 const userRouter = express.Router();
 
 userRouter.get('/me', authenticate, userController.getMyInfo);
 
-userRouter.patch('/profile', authenticate, userController.updateProfile);
+userRouter.patch('/profile', authenticate, upload.single('image'), userController.updateProfile);
 
 export default userRouter;

src/services/folder.service.js

@@ -1,5 +1,6 @@
 import * as folderRepository from "../repositories/folder.repository.js";
 import * as folderDto from "../dtos/folder.dto.js";
+import { NotFoundError, BadRequestError, ForbiddenError } from "../errors/custom.error.js";
 
 // 1. 폴더 생성
 export const createFolder = async (userId, body) => {
@@ -10,13 +11,54 @@ export const createFolder = async (userId, body) => {
 
 // 2. 폴더 수정
 export const updateFolder = async (userId, folderId, body) => {
-  const folderData = folderDto.bodyToFolderDto(body);
-  const updatedFolder = await folderRepository.updateFolder(userId, folderId, folderData);
-  return folderDto.responseFromFolder(updatedFolder);
+  try {
+  const folder = await folderRepository.getFolderById(folderId);
+
+  if (!folder) {
+    throw new NotFoundError("FOLDER_NOT_FOUND", "해당 폴더를 찾을 수 없습니다.");
+  }
+
+  if (folder.userId !== userId) {
+    throw new ForbiddenError("PERMISSION_DENIED", "수정 권한이 없습니다.");
+  }
+
+  const updateData = {};
+
+    if (body.folderTitle) {
+      updateData.folderTitle = body.folderTitle;
+    }
+
+    if (body.color) {
+      updateData.color = body.color;
+    }
+
+    if (Object.keys(updateData).length === 0) {
+      return folderDto.responseFromFolder(folder);
+    }
+
+    const updatedFolder = await folderRepository.updateFolder(userId, folderId, updateData);
+
+    return folderDto.responseFromFolder(updatedFolder);
+
+  } catch (error) {
+    console.error("Error in updateFolder:", error);
+    if (error.statusCode) throw error;
+    throw new InternalServerError();
+  }
 };
 
 // 3. 폴더 삭제
 export const deleteFolder = async (userId, folderId) => {
+  const folder = await folderRepository.getFolderById(folderId);
+
+  if (!folder) {
+    throw new NotFoundError("FOLDER_NOT_FOUND", "해당 폴더를 찾을 수 없습니다.");
+  }
+
+  if (folder.userId !== userId) {
+    throw new ForbiddenError("PERMISSION_DENIED", "삭제 권한이 없습니다.");
+  }
+
   await folderRepository.removeFolder(userId, folderId);
   return;
 };

src/services/user.service.js

@@ -1,39 +1,43 @@
 import { NotFoundError, BadRequestError } from "../errors/custom.error.js";
 import { responseFromUser, responseFromUpdatedUser, bodyToProfileDto } from "../dtos/user.dto.js";
-import { getUserData, updateProfile } from "../repositories/user.repository.js";
+import * as userRepository from "../repositories/user.repository.js";
 
 class UserService {
+  // 1. 내 정보 조회
   async getMyInfo(userId) {
-    const user = await getUserData(userId);
+    const user = await userRepository.getUserData(userId);
 
     if (!user) {
       throw new NotFoundError(
-        "USER_NOT_FOUND", 
-        "해당 사용자를 찾을 수 없습니다."
+        "USER_NOT_FOUND", "해당 사용자를 찾을 수 없습니다."
       );
     }
     return responseFromUser(user);
   }
 
-
 // 프로필 수정
   async updateProfile(userId, body) {
     if (body.nickname && body.nickname.length > 10) {
       throw new BadRequestError(
-        "INVALID_NICKNAME",               
-        "닉네임은 최대 10자까지만 가능합니다."
+        "INVALID_NICKNAME", "닉네임은 최대 10자까지만 가능합니다."
       );
     }    
 
-    const isUserExist = await getUserData(userId);
+    const isUserExist = await userRepository.getUserData(userId);
     if (!isUserExist) {
       throw new NotFoundError(
-        "USER_NOT_FOUND", 
-        "해당 사용자를 찾을 수 없습니다."
+        "USER_NOT_FOUND", "해당 사용자를 찾을 수 없습니다."
       );
     }
+
+    if (isUserExist.deletedAt) {
+    throw new NotFoundError(
+      "USER_NOT_FOUND", "탈퇴한 사용자입니다."
+    );
+  }
+
     const updateData = bodyToProfileDto(body);
-    const updatedUser = await updateProfile(userId, updateData);  
+    const updatedUser = await userRepository.updateProfile(userId, updateData);  
     return responseFromUpdatedUser(updatedUser);
   }
 }