From 2fd7419bddadb90f0404a4eac48ffc150405c9ca Mon Sep 17 00:00:00 2001
From: Klaus <klaus@vividnext.co.kr>
Date: Fri, 2 May 2025 19:38:46 +0900
Subject: [PATCH] =?UTF-8?q?fix:=20=EA=B5=AC=EA=B8=80/=EC=B9=B4=EC=B9=B4?=
=?UTF-8?q?=EC=98=A4=20=EB=A1=9C=EA=B7=B8=EC=9D=B8=20=ED=9A=8C=EC=9B=90?=
=?UTF-8?q?=EA=B0=80=EC=9E=85=20=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95=20?=
=?UTF-8?q?-=20=ED=9A=8C=EC=9B=90=EA=B0=80=EC=9E=85=20=EC=A0=84=EC=97=90?=
=?UTF-8?q?=20=ED=91=B8=EC=8B=9C=20=ED=86=A0=ED=81=B0=20=EB=93=B1=EB=A1=9D?=
=?UTF-8?q?=EC=9D=84=20=EC=8B=9C=EB=8F=84=ED=95=98=EC=97=AC=20=EC=97=90?=
=?UTF-8?q?=EB=9F=AC=EB=82=98=EB=8A=94=20=EC=98=A4=EB=A5=98=20=EC=88=98?=
=?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../sodalive/member/MemberService.kt | 32 +++++++++----------
1 file changed, 16 insertions(+), 16 deletions(-)
diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/member/MemberService.kt b/src/main/kotlin/kr/co/vividnext/sodalive/member/MemberService.kt
index 09c8a21..93464bd 100644
--- a/src/main/kotlin/kr/co/vividnext/sodalive/member/MemberService.kt
+++ b/src/main/kotlin/kr/co/vividnext/sodalive/member/MemberService.kt
@@ -831,14 +831,6 @@ class MemberService(
container = container
)
- if (pushToken != null) {
- pushTokenService.registerToken(
- memberId = member.id!!,
- token = pushToken,
- deviceType = container
- )
- }
-
if (!marketingPid.isNullOrBlank()) {
member.activePid = marketingPid
member.partnerExpirationDatetime = LocalDateTime.now().plusYears(1)
@@ -847,6 +839,14 @@ class MemberService(
repository.save(member)
agreeTermsOfServiceAndPrivacyPolicy(member, stipulationTermsOfService, stipulationPrivacyPolicy)
+ if (pushToken != null) {
+ pushTokenService.registerToken(
+ memberId = member.id!!,
+ token = pushToken,
+ deviceType = container
+ )
+ }
+
return member
}
@@ -887,14 +887,6 @@ class MemberService(
container = container
)
- if (pushToken != null) {
- pushTokenService.registerToken(
- memberId = member.id!!,
- token = pushToken,
- deviceType = container
- )
- }
-
if (!marketingPid.isNullOrBlank()) {
member.activePid = marketingPid
member.partnerExpirationDatetime = LocalDateTime.now().plusYears(1)
@@ -903,6 +895,14 @@ class MemberService(
repository.save(member)
agreeTermsOfServiceAndPrivacyPolicy(member, stipulationTermsOfService, stipulationPrivacyPolicy)
+ if (pushToken != null) {
+ pushTokenService.registerToken(
+ memberId = member.id!!,
+ token = pushToken,
+ deviceType = container
+ )
+ }
+
return member
}