Add Validate Soft Deleted In User Creation

whatever-mentoring · Dec 26, 2023 · a968392 · a968392
1 parent 3152b21
commit a968392
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 0 deletions.
diff --git a/...api/src/main/kotlin/com/whatever/raisedragon/applicationservice/AuthApplicationService.kt b/...api/src/main/kotlin/com/whatever/raisedragon/applicationservice/AuthApplicationService.kt
@@ -29,6 +29,7 @@ class AuthApplicationService(
     fun kakaoLogin(accessToken: String): LoginResponse {
         val kakaoId = authService.verifyKaKao(accessToken)
         val user = userService.loadByOAuthPayload(kakaoId)
+
         if (user == null) {
             val newUser = userService.create(
                 User(
@@ -39,6 +40,11 @@ class AuthApplicationService(
             )
             return buildLoginResponseByNewUser(newUser)
         }
+
+        if (user.deletedAt != null) {
+            userService.convertBySoftDeleteToEntity(user.id!!)
+        }
+
         return buildLoginResponseByUser(user)
     }
 

diff --git a/raisedragon-core/src/main/kotlin/com/whatever/raisedragon/domain/user/UserEntity.kt b/raisedragon-core/src/main/kotlin/com/whatever/raisedragon/domain/user/UserEntity.kt
@@ -36,6 +36,10 @@ fun UserEntity.disable() {
     this.deletedAt = LocalDateTime.now()
 }
 
+fun UserEntity.able() {
+    this.deletedAt = null
+}
+
 @Embeddable
 data class Nickname(
     @Column(name = "nickname")

diff --git a/raisedragon-core/src/main/kotlin/com/whatever/raisedragon/domain/user/UserService.kt b/raisedragon-core/src/main/kotlin/com/whatever/raisedragon/domain/user/UserService.kt
@@ -43,4 +43,10 @@ class UserService(
         val userEntity = loadById(id).fromDto()
         userEntity.disable()
     }
+
+    @Transactional
+    fun convertBySoftDeleteToEntity(id: Long) {
+        val userEntity = loadById(id).fromDto()
+        userEntity.able()
+    }
 }