From 24b861830656d2bfde6e6d5e3483199adb4add57 Mon Sep 17 00:00:00 2001
From: Klaus <klaus@vividnext.co.kr>
Date: Mon, 2 Oct 2023 21:27:03 +0900
Subject: [PATCH 1/3] =?UTF-8?q?=EB=9D=BC=EC=9D=B4=EB=B8=8C=20=EC=8B=9C?=
 =?UTF-8?q?=EC=9E=91=20=EC=95=8C=EB=A6=BC=20-=20=EC=95=8C=EB=A6=BC=20?=
 =?UTF-8?q?=EB=B0=9B=EC=9D=84=20=EC=9C=A0=EC=A0=80=20=EC=A1=B0=ED=9A=8C?=
 =?UTF-8?q?=EC=97=90=EC=84=9C=20=EC=97=90=EB=9F=AC=EA=B0=80=20=EB=B0=9C?=
 =?UTF-8?q?=EC=83=9D=ED=95=98=EB=8A=94=20=EB=B2=84=EA=B7=B8=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

---
 .../kotlin/kr/co/vividnext/sodalive/member/MemberRepository.kt  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/member/MemberRepository.kt b/src/main/kotlin/kr/co/vividnext/sodalive/member/MemberRepository.kt
index 1571b29..281a486 100644
--- a/src/main/kotlin/kr/co/vividnext/sodalive/member/MemberRepository.kt
+++ b/src/main/kotlin/kr/co/vividnext/sodalive/member/MemberRepository.kt
@@ -163,7 +163,7 @@ class MemberQueryRepositoryImpl(
                 )
             )
             .and(creatorFollowing.member.pushToken.isNotNull)
-            .or(member.id.eq(4).and(member.pushToken.isNotNull))
+            .or(creatorFollowing.member.id.eq(4).and(member.pushToken.isNotNull))
 
         if (isAuth) {
             where = where.and(creatorFollowing.member.auth.isNotNull)

From 13aa9838cd5f793d26120ac1ec18b8509f554d07 Mon Sep 17 00:00:00 2001
From: Klaus <klaus@vividnext.co.kr>
Date: Mon, 2 Oct 2023 21:40:04 +0900
Subject: [PATCH 2/3] =?UTF-8?q?=EB=9D=BC=EC=9D=B4=EB=B8=8C=20=EC=8B=9C?=
 =?UTF-8?q?=EC=9E=91=20=EC=95=8C=EB=A6=BC=20-=20=EC=95=8C=EB=A6=BC=20?=
 =?UTF-8?q?=EB=B0=9B=EC=9D=84=20=EC=9C=A0=EC=A0=80=20=EC=A1=B0=ED=9A=8C?=
 =?UTF-8?q?=EC=97=90=EC=84=9C=20=EC=97=90=EB=9F=AC=EA=B0=80=20=EB=B0=9C?=
 =?UTF-8?q?=EC=83=9D=ED=95=98=EB=8A=94=20=EB=B2=84=EA=B7=B8=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

---
 .../co/vividnext/sodalive/member/MemberRepository.kt   | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/member/MemberRepository.kt b/src/main/kotlin/kr/co/vividnext/sodalive/member/MemberRepository.kt
index 281a486..765fc74 100644
--- a/src/main/kotlin/kr/co/vividnext/sodalive/member/MemberRepository.kt
+++ b/src/main/kotlin/kr/co/vividnext/sodalive/member/MemberRepository.kt
@@ -152,6 +152,9 @@ class MemberQueryRepositoryImpl(
         isAuth: Boolean,
         container: String
     ): List<List<String>> {
+        val member = QMember.member
+        val creator = QMember.member
+
         var where = creatorFollowing.isActive.isTrue
             .and(creatorFollowing.creator.id.eq(creatorId))
             .and(creatorFollowing.member.notification.live.isTrue)
@@ -172,6 +175,10 @@ class MemberQueryRepositoryImpl(
         val followingMemberPushToken = queryFactory
             .select(creatorFollowing.member.pushToken)
             .from(creatorFollowing)
+            .innerJoin(creatorFollowing.creator, creator)
+            .innerJoin(creatorFollowing.member, member)
+            .innerJoin(member.notification, memberNotification)
+            .leftJoin(member.auth, auth)
             .where(where)
             .fetch()
 
@@ -194,6 +201,9 @@ class MemberQueryRepositoryImpl(
         val reservationMemberPushToken = queryFactory
             .select(liveReservation.member.pushToken)
             .from(liveReservation)
+            .innerJoin(liveReservation.member, member)
+            .innerJoin(member.notification, memberNotification)
+            .leftJoin(member.auth, auth)
             .where(where)
             .fetch()
 

From 5b0be30c5b6625c26db15beed451b0ee4c15e962 Mon Sep 17 00:00:00 2001
From: Klaus <klaus@vividnext.co.kr>
Date: Mon, 2 Oct 2023 21:46:51 +0900
Subject: [PATCH 3/3] =?UTF-8?q?=EB=9D=BC=EC=9D=B4=EB=B8=8C=20=EC=8B=9C?=
 =?UTF-8?q?=EC=9E=91=20=EC=95=8C=EB=A6=BC=20-=20=EB=B6=88=ED=95=84?=
 =?UTF-8?q?=EC=9A=94=ED=95=9C=20=EB=A1=9C=EA=B7=B8=20=EC=A0=9C=EA=B1=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/kotlin/kr/co/vividnext/sodalive/fcm/FcmEvent.kt | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/fcm/FcmEvent.kt b/src/main/kotlin/kr/co/vividnext/sodalive/fcm/FcmEvent.kt
index 243ecee..37b4820 100644
--- a/src/main/kotlin/kr/co/vividnext/sodalive/fcm/FcmEvent.kt
+++ b/src/main/kotlin/kr/co/vividnext/sodalive/fcm/FcmEvent.kt
@@ -2,7 +2,6 @@ package kr.co.vividnext.sodalive.fcm
 
 import kr.co.vividnext.sodalive.content.comment.AudioContentCommentRepository
 import kr.co.vividnext.sodalive.member.MemberRepository
-import org.slf4j.LoggerFactory
 import org.springframework.scheduling.annotation.Async
 import org.springframework.stereotype.Component
 import org.springframework.transaction.annotation.Propagation
@@ -35,8 +34,6 @@ class FcmSendListener(
     private val memberRepository: MemberRepository,
     private val contentCommentRepository: AudioContentCommentRepository
 ) {
-    private val logger = LoggerFactory.getLogger(this::class.java)
-
     @Async
     @TransactionalEventListener
     @Transactional(propagation = Propagation.REQUIRES_NEW)
@@ -125,7 +122,6 @@ class FcmSendListener(
                         container = fcmEvent.container
                     )
 
-                    logger.info("토큰 - $pushTokens")
                     for (tokens in pushTokens) {
                         pushService.send(
                             tokens = tokens,