fix: 소셜로그인시 유저 행동데이터 SIGN_UP 중복 기록 버그
- 소셜로그인 시 isNew 플래그를 통해 회원가입/로그인을 구분하여 SIGN_UP 중복 기록 버그 수정
This commit is contained in:
@@ -33,6 +33,7 @@ import kr.co.vividnext.sodalive.member.signUp.SignUpRequest
|
||||
import kr.co.vividnext.sodalive.member.signUp.SignUpRequestV2
|
||||
import kr.co.vividnext.sodalive.member.signUp.SignUpResponse
|
||||
import kr.co.vividnext.sodalive.member.signUp.SignUpValidator
|
||||
import kr.co.vividnext.sodalive.member.social.MemberResolveResult
|
||||
import kr.co.vividnext.sodalive.member.social.google.GoogleUserInfo
|
||||
import kr.co.vividnext.sodalive.member.social.kakao.KakaoUserInfo
|
||||
import kr.co.vividnext.sodalive.member.stipulation.Stipulation
|
||||
@@ -800,11 +801,11 @@ class MemberService(
|
||||
container: String,
|
||||
marketingPid: String?,
|
||||
pushToken: String?
|
||||
): Member {
|
||||
): MemberResolveResult {
|
||||
val findMember = repository.findByGoogleId(googleUserInfo.sub)
|
||||
if (findMember != null) {
|
||||
if (findMember.isActive) {
|
||||
return findMember
|
||||
return MemberResolveResult(member = findMember, isNew = false)
|
||||
} else {
|
||||
throw SodaException("탈퇴한 계정입니다.\n고객센터로 문의해 주시기 바랍니다.")
|
||||
}
|
||||
@@ -847,7 +848,7 @@ class MemberService(
|
||||
)
|
||||
}
|
||||
|
||||
return member
|
||||
return MemberResolveResult(member = member, isNew = true)
|
||||
}
|
||||
|
||||
@Transactional
|
||||
@@ -856,11 +857,11 @@ class MemberService(
|
||||
container: String,
|
||||
marketingPid: String?,
|
||||
pushToken: String?
|
||||
): Member {
|
||||
): MemberResolveResult {
|
||||
val findMember = repository.findByKakaoId(kakaoUserInfo.id)
|
||||
if (findMember != null) {
|
||||
if (findMember.isActive) {
|
||||
return findMember
|
||||
return MemberResolveResult(member = findMember, isNew = false)
|
||||
} else {
|
||||
throw SodaException("탈퇴한 계정입니다.\n고객센터로 문의해 주시기 바랍니다.")
|
||||
}
|
||||
@@ -903,7 +904,7 @@ class MemberService(
|
||||
)
|
||||
}
|
||||
|
||||
return member
|
||||
return MemberResolveResult(member = member, isNew = true)
|
||||
}
|
||||
|
||||
private fun checkEmail(email: String) {
|
||||
|
Reference in New Issue
Block a user