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 {

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