Merge branch 'feature/214' into develop

ahachulTeam · Apr 16, 2024 · d839aa8 · d839aa8
2 parents 5059200 + 6cacbb1
commit d839aa8
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/...rc/main/kotlin/backend/team/ahachul_backend/api/member/application/service/AuthService.kt b/...rc/main/kotlin/backend/team/ahachul_backend/api/member/application/service/AuthService.kt
@@ -41,19 +41,22 @@ class AuthService(
 
     @Transactional
     override fun login(command: LoginMemberCommand): LoginMemberDto.Response {
+        var isDuplicatedNickname = false
         val member = when (command.providerType) {
             ProviderType.KAKAO -> {
                 val userInfo = getKakaoMemberInfo(command.providerCode)
                 val member = memberReader.findMember(userInfo.id)
+                userInfo.kakaoAccount.profile?.let { profile -> isDuplicatedNickname = memberReader.existMember(profile.nickname) }
                 member ?: memberWriter.save(MemberEntity.ofKakao(command, userInfo))
             }
             ProviderType.GOOGLE -> {
                 val userInfo = getGoogleMemberInfo(command.providerCode)
                 val member = memberReader.findMember(userInfo.id)
+                isDuplicatedNickname = memberReader.existMember(userInfo.name)
                 member ?: memberWriter.save(MemberEntity.ofGoogle(command, userInfo))
             }
         }
-        return makeLoginResponse(member.id.toString(), member.isNeedAdditionalUserInfo())
+        return makeLoginResponse(member.id.toString(), member.isNeedAdditionalUserInfo() || isDuplicatedNickname)
     }
 
     private fun getKakaoMemberInfo(provideCode: String): KakaoMemberInfoDto {