Merge pull request #59 from prgrms-web-devcourse-final-project/feat/#58

Creamcheesepie · web-flow · commit fb1c75e3fe82 · 2025-12-15T10:31:35.000+09:00
[User] 마이페이지 조회, 수정, 탈퇴 구현
diff --git a/src/main/java/com/back/web7_9_codecrete_be/domain/auth/service/AuthService.java b/src/main/java/com/back/web7_9_codecrete_be/domain/auth/service/AuthService.java
@@ -7,16 +7,19 @@
 import com.back.web7_9_codecrete_be.domain.users.entity.User;
 import com.back.web7_9_codecrete_be.domain.users.repository.UserRepository;
 import com.back.web7_9_codecrete_be.global.error.code.AuthErrorCode;
+import com.back.web7_9_codecrete_be.global.error.code.UserErrorCode;
 import com.back.web7_9_codecrete_be.global.error.exception.BusinessException;
 import lombok.RequiredArgsConstructor;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.security.SecureRandom;
 import java.time.LocalDate;
 
 @Service
 @RequiredArgsConstructor
+@Transactional
 public class AuthService {
     private final UserRepository userRepository;
     private final PasswordEncoder passwordEncoder;
@@ -38,7 +41,7 @@ public void signUp(SignupRequest req) {
 
         // 닉네임 중복 체크
         if (userRepository.existsByNickname(req.getNickname())) {
-            throw new BusinessException(AuthErrorCode.NICKNAME_DUPLICATED);
+            throw new BusinessException(UserErrorCode.NICKNAME_DUPLICATED);
         }
 
         User user = User.builder()
@@ -59,6 +62,10 @@ public LoginResponse login(LoginRequest req) {
         User user = userRepository.findByEmail(req.getEmail())
                 .orElseThrow(() -> new BusinessException(AuthErrorCode.USER_NOT_FOUND));
 
+        if (user.getIsDeleted()) {
+            throw new BusinessException(UserErrorCode.USER_DELETED);
+        }
+
         if (!passwordEncoder.matches(req.getPassword(), user.getPassword())) {
             throw new BusinessException(AuthErrorCode.INVALID_PASSWORD);
         }
@@ -87,6 +94,10 @@ public void resetPassword(String email) {
         User user = userRepository.findByEmail(email)
                 .orElseThrow(() -> new BusinessException(AuthErrorCode.USER_NOT_FOUND));
 
+        if (user.getIsDeleted()) {
+            throw new BusinessException(UserErrorCode.USER_DELETED);
+        }
+
         String tempPassword = generateTempPassword();
 
         // 비밀번호 변경
diff --git a/src/main/java/com/back/web7_9_codecrete_be/domain/auth/service/TokenService.java b/src/main/java/com/back/web7_9_codecrete_be/domain/auth/service/TokenService.java
@@ -5,6 +5,7 @@
 import com.back.web7_9_codecrete_be.domain.users.entity.User;
 import com.back.web7_9_codecrete_be.domain.users.repository.UserRepository;
 import com.back.web7_9_codecrete_be.global.error.code.AuthErrorCode;
+import com.back.web7_9_codecrete_be.global.error.code.UserErrorCode;
 import com.back.web7_9_codecrete_be.global.error.exception.BusinessException;
 import com.back.web7_9_codecrete_be.global.rq.Rq;
 import com.back.web7_9_codecrete_be.global.security.JwtProperties;
@@ -63,8 +64,11 @@ public String reissueAccessToken() {
         User user = userRepository.findByEmail(email)
                 .orElseThrow(() -> new BusinessException(AuthErrorCode.USER_NOT_FOUND));
 
-        String savedRefresh =
-                refreshTokenRedisRepository.findByUserId(user.getId());
+        if (user.getIsDeleted()) {
+            throw new BusinessException(UserErrorCode.USER_DELETED);
+        }
+
+        String savedRefresh = refreshTokenRedisRepository.findByUserId(user.getId());
 
         if (savedRefresh == null || !savedRefresh.equals(refresh)) {
             throw new BusinessException(AuthErrorCode.INVALID_TOKEN);
diff --git a/src/main/java/com/back/web7_9_codecrete_be/domain/users/controller/UserController.java b/src/main/java/com/back/web7_9_codecrete_be/domain/users/controller/UserController.java
@@ -1,13 +1,76 @@
 package com.back.web7_9_codecrete_be.domain.users.controller;
 
+import com.back.web7_9_codecrete_be.domain.auth.service.TokenService;
+import com.back.web7_9_codecrete_be.domain.users.dto.request.UserUpdateNicknameRequest;
+import com.back.web7_9_codecrete_be.domain.users.dto.request.UserUpdatePasswordRequest;
+import com.back.web7_9_codecrete_be.domain.users.dto.response.UserResponse;
+import com.back.web7_9_codecrete_be.domain.users.entity.User;
 import com.back.web7_9_codecrete_be.domain.users.service.UserService;
+import com.back.web7_9_codecrete_be.global.rq.Rq;
+import com.back.web7_9_codecrete_be.global.rsData.RsData;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 @RestController
 @RequestMapping("/api/v1/users")
 @RequiredArgsConstructor
+@Tag(name = "User", description = "사용자 정보 API")
 public class UserController {
     private final UserService userService;
+    private final TokenService tokenService;
+    private final Rq rq;
+
+    @Operation(summary = "내 정보 조회", description = "현재 로그인된 사용자의 정보를 조회합니다.")
+    @GetMapping("/me")
+    public RsData<?> getMyInfo() {
+        User user = rq.getUser();
+        UserResponse response = userService.getMyInfo(user);
+        return RsData.success("사용자 정보 조회 성공", response);
+    }
+
+    @Operation(summary = "내 닉네임 수정", description = "닉네임을 수정합니다.")
+    @PatchMapping("/nickname")
+    public RsData<?> updateNickname(
+            @Valid @RequestBody UserUpdateNicknameRequest req
+    ) {
+        User user = rq.getUser();
+        UserResponse response = userService.updateNickname(user, req);
+        return RsData.success("사용자 닉네임 변경 완료", response);
+    }
+
+    @Operation(summary = "내 프로필 이미지 수정", description = "프로필 이미지를 수정합니다.")
+    @PatchMapping("/profile-image")
+    public RsData<?> updateProfileImage(
+            @RequestPart MultipartFile file
+    ) {
+        User user = rq.getUser();
+        String imageUrl = userService.updateProfileImage(user, file);
+        return RsData.success("프로필 이미지가 변경되었습니다.", imageUrl);
+    }
+
+    @Operation(summary = "비밀번호 변경", description = "현재 비밀번호를 확인한 후 새로운 비밀번호로 변경합니다.")
+    @PatchMapping("/password")
+    public RsData<?> updatePassword(
+            @Valid @RequestBody UserUpdatePasswordRequest req
+    ) {
+        User user = rq.getUser();
+        userService.updatePassword(user, req);
+        return RsData.success("비밀번호가 변경되었습니다.");
+    }
+
+
+    @Operation(summary = "회원 탈퇴", description = "현재 로그인된 사용자를 탈퇴 처리합니다.")
+    @DeleteMapping("/me")
+    public RsData<?> deleteMyAccount() {
+        User user = rq.getUser();
+
+        userService.deleteMyAccount(user);
+        tokenService.removeTokens(user); // refresh/access 토큰 정리
+
+        return RsData.success("회원 탈퇴가 완료되었습니다.");
+    }
 }
diff --git a/src/main/java/com/back/web7_9_codecrete_be/domain/users/dto/request/UserUpdateNicknameRequest.java b/src/main/java/com/back/web7_9_codecrete_be/domain/users/dto/request/UserUpdateNicknameRequest.java
@@ -0,0 +1,13 @@
+package com.back.web7_9_codecrete_be.domain.users.dto.request;
+
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Size;
+import lombok.Getter;
+
+@Getter
+public class UserUpdateNicknameRequest {
+
+    @NotBlank(message = "닉네임은 필수입니다.")
+    @Size(min = 2, max = 20, message = "닉네임은 2자 이상 20자 이하입니다.")
+    private String nickname;
+}
diff --git a/src/main/java/com/back/web7_9_codecrete_be/domain/users/dto/request/UserUpdatePasswordRequest.java b/src/main/java/com/back/web7_9_codecrete_be/domain/users/dto/request/UserUpdatePasswordRequest.java
@@ -0,0 +1,22 @@
+package com.back.web7_9_codecrete_be.domain.users.dto.request;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Pattern;
+import lombok.Getter;
+
+@Getter
+public class UserUpdatePasswordRequest {
+
+    @NotBlank(message = "현재 비밀번호는 필수입니다.")
+    @Schema(description = "현재 비밀번호", example = "oldPassword1!")
+    private String currentPassword;
+
+    @NotBlank(message = "비밀번호는 필수입니다.")
+    @Pattern(
+            regexp = "^(?=.*[A-Za-z])(?=.*\\d)(?=.*[!@#$%^&*]).{8,}$",
+            message = "비밀번호는 영문, 숫자, 특수문자를 포함한 8자 이상이어야 합니다."
+    )
+    @Schema(description = "비밀번호", example = "1234abcd!")
+    private String newPassword;
+}
diff --git a/src/main/java/com/back/web7_9_codecrete_be/domain/users/dto/request/UserUpdateRequest.java b/src/main/java/com/back/web7_9_codecrete_be/domain/users/dto/request/UserUpdateRequest.java
diff --git a/src/main/java/com/back/web7_9_codecrete_be/domain/users/entity/User.java b/src/main/java/com/back/web7_9_codecrete_be/domain/users/entity/User.java
@@ -82,5 +82,19 @@ public User(String email,
     public void changePassword(String encodedPassword) {
         this.password = encodedPassword;
     }
+
+    public void updateNickname(String nickname) {
+        this.nickname = nickname;
+    }
+
+    public void updateProfileImage(String profileImage) {
+        this.profileImage = profileImage;
+    }
+
+    public void softDelete() {
+        this.isDeleted = true;
+        this.status = UserStatus.DELETED;
+        this.deletedDate = LocalDateTime.now();
+    }
 }
 
diff --git a/src/main/java/com/back/web7_9_codecrete_be/domain/users/entity/UserStatus.java b/src/main/java/com/back/web7_9_codecrete_be/domain/users/entity/UserStatus.java
@@ -2,5 +2,6 @@
 
 public enum UserStatus {
     ACTIVE, // 활성 상태
+    DELETED, // 삭제 상태
     SUSPENDED // 정지 상태
 }
diff --git a/src/main/java/com/back/web7_9_codecrete_be/domain/users/service/UserService.java b/src/main/java/com/back/web7_9_codecrete_be/domain/users/service/UserService.java
@@ -1,10 +1,101 @@
 package com.back.web7_9_codecrete_be.domain.users.service;
 
 
+import com.back.web7_9_codecrete_be.domain.auth.service.TokenService;
+import com.back.web7_9_codecrete_be.domain.users.dto.request.UserUpdateNicknameRequest;
+import com.back.web7_9_codecrete_be.domain.users.dto.request.UserUpdatePasswordRequest;
+import com.back.web7_9_codecrete_be.domain.users.dto.response.UserResponse;
+import com.back.web7_9_codecrete_be.domain.users.entity.User;
+import com.back.web7_9_codecrete_be.domain.users.repository.UserRepository;
+import com.back.web7_9_codecrete_be.global.error.code.UserErrorCode;
+import com.back.web7_9_codecrete_be.global.error.exception.BusinessException;
+import com.back.web7_9_codecrete_be.global.storage.FileStorageService;
 import lombok.RequiredArgsConstructor;
+import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.multipart.MultipartFile;
 
 @Service
 @RequiredArgsConstructor
+@Transactional
 public class UserService {
+    private final UserRepository userRepository;
+    private final FileStorageService fileStorageService;
+    private final PasswordEncoder passwordEncoder;
+    private final TokenService tokenService;
+
+    // 내 정보 조회
+    @Transactional(readOnly = true)
+    public UserResponse getMyInfo(User user) {
+        validateActiveUser(user);
+        return UserResponse.from(user);
+    }
+
+    // 닉네임 수정
+    public UserResponse updateNickname(User user, UserUpdateNicknameRequest req) {
+        validateActiveUser(user);
+        String newNickname = req.getNickname();
+
+        // 닉네임이 변경되는 경우에만 중복 검사
+        if (!newNickname.equals(user.getNickname())) {
+            if (userRepository.existsByNickname(newNickname)) {
+                throw new BusinessException(UserErrorCode.NICKNAME_DUPLICATED);
+            }
+        }
+
+        user.updateNickname(req.getNickname());
+        userRepository.save(user);
+        return UserResponse.from(user);
+    }
+
+    // 회원 탈퇴
+    public void deleteMyAccount(User user) {
+        validateActiveUser(user);
+        user.softDelete();
+        userRepository.save(user);
+
+        // 로그아웃 처리
+        tokenService.removeTokens(user);
+    }
+
+    // 프로필 이미지 수정
+    public String updateProfileImage(User user, MultipartFile file) {
+        validateActiveUser(user);
+
+        // 파일 유효성 검사
+        if (file == null || file.isEmpty()) {
+            throw new BusinessException(UserErrorCode.INVALID_PROFILE_IMAGE);
+        }
+
+        String imageUrl = fileStorageService.upload(file);
+
+        user.updateProfileImage(imageUrl);
+        userRepository.save(user);
+
+        return imageUrl;
+    }
+
+    // 활성 사용자 검증
+    private void validateActiveUser(User user) {
+        if (user.getIsDeleted()) {
+            throw new BusinessException(UserErrorCode.USER_DELETED);
+        }
+    }
+
+    // 비밀번호 변경
+    public void updatePassword(User user, UserUpdatePasswordRequest req) {
+        validateActiveUser(user);
+
+        // 현재 비밀번호 검증
+        if (!passwordEncoder.matches(req.getCurrentPassword(), user.getPassword())) {
+            throw new BusinessException(UserErrorCode.INVALID_PASSWORD);
+        }
+
+        user.changePassword(passwordEncoder.encode(req.getNewPassword()));
+        userRepository.save(user);
+
+        // 비밀번호 변경 시 로그아웃 처리
+        tokenService.removeTokens(user);
+    }
 }
diff --git a/src/main/java/com/back/web7_9_codecrete_be/global/error/code/AuthErrorCode.java b/src/main/java/com/back/web7_9_codecrete_be/global/error/code/AuthErrorCode.java
@@ -11,14 +11,12 @@ public enum AuthErrorCode implements ErrorCode {
 
     // 회원가입 관련
     EMAIL_DUPLICATED(HttpStatus.CONFLICT, "A-100", "이미 사용중인 이메일입니다."),
-    NICKNAME_DUPLICATED(HttpStatus.CONFLICT, "A-101", "이미 사용중인 닉네임입니다."),
-    EMAIL_NOT_VERIFIED(HttpStatus.BAD_REQUEST, "A-102","이메일 인증이 완료되지 않았습니다."),
+    EMAIL_NOT_VERIFIED(HttpStatus.BAD_REQUEST, "A-101","이메일 인증이 완료되지 않았습니다."),
 
     // 로그인 관련
     USER_NOT_FOUND(HttpStatus.NOT_FOUND, "A-110", "존재하지 않는 이메일입니다."),
     INVALID_PASSWORD(HttpStatus.UNAUTHORIZED, "A-111", "비밀번호가 일치하지 않습니다."),
     USER_INACTIVE(HttpStatus.FORBIDDEN, "A-112", "현재 비활성화된 계정입니다."),
-    USER_DELETED(HttpStatus.FORBIDDEN, "A-113", "탈퇴한 사용자는 로그인할 수 없습니다."),
 
     // 권한 관련
     UNAUTHORIZED_USER(HttpStatus.UNAUTHORIZED, "A-120", "로그인이 필요합니다."),
diff --git a/src/main/java/com/back/web7_9_codecrete_be/global/error/code/UserErrorCode.java b/src/main/java/com/back/web7_9_codecrete_be/global/error/code/UserErrorCode.java
@@ -0,0 +1,26 @@
+package com.back.web7_9_codecrete_be.global.error.code;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import org.springframework.http.HttpStatus;
+
+@Getter
+@AllArgsConstructor
+public enum UserErrorCode implements ErrorCode {
+
+    // 1xx - User 상태 / 중복
+    NICKNAME_DUPLICATED(HttpStatus.CONFLICT, "U-101", "이미 사용 중인 닉네임입니다."),
+    USER_DELETED(HttpStatus.FORBIDDEN, "U-102", "탈퇴한 사용자입니다."),
+    USER_NOT_FOUND(HttpStatus.NOT_FOUND, "U-103", "사용자를 찾을 수 없습니다."),
+
+    // 3xx - 입력값 / 파일
+    INVALID_PROFILE_IMAGE(HttpStatus.BAD_REQUEST, "U-301", "유효하지 않은 프로필 이미지입니다."),
+
+    // 2xx - 인증 / 비밀번호
+    INVALID_PASSWORD(HttpStatus.BAD_REQUEST, "U-201", "현재 비밀번호가 일치하지 않습니다.");
+
+    private final HttpStatus status;
+    private final String code;
+    private final String message;
+}
+
diff --git a/src/main/java/com/back/web7_9_codecrete_be/global/storage/FileStorageService.java b/src/main/java/com/back/web7_9_codecrete_be/global/storage/FileStorageService.java
@@ -0,0 +1,8 @@
+package com.back.web7_9_codecrete_be.global.storage;
+
+import org.springframework.web.multipart.MultipartFile;
+
+public interface FileStorageService {
+    //임시 구현
+    String upload(MultipartFile file);
+}
diff --git a/src/main/java/com/back/web7_9_codecrete_be/global/storage/S3FileStorageService.java b/src/main/java/com/back/web7_9_codecrete_be/global/storage/S3FileStorageService.java
@@ -0,0 +1,18 @@
+package com.back.web7_9_codecrete_be.global.storage;
+
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.UUID;
+
+@Service
+public class S3FileStorageService implements FileStorageService {
+    @Override
+    public String upload(MultipartFile file) {
+
+        // 임시 URL 생성
+        String fakeFileName = UUID.randomUUID() + "_" + file.getOriginalFilename();
+
+        return "https://dummy-cdn.codecrete.com/profile/" + fakeFileName;
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -2,5 +2,6 @@`
`2`	`2`
`3`	`3`	`public enum UserStatus {`
`4`	`4`	`ACTIVE, // 활성 상태`
	`5`	`+ DELETED, // 삭제 상태`
`5`	`6`	`SUSPENDED // 정지 상태`
`6`	`7`	`}`