From c49dfd0a8d78c664aa3987ffb9ccd4595b6d8253 Mon Sep 17 00:00:00 2001 From: jamey Date: Wed, 8 Jan 2025 19:52:51 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=F0=9F=93=9D=20[Docs]:=20=ED=9A=8C=EC=9B=90?= =?UTF-8?q?=20=ED=83=88=ED=87=B4=20=EB=B3=B5=EA=B5=AC=20swagger=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD(refreshToken=20=EC=95=88=20=EB=B3=B4?= =?UTF-8?q?=EC=9D=B4=EA=B2=8C=20=ED=95=98=EA=B8=B0)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/avab/avab/controller/UserController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/avab/avab/controller/UserController.java b/src/main/java/com/avab/avab/controller/UserController.java index 79165d0..6a969f4 100644 --- a/src/main/java/com/avab/avab/controller/UserController.java +++ b/src/main/java/com/avab/avab/controller/UserController.java @@ -117,7 +117,7 @@ public BaseResponse deleteUser(@AuthUser User user @Operation(summary = "회원 탈퇴 복구", description = "탈퇴한 회원의 계정을 복구합니다. _by 보노_") @ApiResponses({@ApiResponse(responseCode = "COMMON200", description = "OK, 성공")}) - @Parameter(name = "user", hidden = true) + @Parameter(name = "restoreToken", hidden = true) @PatchMapping("/me/deleted") public BaseResponse restoreUser( @ExtractToken String restoreToken) { From c5762e496e0af32400366722acf72c1ff9916c4d Mon Sep 17 00:00:00 2001 From: jamey Date: Wed, 8 Jan 2025 20:06:31 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=F0=9F=90=9B=20[Fix]:=20=ED=9A=8C=EC=9B=90?= =?UTF-8?q?=20=EB=B3=B5=EA=B5=AC=20=EC=8B=9C=20disableAt=EC=9D=B4=20?= =?UTF-8?q?=EC=95=84=EB=8B=8C=20deletedTime=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/avab/avab/domain/User.java | 5 +++++ .../java/com/avab/avab/service/impl/UserServiceImpl.java | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/avab/avab/domain/User.java b/src/main/java/com/avab/avab/domain/User.java index 065824b..191e9f7 100644 --- a/src/main/java/com/avab/avab/domain/User.java +++ b/src/main/java/com/avab/avab/domain/User.java @@ -102,6 +102,11 @@ public void enableUser() { this.userStatus = UserStatus.ENABLED; } + public void restoreUser() { + this.deletedTime = null; + this.userStatus = UserStatus.ENABLED; + } + public Boolean isDisabled() { return this.userStatus == UserStatus.DISABLED; } diff --git a/src/main/java/com/avab/avab/service/impl/UserServiceImpl.java b/src/main/java/com/avab/avab/service/impl/UserServiceImpl.java index 058e404..f65e05d 100644 --- a/src/main/java/com/avab/avab/service/impl/UserServiceImpl.java +++ b/src/main/java/com/avab/avab/service/impl/UserServiceImpl.java @@ -106,7 +106,7 @@ public User restoreUserDeletion(String restoreToken) { throw new UserException(ErrorStatus.USER_NOT_DELETED); } - user.enableUser(); + user.restoreUser(); return user; } }