From 8b30c1c3192951171c33ac01f2273ec7ae78bd70 Mon Sep 17 00:00:00 2001
From: Klaus <klaus@vividnext.co.kr>
Date: Thu, 7 Sep 2023 22:18:41 +0900
Subject: [PATCH] =?UTF-8?q?=EB=9D=BC=EC=9D=B4=EB=B8=8C=20=EC=98=88?=
 =?UTF-8?q?=EC=95=BD=20=ED=9B=84=20=EC=8B=9C=EC=9E=91=20=EC=8B=9C=20?=
 =?UTF-8?q?=ED=91=B8=EC=8B=9C=20-=20join=20=EC=A0=9C=EA=B1=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../kr/co/vividnext/sodalive/fcm/FcmEvent.kt       |  5 +++++
 .../vividnext/sodalive/member/MemberRepository.kt  | 14 ++------------
 2 files changed, 7 insertions(+), 12 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 bd8d174..6d5cc6b 100644
--- a/src/main/kotlin/kr/co/vividnext/sodalive/fcm/FcmEvent.kt
+++ b/src/main/kotlin/kr/co/vividnext/sodalive/fcm/FcmEvent.kt
@@ -2,6 +2,7 @@ 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
@@ -34,10 +35,14 @@ 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)
     fun send(fcmEvent: FcmEvent) {
+        logger.info("발송타입 - ${fcmEvent.type}")
+
         when (fcmEvent.type) {
             FcmEventType.ALL -> {
                 if (fcmEvent.container.isNotBlank()) {
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 806240e..d89faea 100644
--- a/src/main/kotlin/kr/co/vividnext/sodalive/member/MemberRepository.kt
+++ b/src/main/kotlin/kr/co/vividnext/sodalive/member/MemberRepository.kt
@@ -149,9 +149,6 @@ 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)
@@ -165,16 +162,12 @@ class MemberQueryRepositoryImpl(
             .and(creatorFollowing.member.pushToken.isNotNull)
 
         if (isAuth) {
-            where = where.and(member.auth.isNotNull)
+            where = where.and(creatorFollowing.member.auth.isNotNull)
         }
 
         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()
             .toSet()
@@ -192,15 +185,12 @@ class MemberQueryRepositoryImpl(
             )
 
         if (isAuth) {
-            where = where.and(member.auth.isNotNull)
+            where = where.and(liveReservation.member.auth.isNotNull)
         }
 
         val reservationMemberPushToken = queryFactory
             .select(liveReservation.member.pushToken)
             .from(liveReservation)
-            .innerJoin(liveReservation.member, member)
-            .innerJoin(liveReservation.room, liveRoom)
-            .innerJoin(liveRoom.member, creator)
             .where(where)
             .fetch()
             .toSet()