From a285e30108fafd8779e36a41864da51da8068df9 Mon Sep 17 00:00:00 2001
From: Klaus <klaus@vividnext.co.kr>
Date: Fri, 1 Sep 2023 17:29:57 +0900
Subject: [PATCH] =?UTF-8?q?=EB=9D=BC=EC=9D=B4=EB=B8=8C=20=EC=B7=A8?=
 =?UTF-8?q?=EC=86=8C=20=ED=91=B8=EC=8B=9C=20=EB=B0=9C=EC=86=A1=20=EB=A1=9C?=
 =?UTF-8?q?=EC=A7=81=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sodalive/member/MemberRepository.kt       | 26 ++++++++-----------
 1 file changed, 11 insertions(+), 15 deletions(-)

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 6d8c0cf..806240e 100644
--- a/src/main/kotlin/kr/co/vividnext/sodalive/member/MemberRepository.kt
+++ b/src/main/kotlin/kr/co/vividnext/sodalive/member/MemberRepository.kt
@@ -361,29 +361,25 @@ class MemberQueryRepositoryImpl(
     }
 
     override fun getPushTokenFromReservationList(roomId: Long): Map<String, List<List<String>>> {
-        val query = queryFactory
+        val where = liveRoom.id.eq(roomId)
+            .and(liveReservation.isActive.isTrue)
+
+        val aosPushTokens = queryFactory
             .select(liveReservation.member.pushToken)
             .from(liveReservation)
             .innerJoin(liveReservation.room, liveRoom)
             .innerJoin(liveReservation.member, member)
-
-        val where = liveRoom.id.eq(roomId)
-            .and(liveReservation.isActive.isTrue)
-
-        val aosPushTokens = query
-            .where(
-                where
-                    .and(member.container.eq("aos"))
-            )
+            .where(where.and(member.container.eq("aos")))
             .fetch()
             .toSet()
             .chunked(500)
 
-        val iosPushTokens = query
-            .where(
-                where
-                    .and(member.container.eq("ios"))
-            )
+        val iosPushTokens = queryFactory
+            .select(liveReservation.member.pushToken)
+            .from(liveReservation)
+            .innerJoin(liveReservation.room, liveRoom)
+            .innerJoin(liveReservation.member, member)
+            .where(where.and(member.container.eq("ios")))
             .fetch()
             .toSet()
             .chunked(500)