From fd510710d95ebbebfa6755e0f34d6c6c36a599ad Mon Sep 17 00:00:00 2001
From: Klaus <klaus@vividnext.co.kr>
Date: Mon, 28 Apr 2025 21:58:50 +0900
Subject: [PATCH] =?UTF-8?q?feat:=20=ED=91=B8=EC=8B=9C=20=ED=86=A0=ED=81=B0?=
 =?UTF-8?q?(=EC=B9=B4=EC=B9=B4=EC=98=A4,=20=EA=B5=AC=EA=B8=80=20=EB=A1=9C?=
 =?UTF-8?q?=EA=B7=B8=EC=9D=B8)=20-=20=ED=95=9C=20=EC=82=AC=EB=9E=8C?=
 =?UTF-8?q?=EC=9D=B4=20=EC=97=AC=EB=9F=AC=EA=B0=9C=EC=9D=98=20=EB=94=94?=
 =?UTF-8?q?=EB=B0=94=EC=9D=B4=EC=8A=A4=EB=A1=9C=20=EB=A1=9C=EA=B7=B8?=
 =?UTF-8?q?=EC=9D=B8=20=ED=95=B4=EB=8F=84=20=EB=AA=A8=EB=93=A0=20=ED=91=B8?=
 =?UTF-8?q?=EC=8B=9C=20=ED=86=A0=ED=81=B0=EC=9D=B4=20=EA=B8=B0=EB=A1=9D?=
 =?UTF-8?q?=EB=90=98=EC=96=B4=20=EC=9E=88=EC=96=B4=EC=84=9C=20=EB=AA=A8?=
 =?UTF-8?q?=EB=93=A0=20=EB=94=94=EB=B0=94=EC=9D=B4=EC=8A=A4=EC=97=90=20?=
 =?UTF-8?q?=ED=91=B8=EC=8B=9C=EA=B0=80=20=EA=B0=80=EB=8F=84=EB=A1=9D=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/member/CreatorAdminMemberService.kt  |  4 ++++
 .../vividnext/sodalive/member/MemberService.kt | 18 ++++++++++++++++--
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/creator/admin/member/CreatorAdminMemberService.kt b/src/main/kotlin/kr/co/vividnext/sodalive/creator/admin/member/CreatorAdminMemberService.kt
index 3e193e9..8ba6b00 100644
--- a/src/main/kotlin/kr/co/vividnext/sodalive/creator/admin/member/CreatorAdminMemberService.kt
+++ b/src/main/kotlin/kr/co/vividnext/sodalive/creator/admin/member/CreatorAdminMemberService.kt
@@ -2,6 +2,7 @@ package kr.co.vividnext.sodalive.creator.admin.member
 
 import kr.co.vividnext.sodalive.common.ApiResponse
 import kr.co.vividnext.sodalive.common.SodaException
+import kr.co.vividnext.sodalive.fcm.PushTokenService
 import kr.co.vividnext.sodalive.jwt.TokenProvider
 import kr.co.vividnext.sodalive.member.MemberRepository
 import kr.co.vividnext.sodalive.member.MemberRole
@@ -25,6 +26,8 @@ class CreatorAdminMemberService(
     private val tokenProvider: TokenProvider,
     private val authenticationManagerBuilder: AuthenticationManagerBuilder,
 
+    private val pushTokenService: PushTokenService,
+
     @Value("\${cloud.aws.cloud-front.host}")
     private val cloudFrontHost: String
 ) {
@@ -44,6 +47,7 @@ class CreatorAdminMemberService(
             ?: throw SodaException("로그인 정보를 확인해주세요.")
 
         member.pushToken = null
+        pushTokenService.logout(memberId = memberId)
 
         val lock = getOrCreateLock(memberId = memberId)
         lock.write {
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 ba2ddb3..09c8a21 100644
--- a/src/main/kotlin/kr/co/vividnext/sodalive/member/MemberService.kt
+++ b/src/main/kotlin/kr/co/vividnext/sodalive/member/MemberService.kt
@@ -830,7 +830,14 @@ class MemberService(
             provider = MemberProvider.GOOGLE,
             container = container
         )
-        member.pushToken = pushToken
+
+        if (pushToken != null) {
+            pushTokenService.registerToken(
+                memberId = member.id!!,
+                token = pushToken,
+                deviceType = container
+            )
+        }
 
         if (!marketingPid.isNullOrBlank()) {
             member.activePid = marketingPid
@@ -879,7 +886,14 @@ class MemberService(
             provider = MemberProvider.KAKAO,
             container = container
         )
-        member.pushToken = pushToken
+
+        if (pushToken != null) {
+            pushTokenService.registerToken(
+                memberId = member.id!!,
+                token = pushToken,
+                deviceType = container
+            )
+        }
 
         if (!marketingPid.isNullOrBlank()) {
             member.activePid = marketingPid