klaus
/
sodalive-backend-spring-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'fix: 구글/카카오 로그인 회원가입 오류 수정' (#313) from test into main 

Reviewed-on: #313
This commit is contained in:
klaus 2025-05-02 10:58:04 +00:00
parent 4bde03643c 2fd7419bdd
commit e7a5fd5819
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/main/kotlin/kr/co/vividnext/sodalive/member/MemberService.kt
View File

@ -831,14 +831,6 @@ class MemberService(
container = container container = container
) )
if (pushToken != null) {
pushTokenService.registerToken(
memberId = member.id!!,
token = pushToken,
deviceType = container
)
}
if (!marketingPid.isNullOrBlank()) { if (!marketingPid.isNullOrBlank()) {
member.activePid = marketingPid member.activePid = marketingPid
member.partnerExpirationDatetime = LocalDateTime.now().plusYears(1) member.partnerExpirationDatetime = LocalDateTime.now().plusYears(1)
@ -847,6 +839,14 @@ class MemberService(
repository.save(member) repository.save(member)
agreeTermsOfServiceAndPrivacyPolicy(member, stipulationTermsOfService, stipulationPrivacyPolicy) agreeTermsOfServiceAndPrivacyPolicy(member, stipulationTermsOfService, stipulationPrivacyPolicy)
if (pushToken != null) {
pushTokenService.registerToken(
memberId = member.id!!,
token = pushToken,
deviceType = container
)
}
return member return member
} }
@ -887,14 +887,6 @@ class MemberService(
container = container container = container
) )
if (pushToken != null) {
pushTokenService.registerToken(
memberId = member.id!!,
token = pushToken,
deviceType = container
)
}
if (!marketingPid.isNullOrBlank()) { if (!marketingPid.isNullOrBlank()) {
member.activePid = marketingPid member.activePid = marketingPid
member.partnerExpirationDatetime = LocalDateTime.now().plusYears(1) member.partnerExpirationDatetime = LocalDateTime.now().plusYears(1)
@ -903,6 +895,14 @@ class MemberService(
repository.save(member) repository.save(member)
agreeTermsOfServiceAndPrivacyPolicy(member, stipulationTermsOfService, stipulationPrivacyPolicy) agreeTermsOfServiceAndPrivacyPolicy(member, stipulationTermsOfService, stipulationPrivacyPolicy)
if (pushToken != null) {
pushTokenService.registerToken(
memberId = member.id!!,
token = pushToken,
deviceType = container
)
}
return member return member
} }