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) { 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; } }