v0.1.10

char-yb · web-flow · commit 270096639210 · 2025-10-01T14:05:26.000+09:00
v0.1.10
diff --git a/sseudam-clients/notification/src/main/kotlin/com/sseudam/client/discord/DiscordClientSender.kt b/sseudam-clients/notification/src/main/kotlin/com/sseudam/client/discord/DiscordClientSender.kt
@@ -45,6 +45,8 @@ class DiscordClientSender(
 
             **이메일:** ${userProfile.email}
             **회원 ID:** ${userProfile.id}
+            **닉네임:** ${userProfile.nickname}
+            **사용자 관심지역:** ${userProfile.address.site}
             **가입일시:** ${userProfile.createdAt.toLocalDate()} ${userProfile.createdAt.toLocalTime()}
             """.trimIndent()
 
diff --git a/sseudam-core/core-api/src/main/kotlin/com/sseudam/presentation/v1/auth/AuthController.kt b/sseudam-core/core-api/src/main/kotlin/com/sseudam/presentation/v1/auth/AuthController.kt
@@ -4,7 +4,6 @@ import com.sseudam.auth.AuthenticationFacade
 import com.sseudam.auth.AuthenticationService
 import com.sseudam.auth.CredentialSocial
 import com.sseudam.client.oauth.OAuthService
-import com.sseudam.common.Address
 import com.sseudam.presentation.v1.annotation.ApiV1Controller
 import com.sseudam.presentation.v1.auth.request.LoginRequest
 import com.sseudam.presentation.v1.auth.request.RefreshTokenRequest
@@ -97,7 +96,7 @@ class AuthController(
                 credentialSocial =
                     CredentialSocial(
                         email = socialInfo.email,
-                        name = null,
+                        name = "",
                         socialId = socialInfo.id,
                         socialType = SocialType.APPLE,
                     ),
@@ -114,14 +113,7 @@ class AuthController(
         if (tempUser == null) {
             throw ErrorException(ErrorType.NOT_FOUND_DATA)
         } else {
-            userService.updateName(tempUser.key, request.name)
-            userService.updateAddress(
-                tempUser.key,
-                Address(
-                    city = request.address.split(" ")[1],
-                    site = request.address,
-                ),
-            )
+            userService.socialSignUp(tempUser, request.toNewUser(tempUser.socialId, tempUser.socialType, request.address))
         }
         return SignUpResponse("회원가입에 성공했습니다.")
     }
diff --git a/sseudam-core/core-api/src/main/kotlin/com/sseudam/presentation/v1/auth/request/SignUpRequest.kt b/sseudam-core/core-api/src/main/kotlin/com/sseudam/presentation/v1/auth/request/SignUpRequest.kt
@@ -14,9 +14,9 @@ data class SignUpRequest(
     @Schema(description = "비밀번호", example = "password")
     val password: String,
     @Schema(description = "이름", example = "윤범차")
-    val name: String?,
+    val name: String,
     @Schema(description = "이름", example = "닉네임이야")
-    val nickname: String?,
+    val nickname: String,
 ) {
     fun toNewUser(password: String): NewUser =
         NewUser(
diff --git a/sseudam-core/core-api/src/main/kotlin/com/sseudam/presentation/v1/auth/request/SignUpSocialRequest.kt b/sseudam-core/core-api/src/main/kotlin/com/sseudam/presentation/v1/auth/request/SignUpSocialRequest.kt
@@ -3,6 +3,7 @@ package com.sseudam.presentation.v1.auth.request
 import com.sseudam.auth.AuthorityType
 import com.sseudam.auth.GrantedAuthority
 import com.sseudam.auth.NewAuthenticationSocial
+import com.sseudam.common.Address
 import com.sseudam.user.NewUser
 import com.sseudam.user.SocialType
 import io.swagger.v3.oas.annotations.media.Schema
@@ -28,6 +29,23 @@ data class SignUpSocialRequest(
             address = null,
         )
 
+    fun toNewUser(
+        socialId: String,
+        socialType: SocialType,
+        site: String,
+    ): NewUser =
+        NewUser(
+            email = email,
+            name = name,
+            socialId = socialId,
+            socialType = socialType,
+            address =
+                Address(
+                    city = site.split(" ").getOrNull(1) ?: "",
+                    site = site,
+                ),
+        )
+
     fun toNewAuthenticationSocial(
         socialId: String,
         socialType: SocialType,
diff --git a/sseudam-core/core-api/src/main/kotlin/com/sseudam/presentation/v1/report/request/ReportValidationRequest.kt b/sseudam-core/core-api/src/main/kotlin/com/sseudam/presentation/v1/report/request/ReportValidationRequest.kt
@@ -16,7 +16,7 @@ data class ReportValidationRequest(
         when {
             name.isBlank() -> throw ErrorException(ErrorType.SPOT_NAME_IS_BLANK)
             name.length < 2 -> throw ErrorException(ErrorType.INVALID_TRASH_SPOT_NAME_TWO)
-            name.length > 12 -> throw ErrorException(ErrorType.INVALID_TRASH_SPOT_NAME_TWELVE)
+            name.length > 30 -> throw ErrorException(ErrorType.INVALID_TRASH_SPOT_NAME_TWELVE)
         }
     }
 }
diff --git a/sseudam-core/core-api/src/main/kotlin/com/sseudam/presentation/v1/suggestion/request/SuggestionValidationRequest.kt b/sseudam-core/core-api/src/main/kotlin/com/sseudam/presentation/v1/suggestion/request/SuggestionValidationRequest.kt
@@ -16,7 +16,7 @@ data class SuggestionValidationRequest(
         when {
             name.isBlank() -> throw ErrorException(ErrorType.SPOT_NAME_IS_BLANK)
             name.length < 2 -> throw ErrorException(ErrorType.INVALID_TRASH_SPOT_NAME_TWO)
-            name.length > 12 -> throw ErrorException(ErrorType.INVALID_TRASH_SPOT_NAME_TWELVE)
+            name.length > 30 -> throw ErrorException(ErrorType.INVALID_TRASH_SPOT_NAME_TWELVE)
         }
     }
 }
diff --git a/sseudam-core/core-api/src/test/kotlin/com/sseudam/domain/trashspot/TrashSpotFacadeTest.kt b/sseudam-core/core-api/src/test/kotlin/com/sseudam/domain/trashspot/TrashSpotFacadeTest.kt
@@ -60,7 +60,16 @@ class TrashSpotFacadeTest :
                         status = SuggestionStatus.WAITING,
                         createdAt = LocalDateTime.now(),
                     )
-                val userProfile = UserProfile(id = 123L, key = "k", email = "e@example.com", name = "u", nickname = "nick", createdAt = LocalDateTime.now())
+                val userProfile =
+                    UserProfile(
+                        id = 123L,
+                        key = "k",
+                        email = "e@example.com",
+                        name = "u",
+                        nickname = "nick",
+                        address = spot.address,
+                        createdAt = LocalDateTime.now(),
+                    )
 
                 every { service.findBy(1L) } returns spot
                 every { imageService.findBySpotId(1L) } returns listOf(image)
diff --git a/sseudam-core/core-domain/src/main/kotlin/com/sseudam/auth/CredentialSocial.kt b/sseudam-core/core-domain/src/main/kotlin/com/sseudam/auth/CredentialSocial.kt
@@ -4,7 +4,7 @@ import com.sseudam.user.SocialType
 
 data class CredentialSocial(
     val email: String,
-    val name: String?,
+    val name: String,
     val socialId: String,
     val socialType: SocialType,
 )
diff --git a/sseudam-core/core-domain/src/main/kotlin/com/sseudam/user/NewUser.kt b/sseudam-core/core-domain/src/main/kotlin/com/sseudam/user/NewUser.kt
@@ -13,7 +13,7 @@ import com.sseudam.common.Address
  * @property socialType 소셜 타입
  */
 data class NewUser(
-    val name: String?,
+    val name: String,
     val nickname: String? = null,
     val address: Address?,
     val email: String,
diff --git a/sseudam-core/core-domain/src/main/kotlin/com/sseudam/user/UserEventListener.kt b/sseudam-core/core-domain/src/main/kotlin/com/sseudam/user/UserEventListener.kt
@@ -18,7 +18,7 @@ class UserEventListener(
     private val discordClient: DiscordClient,
 ) {
     @ApplicationModuleListener(condition = "#event.userId != null")
-    fun onCreatePetListener(event: UserCreatedEvent) {
+    fun onCreatePetListener(event: UserSignUpEvent) {
         val (currentYear, currentMonth) = LocalDate.now().let { it.year to it.month }
 
         val pets = petReader.readAllLatestSeasonPets(currentYear, currentMonth)
@@ -29,7 +29,7 @@ class UserEventListener(
     }
 
     @ApplicationModuleListener(condition = "#event.userId != null")
-    fun onDiscordNotificationListener(event: UserCreatedEvent) {
+    fun onDiscordNotificationListener(event: UserSignUpEvent) {
         val userProfile =
             userReader.readUserProfile(event.userId)
                 ?: throw ErrorException(ErrorType.NOT_FOUND_USER)
diff --git a/sseudam-core/core-domain/src/main/kotlin/com/sseudam/user/UserProfile.kt b/sseudam-core/core-domain/src/main/kotlin/com/sseudam/user/UserProfile.kt
@@ -1,5 +1,6 @@
 package com.sseudam.user
 
+import com.sseudam.common.Address
 import java.time.LocalDateTime
 
 data class UserProfile(
@@ -8,5 +9,6 @@ data class UserProfile(
     val email: String,
     val name: String?,
     val nickname: String,
+    val address: Address,
     val createdAt: LocalDateTime,
 )
diff --git a/sseudam-core/core-domain/src/main/kotlin/com/sseudam/user/UserService.kt b/sseudam-core/core-domain/src/main/kotlin/com/sseudam/user/UserService.kt
@@ -21,10 +21,20 @@ class UserService(
         txAdvice.write {
             userValidator.verifyEmail(newUser.email)
             val createdUser = userAppender.create(newUser)
-            applicationEventPublisher.publishEvent(UserCreatedEvent(userId = createdUser.id))
             return@write createdUser
         }
 
+    fun socialSignUp(
+        socialUser: SocialUser,
+        newUser: NewUser,
+    ) = txAdvice.write {
+        updateName(socialUser.key, newUser.name)
+        newUser.address?.let { address ->
+            updateAddress(socialUser.key, address)
+        }
+        applicationEventPublisher.publishEvent(UserSignUpEvent(userId = socialUser.id))
+    }
+
     fun getProfile(userId: Long): UserProfile? = userReader.readUserProfile(userId)
 
     fun getSocialUserByEmail(email: String): SocialUser? = userReader.readUserByEmail(email)
diff --git a/sseudam-core/core-domain/src/main/kotlin/com/sseudam/user/UserSignUpEvent.kt b/sseudam-core/core-domain/src/main/kotlin/com/sseudam/user/UserSignUpEvent.kt
@@ -1,5 +1,5 @@
 package com.sseudam.user
 
-data class UserCreatedEvent(
+data class UserSignUpEvent(
     val userId: Long,
 )
diff --git a/sseudam-storage/db-core/src/main/kotlin/com/sseudam/storage/db/core/user/UserEntity.kt b/sseudam-storage/db-core/src/main/kotlin/com/sseudam/storage/db/core/user/UserEntity.kt
@@ -72,6 +72,7 @@ class UserEntity(
             email = email,
             name = name,
             nickname = nickname ?: "",
+            address = address,
             createdAt = createdAt,
         )
 
diff --git a/sseudam-storage/redis/src/main/kotlin/com/sseudam/storage/redis/RedisTokenCoreRepository.kt b/sseudam-storage/redis/src/main/kotlin/com/sseudam/storage/redis/RedisTokenCoreRepository.kt
@@ -70,9 +70,9 @@ class RedisTokenCoreRepository(
         val tokenWithAuthentication =
             redisTemplate.opsForValue().get(token)?.let {
                 objectMapper.readValue(it, TokenWithAuthentication::class.java)
-            } ?: throw AuthenticationErrorException(AuthenticationErrorType.INVALID_TOKEN)
+            }
 
-        redisTemplate.delete(tokenWithAuthentication.accessToken)
-        redisTemplate.delete(tokenWithAuthentication.refreshToken)
+        tokenWithAuthentication?.accessToken?.let { redisTemplate.delete(it) }
+        tokenWithAuthentication?.refreshToken?.let { redisTemplate.delete(it) }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ data class ReportValidationRequest(`
`16`	`16`	`when {`
`17`	`17`	`name.isBlank() -> throw ErrorException(ErrorType.SPOT_NAME_IS_BLANK)`
`18`	`18`	`name.length < 2 -> throw ErrorException(ErrorType.INVALID_TRASH_SPOT_NAME_TWO)`
`19`		`- name.length > 12 -> throw ErrorException(ErrorType.INVALID_TRASH_SPOT_NAME_TWELVE)`
	`19`	`+ name.length > 30 -> throw ErrorException(ErrorType.INVALID_TRASH_SPOT_NAME_TWELVE)`
`20`	`20`	`}`
`21`	`21`	`}`
`22`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ data class SuggestionValidationRequest(`
`16`	`16`	`when {`
`17`	`17`	`name.isBlank() -> throw ErrorException(ErrorType.SPOT_NAME_IS_BLANK)`
`18`	`18`	`name.length < 2 -> throw ErrorException(ErrorType.INVALID_TRASH_SPOT_NAME_TWO)`
`19`		`- name.length > 12 -> throw ErrorException(ErrorType.INVALID_TRASH_SPOT_NAME_TWELVE)`
	`19`	`+ name.length > 30 -> throw ErrorException(ErrorType.INVALID_TRASH_SPOT_NAME_TWELVE)`
`20`	`20`	`}`
`21`	`21`	`}`
`22`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ import com.sseudam.user.SocialType`
`4`	`4`
`5`	`5`	`data class CredentialSocial(`
`6`	`6`	`val email: String,`
`7`		`- val name: String?,`
	`7`	`+ val name: String,`
`8`	`8`	`val socialId: String,`
`9`	`9`	`val socialType: SocialType,`
`10`	`10`	`)`