Refactor/QFEED-67-Refactor-Structure-Exception

module-api/src/main/java/com/wsws/moduleapi/controller/user/AuthController.java → module-api/src/main/java/com/wsws/moduleapi/auth/controller/AuthController.java

@@ -1,9 +1,8 @@
-package com.wsws.moduleapi.controller.user;
+package com.wsws.moduleapi.auth.controller;
 
-import com.wsws.moduleapi.dto.auth.*;
-import com.wsws.moduleapplication.dto.user.AuthServiceResponse;
-import com.wsws.moduleapplication.dto.auth.LoginServiceResponse;
-import com.wsws.moduleapplication.service.user.AuthService;
+import com.wsws.moduleapi.auth.dto.*;
+import com.wsws.moduleapplication.auth.dto.LoginServiceResponse;
+import com.wsws.moduleapplication.auth.service.AuthService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;

module-api/src/main/java/com/wsws/moduleapi/dto/auth/AuthResponse.java → module-api/src/main/java/com/wsws/moduleapi/auth/dto/AuthResponse.java

@@ -1,4 +1,4 @@
-package com.wsws.moduleapi.dto.auth;
+package com.wsws.moduleapi.auth.dto;
 
 public record AuthResponse(String message) {
 }

module-api/src/main/java/com/wsws/moduleapi/dto/auth/EmailVerificationCheckRequest.java → module-api/src/main/java/com/wsws/moduleapi/auth/dto/EmailVerificationCheckRequest.java

@@ -1,6 +1,6 @@
-package com.wsws.moduleapi.dto.auth;
+package com.wsws.moduleapi.auth.dto;
 
-import com.wsws.moduleapplication.dto.auth.EmailVerificationCheckServiceDto;
+import com.wsws.moduleapplication.auth.dto.EmailVerificationCheckServiceDto;
 
 public record EmailVerificationCheckRequest(String email, String code) {
     public EmailVerificationCheckServiceDto toServiceDto() {

module-api/src/main/java/com/wsws/moduleapi/dto/auth/EmailVerificationRequest.java → module-api/src/main/java/com/wsws/moduleapi/auth/dto/EmailVerificationRequest.java

@@ -1,6 +1,6 @@
-package com.wsws.moduleapi.dto.auth;
+package com.wsws.moduleapi.auth.dto;
 
-import com.wsws.moduleapplication.dto.auth.EmailVerificationServiceDto;
+import com.wsws.moduleapplication.auth.dto.EmailVerificationServiceDto;
 
 public record EmailVerificationRequest(String email) {
     public EmailVerificationServiceDto toServiceDto() {

module-api/src/main/java/com/wsws/moduleapi/dto/auth/LoginRequest.java → module-api/src/main/java/com/wsws/moduleapi/auth/dto/LoginRequest.java

@@ -1,6 +1,6 @@
-package com.wsws.moduleapi.dto.auth;
+package com.wsws.moduleapi.auth.dto;
 
-import com.wsws.moduleapplication.dto.auth.LoginServiceRequest;
+import com.wsws.moduleapplication.auth.dto.LoginServiceRequest;
 
 public record LoginRequest(String email, String password) {
     public LoginServiceRequest toServiceDto() {

module-api/src/main/java/com/wsws/moduleapi/dto/auth/LoginResponse.java → module-api/src/main/java/com/wsws/moduleapi/auth/dto/LoginResponse.java

@@ -1,6 +1,6 @@
-package com.wsws.moduleapi.dto.auth;
+package com.wsws.moduleapi.auth.dto;
 
-import com.wsws.moduleapplication.dto.auth.LoginServiceResponse;
+import com.wsws.moduleapplication.auth.dto.LoginServiceResponse;
 
 public record LoginResponse(String accessToken, String refreshToken) {
     public LoginResponse(LoginServiceResponse response) {

module-api/src/main/java/com/wsws/moduleapi/dto/auth/LogoutRequest.java → module-api/src/main/java/com/wsws/moduleapi/auth/dto/LogoutRequest.java

@@ -1,4 +1,4 @@
-package com.wsws.moduleapi.dto.auth;
+package com.wsws.moduleapi.auth.dto;
 
 public record LogoutRequest(String refreshToken) {
 }

module-api/src/main/java/com/wsws/moduleapi/dto/auth/PasswordResetConfirmRequest.java → module-api/src/main/java/com/wsws/moduleapi/auth/dto/PasswordResetConfirmRequest.java

@@ -1,6 +1,6 @@
-package com.wsws.moduleapi.dto.auth;
+package com.wsws.moduleapi.auth.dto;
 
-import com.wsws.moduleapplication.dto.auth.PasswordResetConfirmServiceDto;
+import com.wsws.moduleapplication.auth.dto.PasswordResetConfirmServiceDto;
 
 public record PasswordResetConfirmRequest(String email, String code, String newPassword) {
     public PasswordResetConfirmServiceDto toServiceDto() {

module-api/src/main/java/com/wsws/moduleapi/dto/auth/PasswordResetRequest.java → module-api/src/main/java/com/wsws/moduleapi/auth/dto/PasswordResetRequest.java

@@ -1,6 +1,6 @@
-package com.wsws.moduleapi.dto.auth;
+package com.wsws.moduleapi.auth.dto;
 
-import com.wsws.moduleapplication.dto.auth.PasswordResetRequestServiceDto;
+import com.wsws.moduleapplication.auth.dto.PasswordResetRequestServiceDto;
 
 public record PasswordResetRequest(String email) {
     public PasswordResetRequestServiceDto toServiceDto() {

module-api/src/main/java/com/wsws/moduleapi/dto/auth/TokenReissueRequest.java → module-api/src/main/java/com/wsws/moduleapi/auth/dto/TokenReissueRequest.java

@@ -1,4 +1,4 @@
-package com.wsws.moduleapi.dto.auth;
+package com.wsws.moduleapi.auth.dto;
 
 public record TokenReissueRequest(String refreshToken) {
 }

module-api/src/main/java/com/wsws/moduleapi/controller/follow/FollowController.java → module-api/src/main/java/com/wsws/moduleapi/follow/controller/FollowController.java

@@ -1,7 +1,7 @@
-package com.wsws.moduleapi.controller.follow;
+package com.wsws.moduleapi.follow.controller;
 
-import com.wsws.moduleapplication.dto.follow.FollowServiceRequestDto;
-import com.wsws.moduleapplication.service.follow.FollowService;
+import com.wsws.moduleapplication.follow.dto.FollowServiceRequestDto;
+import com.wsws.moduleapplication.follow.service.FollowService;
 import com.wsws.moduleinfra.repo.follow.FollowReadRepository;
 import com.wsws.moduleinfra.repo.follow.dto.FollowResponseInfraDto;
 import lombok.RequiredArgsConstructor;

module-api/src/main/java/com/wsws/moduleapi/dto/follow/FollowRequestDto.java → module-api/src/main/java/com/wsws/moduleapi/follow/dto/FollowRequestDto.java

@@ -1,4 +1,4 @@
-package com.wsws.moduleapi.dto.follow;
+package com.wsws.moduleapi.follow.dto;
 
 import jakarta.validation.constraints.NotBlank;
 

module-api/src/main/java/com/wsws/moduleapi/dto/follow/FollowResponseDto.java → module-api/src/main/java/com/wsws/moduleapi/follow/dto/FollowResponseDto.java

@@ -1,4 +1,4 @@
-package com.wsws.moduleapi.dto.follow;
+package com.wsws.moduleapi.follow.dto;
 
 public record FollowResponseDto(
         String userId,

module-api/src/main/java/com/wsws/moduleapi/controller/user/UserController.java → module-api/src/main/java/com/wsws/moduleapi/user/controller/UserController.java

@@ -1,14 +1,15 @@
-package com.wsws.moduleapi.controller.user;
+package com.wsws.moduleapi.user.controller;
 
-import com.wsws.moduleapi.dto.auth.AuthResponse;
-import com.wsws.moduleapi.dto.user.*;
-import com.wsws.moduleapplication.dto.user.PasswordChangeServiceDto;
-import com.wsws.moduleapplication.dto.user.RegisterUserRequest;
-import com.wsws.moduleapplication.dto.user.UpdateProfileServiceDto;
-import com.wsws.moduleapplication.service.user.UserQueryService;
-import com.wsws.moduleapplication.service.user.UserService;
+import com.wsws.moduleapi.auth.dto.AuthResponse;
+import com.wsws.moduleapi.user.dto.UserProfileApiResponse;
+import com.wsws.moduleapplication.user.dto.PasswordChangeServiceDto;
+import com.wsws.moduleapplication.user.dto.RegisterUserRequest;
+import com.wsws.moduleapplication.user.dto.UpdateProfileServiceDto;
+import com.wsws.moduleapplication.user.service.UserQueryService;
+import com.wsws.moduleapplication.user.service.UserService;
 import com.wsws.modulesecurity.security.UserPrincipal;
 import lombok.RequiredArgsConstructor;
+import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.*;
@@ -23,9 +24,9 @@ public class UserController {
 
     // 회원가입
     @PostMapping("/signup")
-    public ResponseEntity<Void> signup(@RequestBody RegisterUserRequest request) {
+    public ResponseEntity<AuthResponse> signup(@RequestBody RegisterUserRequest request) {
         userService.register(request);
-        return ResponseEntity.ok().build();
+        return ResponseEntity.status(HttpStatus.CREATED).body(new AuthResponse("회원가입이 완료되었습니다."));
     }
 
     // 사용자 정보 검색
@@ -45,20 +46,20 @@ public ResponseEntity<AuthResponse> changePassword(@AuthenticationPrincipal User
 
     //사용자 정보 업데이트
     @PatchMapping
-    public ResponseEntity<Void> updateProfile(
+    public ResponseEntity<AuthResponse> updateProfile(
             @AuthenticationPrincipal UserPrincipal userPrincipal,
             @RequestBody UpdateProfileServiceDto dto) {
         String userId = userPrincipal.getId();
         userService.updateProfile(dto,userId);
-        return ResponseEntity.ok().build();
+        return ResponseEntity.ok(new AuthResponse("사용자 정보 수정이 완료되었습니다."));
     }
 
     // 회원 정보 삭제
     @DeleteMapping
     public ResponseEntity<AuthResponse> deleteUser(@AuthenticationPrincipal UserPrincipal userPrincipal) {
         String userId = userPrincipal.getId();
         userService.deleteUser(userId);
-        return ResponseEntity.ok(new AuthResponse("회원 정보가 삭제되었습니다."));
+        return ResponseEntity.ok(new AuthResponse("회원 탈퇴가 완료되었습니다."));
     }
 
     // 과거 질문 및 답변 리스트 조회

module-api/src/main/java/com/wsws/moduleapi/dto/user/UserProfileApiResponse.java → module-api/src/main/java/com/wsws/moduleapi/user/dto/UserProfileApiResponse.java

@@ -1,6 +1,6 @@
-package com.wsws.moduleapi.dto.user;
+package com.wsws.moduleapi.user.dto;
 
-import com.wsws.moduleapplication.dto.user.UserProfileResponse;
+import com.wsws.moduleapplication.user.dto.UserProfileResponse;
 
 public record UserProfileApiResponse(
         String userId,

module-api/src/main/java/com/wsws/moduleapi/dto/user/UserResponse.java → module-api/src/main/java/com/wsws/moduleapi/user/dto/UserResponse.java

@@ -1,4 +1,4 @@
-package com.wsws.moduleapi.dto.user;
+package com.wsws.moduleapi.user.dto;
 
 import java.util.List;
 

module-api/src/main/resources/application.yml

@@ -1,8 +1,10 @@
 spring:
+  application:
+    name: module-api
   config:
     import:
-      - file:/Users/lee/final-project/WEB1_1_Q-Feed_BE/module-infra/src/main/resources/application-infra.yml
-      - file:/Users/lee/final-project/WEB1_1_Q-Feed_BE/module-security/src/main/resources/application-security.yml
-
+      - file:${ABSOLUTE_PATH}/module-infra/src/main/resources/application-infra.yml
+      - file:${ABSOLUTE_PATH}/module-security/src/main/resources/application-security.yml
+      - file:${ABSOLUTE_PATH}/module-external-api/src/main/resources/application-external-api.yml
 
 

module-application/src/main/java/com/wsws/moduleapplication/dto/auth/EmailVerificationCheckServiceDto.java → module-application/src/main/java/com/wsws/moduleapplication/auth/dto/EmailVerificationCheckServiceDto.java

@@ -1,3 +1,3 @@
-package com.wsws.moduleapplication.dto.auth;
+package com.wsws.moduleapplication.auth.dto;
 
 public record EmailVerificationCheckServiceDto(String email, String code) {}

module-application/src/main/java/com/wsws/moduleapplication/dto/auth/EmailVerificationServiceDto.java → module-application/src/main/java/com/wsws/moduleapplication/auth/dto/EmailVerificationServiceDto.java

@@ -1,4 +1,4 @@
-package com.wsws.moduleapplication.dto.auth;
+package com.wsws.moduleapplication.auth.dto;
 
 public record EmailVerificationServiceDto(String email) {
 }

module-application/src/main/java/com/wsws/moduleapplication/dto/auth/LoginServiceRequest.java → module-application/src/main/java/com/wsws/moduleapplication/auth/dto/LoginServiceRequest.java

@@ -1,4 +1,4 @@
-package com.wsws.moduleapplication.dto.auth;
+package com.wsws.moduleapplication.auth.dto;
 
 public record LoginServiceRequest(
         String email,

module-application/src/main/java/com/wsws/moduleapplication/dto/auth/LoginServiceResponse.java → module-application/src/main/java/com/wsws/moduleapplication/auth/dto/LoginServiceResponse.java

@@ -1,4 +1,4 @@
-package com.wsws.moduleapplication.dto.auth;
+package com.wsws.moduleapplication.auth.dto;
 
 public record LoginServiceResponse(
         String accessToken,

module-application/src/main/java/com/wsws/moduleapplication/dto/auth/PasswordResetConfirmServiceDto.java → module-application/src/main/java/com/wsws/moduleapplication/auth/dto/PasswordResetConfirmServiceDto.java

@@ -1,3 +1,3 @@
-package com.wsws.moduleapplication.dto.auth;
+package com.wsws.moduleapplication.auth.dto;
 
 public record PasswordResetConfirmServiceDto(String email, String code, String newPassword) {}

module-application/src/main/java/com/wsws/moduleapplication/dto/auth/PasswordResetRequestServiceDto.java → module-application/src/main/java/com/wsws/moduleapplication/auth/dto/PasswordResetRequestServiceDto.java

@@ -1,4 +1,4 @@
-package com.wsws.moduleapplication.dto.auth;
+package com.wsws.moduleapplication.auth.dto;
 
 public record PasswordResetRequestServiceDto(String email) {
 }

module-application/src/main/java/com/wsws/moduleapplication/auth/exception/AuthServiceErrorCode.java

@@ -0,0 +1,26 @@
+package com.wsws.moduleapplication.auth.exception;
+
+
+import com.wsws.moduleapi.exception.BaseErrorCode;
+import com.wsws.moduleapi.exception.ErrorInfo;
+import lombok.RequiredArgsConstructor;
+
+import static com.wsws.moduleapi.constants.ErrorCodeConstants.UNAUTHORIZED;
+
+@RequiredArgsConstructor
+public enum AuthServiceErrorCode implements BaseErrorCode {
+
+    EMAIL_NOT_FOUND(UNAUTHORIZED, "AUTH_401_1", "존재하지 않는 이메일입니다."),
+    PASSWORD_MISMATCH(UNAUTHORIZED, "AUTH_401_2", "비밀번호가 일치하지 않습니다."),
+    REFRESH_TOKEN_NOT_FOUND(UNAUTHORIZED, "AUTH_401_3", "유효하지 않은 Refresh Token입니다."),
+    REFRESH_TOKEN_EXPIRED(UNAUTHORIZED, "AUTH_401_4", "Refresh Token이 만료되었습니다.");
+
+    private final Integer status;
+    private final String errorCode;
+    private final String message;
+
+    @Override
+    public ErrorInfo getErrorInfo() {
+        return ErrorInfo.of(status, errorCode, message);
+    }
+}

module-application/src/main/java/com/wsws/moduleapplication/auth/exception/EmailNotFoundException.java

@@ -0,0 +1,11 @@
+package com.wsws.moduleapplication.auth.exception;
+
+import com.wsws.moduleapi.exception.ApplicationException;
+
+public class EmailNotFoundException extends ApplicationException {
+    public static final EmailNotFoundException EXCEPTION = new EmailNotFoundException();
+
+    private EmailNotFoundException() {
+        super(AuthServiceErrorCode.EMAIL_NOT_FOUND);
+    }
+}

module-application/src/main/java/com/wsws/moduleapplication/auth/exception/InvalidRefreshTokenException.java

@@ -0,0 +1,11 @@
+package com.wsws.moduleapplication.auth.exception;
+
+import com.wsws.moduleapi.exception.ApplicationException;
+
+public class InvalidRefreshTokenException extends ApplicationException {
+    public static final InvalidRefreshTokenException EXCEPTION = new InvalidRefreshTokenException();
+
+    private InvalidRefreshTokenException() {
+        super(AuthServiceErrorCode.REFRESH_TOKEN_NOT_FOUND);
+    }
+}

module-application/src/main/java/com/wsws/moduleapplication/auth/exception/PasswordMismatchException.java

@@ -0,0 +1,11 @@
+package com.wsws.moduleapplication.auth.exception;
+
+import com.wsws.moduleapi.exception.ApplicationException;
+
+public class PasswordMismatchException extends ApplicationException {
+    public static final PasswordMismatchException EXCEPTION = new PasswordMismatchException();
+
+    private PasswordMismatchException() {
+        super(AuthServiceErrorCode.PASSWORD_MISMATCH);
+    }
+}

module-application/src/main/java/com/wsws/moduleapplication/auth/exception/RefreshTokenExpiredException.java

@@ -0,0 +1,12 @@
+package com.wsws.moduleapplication.auth.exception;
+
+
+import com.wsws.moduleapi.exception.ApplicationException;
+
+public class RefreshTokenExpiredException extends ApplicationException {
+    public static final RefreshTokenExpiredException EXCEPTION = new RefreshTokenExpiredException();
+
+    private RefreshTokenExpiredException() {
+        super(AuthServiceErrorCode.REFRESH_TOKEN_EXPIRED);
+    }
+}

module-application/src/main/java/com/wsws/moduleapplication/service/user/AuthService.java → module-application/src/main/java/com/wsws/moduleapplication/auth/service/AuthService.java

@@ -1,8 +1,10 @@
-package com.wsws.moduleapplication.service.user;
+package com.wsws.moduleapplication.auth.service;
 
-import com.wsws.moduleapplication.dto.user.AuthServiceResponse;
-import com.wsws.moduleapplication.dto.auth.LoginServiceRequest;
-import com.wsws.moduleapplication.dto.auth.LoginServiceResponse;
+import com.wsws.moduleapplication.auth.exception.EmailNotFoundException;
+import com.wsws.moduleapplication.auth.exception.RefreshTokenExpiredException;
+import com.wsws.moduleapplication.user.dto.AuthServiceResponse;
+import com.wsws.moduleapplication.auth.dto.LoginServiceRequest;
+import com.wsws.moduleapplication.auth.dto.LoginServiceResponse;
 import com.wsws.moduledomain.auth.RefreshToken;
 import com.wsws.moduledomain.auth.TokenProvider;
 import com.wsws.moduledomain.auth.exception.InvalidRefreshTokenException;
@@ -27,43 +29,43 @@ public class AuthService {
     private final TokenProvider tokenProvider;
     private final PasswordEncoder passwordEncoder;
 
-    //로그인
+    // 로그인
     public LoginServiceResponse login(LoginServiceRequest loginServiceRequest) {
         Email email = Email.from(loginServiceRequest.email());
         User user = userRepository.findByEmail(email)
-                .orElseThrow(() -> new IllegalArgumentException("이메일 또는 비밀번호가 잘못되었습니다."));
+                .orElseThrow(() -> EmailNotFoundException.EXCEPTION);
 
-        if(!passwordEncoder.matches(loginServiceRequest.password(),user.getPassword().getValue())){
-            throw new IllegalArgumentException("이메일 또는 비밀번호가 잘못되었습니다.");
-        }
+        // 비밀번호 검증
+        user.getPassword().matches(loginServiceRequest.password(), passwordEncoder);
 
         // JWT 토큰 생성
         String accessToken = tokenProvider.createAccessToken(user.getId().getValue());
         String refreshToken = tokenProvider.createRefreshToken(user.getId().getValue());
 
-        //refreshToken은 7일
+        // RefreshToken 저장 (7일 유효)
         authRepository.save(RefreshToken.create(refreshToken, LocalDateTime.now().plusDays(7)));
 
         return new LoginServiceResponse(accessToken, refreshToken);
     }
 
-
-    //로그아웃
+    // 로그아웃
     public AuthServiceResponse logout(String refreshToken) {
         authRepository.deleteByToken(refreshToken);
         return new AuthServiceResponse("로그아웃이 완료되었습니다");
     }
 
-
-
-    //토큰 재발급
-    public LoginServiceResponse reissueToken(String refreshToken){
-        //token 있는지 확인
+    // 토큰 재발급
+    public LoginServiceResponse reissueToken(String refreshToken) {
+        // RefreshToken 확인
         RefreshToken rToken = authRepository.findByToken(refreshToken)
-                .orElseThrow(() -> new InvalidRefreshTokenException("유효하지 않은 리프레시 토큰입니다."));
+                .orElseThrow(() -> InvalidRefreshTokenException.EXCEPTION);
 
-        //유효기간 체크
-        rToken.validateExpiry();
+        // 유효기간 체크
+        try {
+            rToken.validateExpiry();
+        } catch (Exception e) {
+            throw RefreshTokenExpiredException.EXCEPTION;
+        }
 
         String newAccessToken = tokenProvider.createAccessToken(rToken.getToken());
         String newRefreshToken = tokenProvider.createRefreshToken(rToken.getToken());

module-application/src/main/java/com/wsws/moduleapplication/dto/follow/FollowServiceRequestDto.java → module-application/src/main/java/com/wsws/moduleapplication/follow/dto/FollowServiceRequestDto.java

@@ -1,4 +1,4 @@
-package com.wsws.moduleapplication.dto.follow;
+package com.wsws.moduleapplication.follow.dto;
 
 
 public record FollowServiceRequestDto(String followerId, String followeeId) {

module-application/src/main/java/com/wsws/moduleapplication/dto/follow/FollowServiceResponseDto.java → module-application/src/main/java/com/wsws/moduleapplication/follow/dto/FollowServiceResponseDto.java

@@ -1,4 +1,4 @@
-package com.wsws.moduleapplication.dto.follow;
+package com.wsws.moduleapplication.follow.dto;
 
 public record FollowServiceResponseDto(String userId, String nickname, String profileImage) {
 }