src/main/kotlin/kr/co/vividnext/sodalive/content/comment/AudioContentCommentRepository.kt

@@ -4,7 +4,6 @@ import com.querydsl.core.types.dsl.Expressions
 import com.querydsl.jpa.impl.JPAQueryFactory
 import kr.co.vividnext.sodalive.content.QAudioContent.audioContent
 import kr.co.vividnext.sodalive.content.comment.QAudioContentComment.audioContentComment
-import kr.co.vividnext.sodalive.fcm.QPushToken.pushToken
 import kr.co.vividnext.sodalive.member.QMember.member
 import org.springframework.data.jpa.repository.JpaRepository
 import org.springframework.stereotype.Repository
@@ -205,27 +204,25 @@ class AudioContentCommentQueryRepositoryImpl(
             queryFactory
                 .select(
                     QFindPushTokenByContentIdAndCommentParentIdMyMemberIdResponse(
-                        pushToken.token,
+                        member.pushToken.coalesce(""),
-                        pushToken.deviceType
+                        member.container
                     )
                 )
                 .from(audioContentComment)
                 .innerJoin(audioContentComment.audioContent, audioContent)
                 .innerJoin(audioContentComment.member, member)
-                .innerJoin(pushToken).on(member.id.eq(pushToken.member.id))
                 .where(where)
                 .fetch()
         } else {
             queryFactory
                 .select(
                     QFindPushTokenByContentIdAndCommentParentIdMyMemberIdResponse(
-                        pushToken.token,
+                        member.pushToken.coalesce(""),
-                        pushToken.deviceType
+                        member.container
                     )
                 )
                 .from(audioContent)
                 .innerJoin(audioContent.member, member)
-                .innerJoin(pushToken).on(member.id.eq(pushToken.member.id))
                 .where(where)
                 .fetch()
         }

src/main/kotlin/kr/co/vividnext/sodalive/creator/admin/member/CreatorAdminMemberService.kt

@@ -2,7 +2,6 @@ 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
@@ -26,8 +25,6 @@ class CreatorAdminMemberService(
     private val tokenProvider: TokenProvider,
     private val authenticationManagerBuilder: AuthenticationManagerBuilder,
 
-    private val pushTokenService: PushTokenService,
-
     @Value("\${cloud.aws.cloud-front.host}")
     private val cloudFrontHost: String
 ) {
@@ -47,7 +44,6 @@ 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/fcm/FcmService.kt

@@ -14,7 +14,7 @@ import org.springframework.scheduling.annotation.Async
 import org.springframework.stereotype.Service
 
 @Service
-class FcmService(private val pushTokenService: PushTokenService) {
+class FcmService {
     private val logger = LoggerFactory.getLogger(this::class.java)
 
     @Async
@@ -100,8 +100,7 @@ class FcmService(private val pushTokenService: PushTokenService) {
 
                     if (exception?.messagingErrorCode == MessagingErrorCode.UNREGISTERED) {
                         logger.error("[FCM] ❌ UNREGISTERED → $token")
-                        // DB에서 삭제
+                        // 필요 시 DB에서 삭제
-                        pushTokenService.unregisterInvalidToken(token)
                     } else {
                         logger.error("[FCM] ❌ 실패: $token / ${exception?.messagingErrorCode}")
                         failedTokens.add(token)
@@ -149,8 +148,6 @@ class FcmService(private val pushTokenService: PushTokenService) {
                 // "registration-token-not-registered" 예외 코드 확인
                 if (e.messagingErrorCode == MessagingErrorCode.UNREGISTERED) {
                     logger.error("[FCM] ❌ 실패: 토큰이 등록되지 않음 (등록 해제됨) → 재시도 안함")
-                    // DB에서 삭제
-                    pushTokenService.unregisterInvalidToken(token)
                     return
                 }
 

src/main/kotlin/kr/co/vividnext/sodalive/fcm/PushToken.kt

@@ -1,18 +0,0 @@
-package kr.co.vividnext.sodalive.fcm
-
-import kr.co.vividnext.sodalive.common.BaseEntity
-import kr.co.vividnext.sodalive.member.Member
-import javax.persistence.Entity
-import javax.persistence.FetchType
-import javax.persistence.JoinColumn
-import javax.persistence.ManyToOne
-
-@Entity
-data class PushToken(
-    var token: String,
-    var deviceType: String
-) : BaseEntity() {
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "member_id", nullable = true)
-    var member: Member? = null
-}

src/main/kotlin/kr/co/vividnext/sodalive/fcm/PushTokenRepository.kt

@@ -1,30 +0,0 @@
-package kr.co.vividnext.sodalive.fcm
-
-import com.querydsl.jpa.impl.JPAQueryFactory
-import kr.co.vividnext.sodalive.fcm.QPushToken.pushToken
-import org.springframework.data.jpa.repository.JpaRepository
-
-interface PushTokenRepository : JpaRepository<PushToken, Long>, PushTokenQueryRepository
-
-interface PushTokenQueryRepository {
-    fun findByToken(token: String): PushToken?
-    fun findByMemberId(memberId: Long): List<PushToken>
-}
-
-class PushTokenQueryRepositoryImpl(
-    private val queryFactory: JPAQueryFactory
-) : PushTokenQueryRepository {
-    override fun findByToken(token: String): PushToken? {
-        return queryFactory
-            .selectFrom(pushToken)
-            .where(pushToken.token.eq(token))
-            .fetchFirst()
-    }
-
-    override fun findByMemberId(memberId: Long): List<PushToken> {
-        return queryFactory
-            .selectFrom(pushToken)
-            .where(pushToken.member.id.eq(memberId))
-            .fetch()
-    }
-}

src/main/kotlin/kr/co/vividnext/sodalive/fcm/PushTokenService.kt

@@ -1,47 +0,0 @@
-package kr.co.vividnext.sodalive.fcm
-
-import kr.co.vividnext.sodalive.member.MemberRepository
-import org.springframework.data.repository.findByIdOrNull
-import org.springframework.stereotype.Service
-import org.springframework.transaction.annotation.Transactional
-
-@Service
-class PushTokenService(
-    private val repository: PushTokenRepository,
-    private val memberRepository: MemberRepository
-) {
-    @Transactional
-    fun registerToken(memberId: Long, token: String, deviceType: String) {
-        val member = memberRepository.findByIdOrNull(memberId)
-
-        if (member != null) {
-            val existing = repository.findByToken(token)
-            if (existing != null) {
-                existing.member = member
-                existing.token = token
-                existing.deviceType = deviceType
-            } else {
-                val newToken = PushToken(token, deviceType)
-                newToken.member = member
-                repository.save(newToken)
-            }
-        }
-    }
-
-    @Transactional
-    fun logout(memberId: Long) {
-        val tokens = repository.findByMemberId(memberId)
-
-        for (token in tokens) {
-            token.member = null
-        }
-    }
-
-    @Transactional
-    fun unregisterInvalidToken(token: String) {
-        val existing = repository.findByToken(token)
-        if (existing != null) {
-            repository.delete(existing)
-        }
-    }
-}

src/main/kotlin/kr/co/vividnext/sodalive/member/MemberRepository.kt

@@ -3,7 +3,6 @@ package kr.co.vividnext.sodalive.member
 import com.querydsl.jpa.impl.JPAQueryFactory
 import kr.co.vividnext.sodalive.fcm.GetMessageRecipientPushTokenResponse
 import kr.co.vividnext.sodalive.fcm.QGetMessageRecipientPushTokenResponse
-import kr.co.vividnext.sodalive.fcm.QPushToken.pushToken
 import kr.co.vividnext.sodalive.live.reservation.QLiveReservation.liveReservation
 import kr.co.vividnext.sodalive.live.room.QLiveRoom.liveRoom
 import kr.co.vividnext.sodalive.member.QMember.member
@@ -27,6 +26,7 @@ interface MemberRepository : JpaRepository<Member, Long>, MemberQueryRepository
 }
 
 interface MemberQueryRepository {
+    fun findByPushToken(pushToken: String): List<Member>
     fun findByNicknameAndOtherCondition(nickname: String, member: Member): List<Member>
     fun findCreatorByIdOrNull(memberId: Long): Member?
     fun getAllRecipientPushTokens(isAuth: Boolean?, container: String): List<List<String>>
@@ -74,6 +74,13 @@ class MemberQueryRepositoryImpl(
     @Value("\${cloud.aws.cloud-front.host}")
     private val cloudFrontHost: String
 ) : MemberQueryRepository {
+    override fun findByPushToken(pushToken: String): List<Member> {
+        return queryFactory
+            .selectFrom(member)
+            .where(member.pushToken.eq(pushToken))
+            .fetch()
+    }
+
     override fun findByNicknameAndOtherCondition(nickname: String, member: Member): List<Member> {
         var where = QMember.member.nickname.containsIgnoreCase(nickname)
             .and(QMember.member.id.ne(member.id))
@@ -104,7 +111,8 @@ class MemberQueryRepositoryImpl(
     override fun getAllRecipientPushTokens(isAuth: Boolean?, container: String): List<List<String>> {
         var where = member.isActive.isTrue
             .and(member.email.notIn("admin@sodalive.net"))
-            .and(pushToken.deviceType.eq(container))
+            .and(member.container.eq(container))
+            .and(member.pushToken.isNotNull)
 
         if (isAuth != null) {
             where = if (isAuth) {
@@ -115,9 +123,8 @@ class MemberQueryRepositoryImpl(
         }
 
         return queryFactory
-            .select(pushToken.token)
+            .select(member.pushToken)
             .from(member)
-            .innerJoin(pushToken).on(member.id.eq(pushToken.member.id))
             .leftJoin(member.auth, auth)
             .where(where)
             .fetch()
@@ -135,18 +142,18 @@ class MemberQueryRepositoryImpl(
         val creator = QMember.member
 
         var where = creatorFollowing.isActive.isTrue
-            .and(creatorFollowing.member.isActive.isTrue)
             .and(creatorFollowing.creator.id.eq(creatorId))
             .and(creatorFollowing.member.notification.live.isTrue)
+            .and(creatorFollowing.member.container.eq(container))
             .and(creatorFollowing.member.email.notIn("admin@sodalive.net"))
             .and(
                 creatorFollowing.member.id.notIn(
                     blockMemberRepository.getBlockedMemberIdList(creatorId)
                 )
             )
+            .and(creatorFollowing.member.pushToken.isNotNull)
             .and(creatorFollowing.isNotify.isTrue)
-            .and(pushToken.deviceType.eq(container))
+            .or(member.id.eq(4).and(member.pushToken.isNotNull))
-            .or(member.id.eq(4))
 
         if (isAuth) {
             where = where.and(auth.isNotNull)
@@ -157,12 +164,11 @@ class MemberQueryRepositoryImpl(
         }
 
         return queryFactory
-            .select(pushToken.token)
+            .select(creatorFollowing.member.pushToken)
             .from(creatorFollowing)
             .innerJoin(creatorFollowing.creator, creator)
             .innerJoin(creatorFollowing.member, member)
             .innerJoin(creatorFollowing.member.notification, memberNotification)
-            .innerJoin(pushToken).on(creatorFollowing.member.id.eq(pushToken.member.id))
             .leftJoin(creatorFollowing.member.auth, auth)
             .where(where)
             .fetch()
@@ -181,18 +187,18 @@ class MemberQueryRepositoryImpl(
         val creator = QMember.member
 
         var where = creatorFollowing.isActive.isTrue
-            .and(creatorFollowing.member.isActive.isTrue)
             .and(creatorFollowing.creator.id.eq(creatorId))
             .and(creatorFollowing.member.notification.live.isTrue)
+            .and(creatorFollowing.member.container.eq(container))
             .and(creatorFollowing.member.email.notIn("admin@sodalive.net"))
             .and(
                 creatorFollowing.member.id.notIn(
                     blockMemberRepository.getBlockedMemberIdList(creatorId)
                 )
             )
+            .and(creatorFollowing.member.pushToken.isNotNull)
             .and(creatorFollowing.isNotify.isTrue)
-            .and(pushToken.deviceType.eq(container))
+            .or(creatorFollowing.member.id.eq(4).and(member.pushToken.isNotNull))
-            .or(creatorFollowing.member.id.eq(4))
 
         if (isAuth) {
             where = where.and(auth.isNotNull)
@@ -203,37 +209,36 @@ class MemberQueryRepositoryImpl(
         }
 
         val followingMemberPushToken = queryFactory
-            .select(pushToken.token)
+            .select(creatorFollowing.member.pushToken)
             .from(creatorFollowing)
             .innerJoin(creatorFollowing.creator, creator)
             .innerJoin(creatorFollowing.member, member)
             .innerJoin(creatorFollowing.member.notification, memberNotification)
-            .innerJoin(pushToken).on(creatorFollowing.member.id.eq(pushToken.member.id))
             .leftJoin(creatorFollowing.member.auth, auth)
             .where(where)
             .fetch()
 
         where = liveReservation.isActive.isTrue
             .and(liveReservation.member.notification.live.isTrue)
+            .and(liveReservation.member.container.eq(container))
             .and(liveReservation.member.email.notIn("admin@sodalive.net"))
+            .and(liveReservation.member.pushToken.isNotNull)
             .and(liveReservation.room.id.eq(roomId))
             .and(
                 liveReservation.member.id.notIn(
                     blockMemberRepository.getBlockedMemberIdList(creatorId)
                 )
             )
-            .and(pushToken.deviceType.eq(container))
 
         if (isAuth) {
             where = where.and(auth.isNotNull)
         }
 
         val reservationMemberPushToken = queryFactory
-            .select(pushToken.token)
+            .select(liveReservation.member.pushToken)
             .from(liveReservation)
             .innerJoin(liveReservation.member, member)
             .innerJoin(liveReservation.member.notification, memberNotification)
-            .innerJoin(pushToken).on(liveReservation.member.id.eq(pushToken.member.id))
             .leftJoin(liveReservation.member.auth, auth)
             .where(where)
             .fetch()
@@ -254,27 +259,27 @@ class MemberQueryRepositoryImpl(
         var where = creatorFollowing.isActive.isTrue
             .and(creatorFollowing.creator.id.eq(creatorId))
             .and(creatorFollowing.member.email.notIn("admin@sodalive.net"))
+            .and(creatorFollowing.member.container.eq(container))
             .and(creatorFollowing.member.notification.uploadContent.isTrue)
             .and(
                 creatorFollowing.member.id.notIn(
                     blockMemberRepository.getBlockedMemberIdList(creatorId)
                 )
             )
+            .and(creatorFollowing.member.pushToken.isNotNull)
             .and(creatorFollowing.isNotify.isTrue)
-            .and(pushToken.deviceType.eq(container))
+            .or(member.id.eq(4).and(member.pushToken.isNotNull))
-            .or(member.id.eq(4))
 
         if (isAuth) {
             where = where.and(auth.isNotNull)
         }
 
         return queryFactory
-            .select(pushToken.token)
+            .select(creatorFollowing.member.pushToken)
             .from(creatorFollowing)
             .innerJoin(creatorFollowing.creator, creator)
             .innerJoin(creatorFollowing.member, member)
             .innerJoin(member.notification, memberNotification)
-            .innerJoin(pushToken).on(creatorFollowing.member.id.eq(pushToken.member.id))
             .leftJoin(member.auth, auth)
             .where(where)
             .fetch()
@@ -286,16 +291,16 @@ class MemberQueryRepositoryImpl(
         return queryFactory
             .select(
                 QGetMessageRecipientPushTokenResponse(
-                    pushToken.token,
+                    member.pushToken,
-                    pushToken.deviceType
+                    member.container
                 )
             )
             .from(message)
             .innerJoin(message.recipient, member)
             .innerJoin(member.notification, memberNotification)
-            .innerJoin(pushToken).on(member.id.eq(pushToken.member.id))
             .where(
                 message.id.eq(messageId)
+                    .and(member.pushToken.isNotNull)
                     .and(memberNotification.message.isTrue)
             )
             .fetchFirst()
@@ -308,6 +313,7 @@ class MemberQueryRepositoryImpl(
         var where = member.isActive.isTrue
             .and(member.email.notIn("admin@sodalive.net"))
             .and(member.id.`in`(*recipients.toTypedArray()))
+            .and(member.pushToken.isNotNull)
 
         if (isAuth != null) {
             where = if (isAuth) {
@@ -318,21 +324,19 @@ class MemberQueryRepositoryImpl(
         }
 
         val aosPushTokens = queryFactory
-            .select(pushToken.token)
+            .select(member.pushToken)
             .from(member)
-            .innerJoin(pushToken).on(member.id.eq(pushToken.member.id))
             .leftJoin(member.auth, auth)
-            .where(where.and(pushToken.deviceType.eq("aos")))
+            .where(where.and(member.container.eq("aos")))
             .fetch()
             .toSet()
             .chunked(500)
 
         val iosPushTokens = queryFactory
-            .select(pushToken.token)
+            .select(member.pushToken)
             .from(member)
-            .innerJoin(pushToken).on(member.id.eq(pushToken.member.id))
             .leftJoin(member.auth, auth)
-            .where(where.and(pushToken.deviceType.eq("ios")))
+            .where(where.and(member.container.eq("ios")))
             .fetch()
             .toSet()
             .chunked(500)
@@ -369,7 +373,6 @@ class MemberQueryRepositoryImpl(
         val creator = QMember.member
 
         val where = creatorFollowing.isActive.isTrue
-            .and(creatorFollowing.member.isActive.isTrue)
             .and(creatorFollowing.creator.id.eq(creatorId))
             .and(creatorFollowing.member.email.notIn("admin@sodalive.net"))
             .and(
@@ -377,26 +380,25 @@ class MemberQueryRepositoryImpl(
                     blockMemberRepository.getBlockedMemberIdList(creatorId)
                 )
             )
+            .and(creatorFollowing.member.pushToken.isNotNull)
             .and(creatorFollowing.isNotify.isTrue)
 
         val aosPushTokens = queryFactory
-            .select(pushToken.token)
+            .select(creatorFollowing.member.pushToken)
             .from(creatorFollowing)
             .innerJoin(creatorFollowing.creator, creator)
             .innerJoin(creatorFollowing.member, member)
-            .innerJoin(pushToken).on(creatorFollowing.member.id.eq(pushToken.member.id))
+            .where(where.and(member.container.eq("aos")))
-            .where(where.and(pushToken.deviceType.eq("aos")))
             .fetch()
             .toSet()
             .chunked(500)
 
         val iosPushTokens = queryFactory
-            .select(pushToken.token)
+            .select(creatorFollowing.member.pushToken)
             .from(creatorFollowing)
             .innerJoin(creatorFollowing.creator, creator)
             .innerJoin(creatorFollowing.member, member)
-            .innerJoin(pushToken).on(creatorFollowing.member.id.eq(pushToken.member.id))
+            .where(where.and(member.container.eq("ios")))
-            .where(where.and(pushToken.deviceType.eq("ios")))
             .fetch()
             .toSet()
             .chunked(500)
@@ -409,22 +411,21 @@ class MemberQueryRepositoryImpl(
             .and(liveReservation.isActive.isTrue)
 
         val aosPushTokens = queryFactory
-            .select(pushToken.token)
+            .select(liveReservation.member.pushToken)
             .from(liveReservation)
             .innerJoin(liveReservation.room, liveRoom)
             .innerJoin(liveReservation.member, member)
-            .innerJoin(pushToken).on(member.id.eq(pushToken.member.id))
+            .where(where.and(member.container.eq("aos")))
-            .where(where.and(pushToken.deviceType.eq("aos")))
             .fetch()
             .toSet()
             .chunked(500)
 
         val iosPushTokens = queryFactory
-            .select(pushToken.token)
+            .select(liveReservation.member.pushToken)
             .from(liveReservation)
             .innerJoin(liveReservation.room, liveRoom)
             .innerJoin(liveReservation.member, member)
-            .where(where.and(pushToken.deviceType.eq("aos")))
+            .where(where.and(member.container.eq("ios")))
             .fetch()
             .toSet()
             .chunked(500)
@@ -434,29 +435,28 @@ class MemberQueryRepositoryImpl(
 
     override fun getAuditionNoticeRecipientPushTokens(isAuth: Boolean): Map<String, List<List<String>>> {
         var where = memberNotification.audition.isTrue
+            .and(member.pushToken.isNotNull)
 
         if (isAuth) {
             where = where.and(auth.isNotNull)
         }
 
         val aosPushTokens = queryFactory
-            .select(pushToken.token)
+            .select(member.pushToken)
             .from(member)
-            .innerJoin(pushToken).on(member.id.eq(pushToken.member.id))
             .leftJoin(member.auth, auth)
             .leftJoin(memberNotification).on(memberNotification.member.id.eq(member.id))
-            .where(where.and(pushToken.deviceType.eq("aos")))
+            .where(where.and(member.container.eq("aos")))
             .fetch()
             .toSet()
             .chunked(500)
 
         val iosPushTokens = queryFactory
-            .select(pushToken.token)
+            .select(member.pushToken)
             .from(member)
-            .innerJoin(pushToken).on(member.id.eq(pushToken.member.id))
             .leftJoin(member.auth, auth)
             .leftJoin(memberNotification).on(memberNotification.member.id.eq(member.id))
-            .where(where.and(pushToken.deviceType.eq("ios")))
+            .where(where.and(member.container.eq("ios")))
             .fetch()
             .toSet()
             .chunked(500)

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

@@ -10,7 +10,6 @@ import kr.co.vividnext.sodalive.common.ApiResponse
 import kr.co.vividnext.sodalive.common.SodaException
 import kr.co.vividnext.sodalive.content.order.OrderService
 import kr.co.vividnext.sodalive.email.SendEmailService
-import kr.co.vividnext.sodalive.fcm.PushTokenService
 import kr.co.vividnext.sodalive.jwt.TokenProvider
 import kr.co.vividnext.sodalive.live.reservation.LiveReservationRepository
 import kr.co.vividnext.sodalive.live.room.detail.GetRoomDetailUser
@@ -83,7 +82,6 @@ class MemberService(
 
     private val orderService: OrderService,
     private val emailService: SendEmailService,
-    private val pushTokenService: PushTokenService,
     private val canPaymentService: CanPaymentService,
     private val nicknameGenerateService: NicknameGenerateService,
     private val memberNotificationService: MemberNotificationService,
@@ -129,6 +127,7 @@ class MemberService(
             gender = Gender.NONE,
             container = request.container
         )
+        member.pushToken = request.pushToken
 
         if (!request.marketingPid.isNullOrBlank()) {
             member.activePid = request.marketingPid
@@ -138,14 +137,6 @@ class MemberService(
         repository.save(member)
         agreeTermsOfServiceAndPrivacyPolicy(member, stipulationTermsOfService, stipulationPrivacyPolicy)
 
-        if (request.pushToken != null) {
-            pushTokenService.registerToken(
-                memberId = member.id!!,
-                token = request.pushToken,
-                deviceType = request.container
-            )
-        }
-
         return SignUpResponse(
             memberId = member.id!!,
             marketingPid = request.marketingPid,
@@ -244,11 +235,16 @@ class MemberService(
 
     @Transactional
     fun updatePushToken(memberId: Long, pushToken: String, container: String) {
-        pushTokenService.registerToken(
+        val existsHavePushTokenMemberList = repository.findByPushToken(pushToken = pushToken)
-            memberId = memberId,
+        for (existsHavePushTokenMember in existsHavePushTokenMemberList) {
-            token = pushToken,
+            existsHavePushTokenMember.pushToken = null
-            deviceType = container
+        }
-        )
+
+        val member = repository.findByIdOrNull(id = memberId)
+            ?: throw SodaException("로그인 정보를 확인해주세요.")
+
+        member.pushToken = pushToken
+        member.container = container
     }
 
     @Transactional
@@ -555,7 +551,6 @@ class MemberService(
             ?: throw SodaException("로그인 정보를 확인해주세요.")
 
         member.pushToken = null
-        pushTokenService.logout(memberId = memberId)
 
         val lock = getOrCreateLock(memberId = memberId)
         lock.write {
@@ -573,7 +568,6 @@ class MemberService(
             ?: throw SodaException("로그인 정보를 확인해주세요.")
 
         member.pushToken = null
-        pushTokenService.logout(memberId = memberId)
 
         val lock = getOrCreateLock(memberId = memberId)
         lock.write { tokenRepository.deleteById(memberId) }
@@ -830,14 +824,7 @@ 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
@@ -886,14 +873,7 @@ 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