From 1130394bb20afdb4f5a1a1081e1510d0522e3167 Mon Sep 17 00:00:00 2001 From: Jason Yoo Date: Thu, 18 Jul 2024 23:31:15 +0900 Subject: [PATCH 1/2] feat: remove email on delete user --- .../main/kotlin/club/staircrusher/user/domain/model/User.kt | 3 ++- .../user/infra/adapter/in/controller/DeleteUserTest.kt | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app-server/subprojects/bounded_context/user/domain/src/main/kotlin/club/staircrusher/user/domain/model/User.kt b/app-server/subprojects/bounded_context/user/domain/src/main/kotlin/club/staircrusher/user/domain/model/User.kt index d42663463..fd057b4c2 100644 --- a/app-server/subprojects/bounded_context/user/domain/src/main/kotlin/club/staircrusher/user/domain/model/User.kt +++ b/app-server/subprojects/bounded_context/user/domain/src/main/kotlin/club/staircrusher/user/domain/model/User.kt @@ -7,7 +7,7 @@ data class User( var nickname: String, @Deprecated("닉네임 로그인은 사라질 예정") var encryptedPassword: String?, var instagramId: String?, - var email: String?, // FIXME: 레거시 계정이 모두 사라지면 non-nullable로 변경 + var email: String?, val mobilityTools: MutableList, val createdAt: Instant, ) { @@ -17,6 +17,7 @@ data class User( get() = deletedAt != null fun delete(deletedAt: Instant) { + this.email = null this.deletedAt = deletedAt } } diff --git a/app-server/subprojects/bounded_context/user/infra/src/integrationTest/kotlin/club/staircrusher/user/infra/adapter/in/controller/DeleteUserTest.kt b/app-server/subprojects/bounded_context/user/infra/src/integrationTest/kotlin/club/staircrusher/user/infra/adapter/in/controller/DeleteUserTest.kt index 2820a70ad..9139f6464 100644 --- a/app-server/subprojects/bounded_context/user/infra/src/integrationTest/kotlin/club/staircrusher/user/infra/adapter/in/controller/DeleteUserTest.kt +++ b/app-server/subprojects/bounded_context/user/infra/src/integrationTest/kotlin/club/staircrusher/user/infra/adapter/in/controller/DeleteUserTest.kt @@ -55,6 +55,7 @@ class DeleteUserTest : UserITBase() { transactionManager.doInTransaction { val deletedUser = userRepository.findById(user.id) assertTrue(deletedUser.isDeleted) + assertNull(deletedUser.email) } } From 7b2a365d6b51ea77d428d8c0ac505a906a6c18c2 Mon Sep 17 00:00:00 2001 From: Jason Yoo Date: Fri, 26 Jul 2024 17:11:10 +0900 Subject: [PATCH 2/2] chore: remove comment --- .../src/main/kotlin/club/staircrusher/user/domain/model/User.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-server/subprojects/bounded_context/user/domain/src/main/kotlin/club/staircrusher/user/domain/model/User.kt b/app-server/subprojects/bounded_context/user/domain/src/main/kotlin/club/staircrusher/user/domain/model/User.kt index 4e5b38c28..64a426465 100644 --- a/app-server/subprojects/bounded_context/user/domain/src/main/kotlin/club/staircrusher/user/domain/model/User.kt +++ b/app-server/subprojects/bounded_context/user/domain/src/main/kotlin/club/staircrusher/user/domain/model/User.kt @@ -16,7 +16,7 @@ class User( var nickname: String, @Deprecated("닉네임 로그인은 사라질 예정") var encryptedPassword: String?, var instagramId: String?, - var email: String?, // FIXME: 레거시 계정이 모두 사라지면 non-nullable로 변경 + var email: String?, @Column(columnDefinition = "TEXT") @Convert(converter = UserMobilityToolListToTextAttributeConverter::class) val mobilityTools: MutableList,