From c1aa147f56d2ef62891820dfd15f46a8aa4d3a65 Mon Sep 17 00:00:00 2001
From: LeeJaeHyeok97 <hazardous10@naver.com>
Date: Tue, 29 Aug 2023 14:42:39 +0900
Subject: [PATCH] =?UTF-8?q?[FIX]#14=20=ED=9A=8C=EC=9B=90=20=ED=83=88?=
 =?UTF-8?q?=ED=87=B4=20=EC=9D=91=EB=8B=B5=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../rcp1/domain/user/application/UserService.java    |  4 +++-
 .../domain/user/presentation/UserController.java     | 12 ++++++++----
 .../java/com/example/rcp1/global/SuccessCode.java    |  3 ++-
 .../rcp1/global/config/security/JwtFilter.java       |  2 +-
 4 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/example/rcp1/domain/user/application/UserService.java b/src/main/java/com/example/rcp1/domain/user/application/UserService.java
index 584f5b0..5658ebb 100644
--- a/src/main/java/com/example/rcp1/domain/user/application/UserService.java
+++ b/src/main/java/com/example/rcp1/domain/user/application/UserService.java
@@ -75,6 +75,8 @@ public String signIn(SignInReq signInReq) {
 
     // 유저 정보 논리 삭제
     public String deleteUser(String token) {
+
+
         String subtractedEmail = JwtUtil.getUserEmail(token, secret_key);
 
         Optional<User> user = userRepository.findByEmail(subtractedEmail);
@@ -85,6 +87,6 @@ public String deleteUser(String token) {
 
         userRepository.save(tmpUser);
 
-        return "finish";
+        return "";
     }
 }
diff --git a/src/main/java/com/example/rcp1/domain/user/presentation/UserController.java b/src/main/java/com/example/rcp1/domain/user/presentation/UserController.java
index f9f9c96..c66dbf1 100644
--- a/src/main/java/com/example/rcp1/domain/user/presentation/UserController.java
+++ b/src/main/java/com/example/rcp1/domain/user/presentation/UserController.java
@@ -99,14 +99,18 @@ public ResponseEntity<String> updateProfile(
 
     // 유저 정보 탈퇴(논리 삭제)
     @PatchMapping("/delete")
-    public ResponseEntity<String> deleteUser(
+    public ResponseEntity<BaseResponse<?>> deleteUser(
             @RequestHeader("Authorization") String authorization
     ) {
-        String token = authorization.substring(7);
-        String t = userService.deleteUser(token);
 
+        try {
+            String token = authorization.substring(7);
+            String t = userService.deleteUser(token);
 
-        return ResponseEntity.ok().body(t);
+            return ResponseEntity.ok(BaseResponse.success(SuccessCode.LOGICAL_DELETE_SUCCESS));
+        } catch (Exception e) {
+            return ResponseEntity.ok().body(BaseResponse.error(ErrorCode.EXPIRED_TOKEN));
+        }
     }
 
 
diff --git a/src/main/java/com/example/rcp1/global/SuccessCode.java b/src/main/java/com/example/rcp1/global/SuccessCode.java
index aa9baad..112b4a6 100644
--- a/src/main/java/com/example/rcp1/global/SuccessCode.java
+++ b/src/main/java/com/example/rcp1/global/SuccessCode.java
@@ -15,7 +15,8 @@ public enum SuccessCode {
 //    CUSTOM_CREATED_SUCCESS(CREATED, "~ 생성에 성공했습니다.");
     SIGNUP_SUCCESS(OK, "회원가입에 성공했습니다."),
     SIGNIN_SUCCESS(OK, "로그인에 성공했습니다."),
-    UPDATE_PROFILE_SUCCESS(OK, "프로필이 성공적으로 수정되었습니다.");
+    UPDATE_PROFILE_SUCCESS(OK, "프로필이 성공적으로 수정되었습니다."),
+    LOGICAL_DELETE_SUCCESS(OK, "논리적으로 삭제 되었습니다.");
 
     private final HttpStatus httpStatus;
     private final String message;
diff --git a/src/main/java/com/example/rcp1/global/config/security/JwtFilter.java b/src/main/java/com/example/rcp1/global/config/security/JwtFilter.java
index 25f68f6..aae49b5 100644
--- a/src/main/java/com/example/rcp1/global/config/security/JwtFilter.java
+++ b/src/main/java/com/example/rcp1/global/config/security/JwtFilter.java
@@ -48,7 +48,7 @@ protected void doFilterInternal(HttpServletRequest request, HttpServletResponse
 
         // 토큰 만료 여부 확인
         if (JwtUtil.isExpired(token, secretKey)) {
-            log.error("토큰이 만료되었습니다.");
+            log.error("유효하지 않은 액세스 토큰입니다.");
             filterChain.doFilter(request, response);
             return;
         }