Merge pull request #98 from TeamSobokSobok/develop

Release
TeamSobokSobok · Mar 5, 2024 · 6fa1f08 · 6fa1f08
2 parents 993af0d + 5db8e27
commit 6fa1f08
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 5 deletions.
diff --git a/src/main/java/io/sobok/SobokSobok/auth/application/AuthService.java b/src/main/java/io/sobok/SobokSobok/auth/application/AuthService.java
@@ -60,7 +60,7 @@ public JwtTokenResponse refresh(String token) {
     }
 
     @Transactional
-    public void leave(Long userId) {
+    public void leave(Long userId, String leaveReason) {
 
         User user = userRepository.findById(userId)
                 .orElseThrow(() -> new NotFoundException(ErrorCode.UNREGISTERED_USER));
@@ -71,6 +71,6 @@ public void leave(Long userId) {
         }
 
         redisTemplate.delete(user.getSocialInfo().getSocialId());
-        user.deleteUser();
+        user.deleteUser(leaveReason);
     }
 }
diff --git a/src/main/java/io/sobok/SobokSobok/auth/domain/User.java b/src/main/java/io/sobok/SobokSobok/auth/domain/User.java
@@ -46,6 +46,9 @@ public class User extends BaseEntity implements UserDetails {
     @Column
     private LocalDateTime deletedAt;
 
+    @Column
+    private String leaveReason;
+
     @Builder
     public User(String username, SocialInfo socialInfo, String deviceToken, String roles) {
         this.username = username;
@@ -62,10 +65,11 @@ public void changeUsername(String username) {
         this.username = username;
     }
 
-    public void deleteUser() {
+    public void deleteUser(String leaveReason) {
         this.deviceToken = "";
         this.username = "";
         this.isDeleted = true;
+        this.leaveReason = leaveReason;
         this.deletedAt = LocalDateTime.now();
         this.socialInfo.removeSocialInfo();
     }

diff --git a/src/main/java/io/sobok/SobokSobok/auth/ui/AuthController.java b/src/main/java/io/sobok/SobokSobok/auth/ui/AuthController.java
@@ -97,11 +97,12 @@ public ResponseEntity<ApiResponse<JwtTokenResponse>> refresh(
             summary = "소복소복 회원 탈퇴",
             description = "소복소복 서비스를 탈퇴하는 API 입니다."
     )
-    public ResponseEntity<ApiResponse<Void>> refresh(
+    public ResponseEntity<ApiResponse<Void>> leave(
+            @RequestBody @Valid final LeaveRequest request,
             @AuthenticationPrincipal User user
     ) {
 
-        authService.leave(user.getId());
+        authService.leave(user.getId(), request.text());
         return ResponseEntity
                 .status(HttpStatus.OK)
                 .body(ApiResponse.success(

diff --git a/src/main/java/io/sobok/SobokSobok/auth/ui/dto/LeaveRequest.java b/src/main/java/io/sobok/SobokSobok/auth/ui/dto/LeaveRequest.java
@@ -0,0 +1,10 @@
+package io.sobok.SobokSobok.auth.ui.dto;
+
+import jakarta.validation.constraints.NotBlank;
+
+public record LeaveRequest(
+
+        @NotBlank
+        String text
+) {
+}