From f081b9691f854db23b056c21fcc8fc6c133be394 Mon Sep 17 00:00:00 2001
From: Klaus <klaus@vividnext.co.kr>
Date: Sat, 9 Sep 2023 01:13:14 +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-=20=ED=85=8C=EC=8A=A4=ED=8A=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../sodalive/member/MemberRepository.kt | 21 +++++++------------
1 file changed, 8 insertions(+), 13 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 2ad3580..2d4d4cf 100644
--- a/src/main/kotlin/kr/co/vividnext/sodalive/member/MemberRepository.kt
+++ b/src/main/kotlin/kr/co/vividnext/sodalive/member/MemberRepository.kt
@@ -12,7 +12,6 @@ import kr.co.vividnext.sodalive.member.following.QCreatorFollowing.creatorFollow
import kr.co.vividnext.sodalive.member.nickname.QNicknameChangeLog.nicknameChangeLog
import kr.co.vividnext.sodalive.member.notification.QMemberNotification.memberNotification
import kr.co.vividnext.sodalive.message.QMessage.message
-import org.slf4j.LoggerFactory
import org.springframework.data.jpa.repository.JpaRepository
import org.springframework.stereotype.Repository
@@ -35,6 +34,7 @@ interface MemberQueryRepository {
fun getStartLiveRoomNotificationRecipientPushTokens(
creatorId: Long,
+ roomId: Long,
isAuth: Boolean,
container: String
): List<List<String>>
@@ -59,7 +59,6 @@ class MemberQueryRepositoryImpl(
private val queryFactory: JPAQueryFactory,
private val blockMemberRepository: BlockMemberRepository
) : MemberQueryRepository {
- private val logger = LoggerFactory.getLogger(this::class.java)
override fun findByPushToken(pushToken: String): List<Member> {
return queryFactory
.selectFrom(member)
@@ -148,6 +147,7 @@ class MemberQueryRepositoryImpl(
override fun getStartLiveRoomNotificationRecipientPushTokens(
creatorId: Long,
+ roomId: Long,
isAuth: Boolean,
container: String
): List<List<String>> {
@@ -172,16 +172,13 @@ class MemberQueryRepositoryImpl(
.from(creatorFollowing)
.where(where)
.fetch()
- .toSet()
- .chunked(500)
- logger.info("팔로잉 한 사람: $followingMemberPushToken")
-
- var where2 = liveReservation.isActive.isTrue
+ 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.getBlockedMemberList(creatorId)
@@ -189,20 +186,18 @@ class MemberQueryRepositoryImpl(
)
if (isAuth) {
- where2 = where2.and(liveReservation.member.auth.isNotNull)
+ where = where.and(liveReservation.member.auth.isNotNull)
}
val reservationMemberPushToken = queryFactory
.select(liveReservation.member.pushToken)
.from(liveReservation)
- .where(where2)
+ .where(where)
.fetch()
+
+ return (followingMemberPushToken + reservationMemberPushToken)
.toSet()
.chunked(500)
-
- logger.info("예약한 사람: $reservationMemberPushToken")
-
- return followingMemberPushToken + reservationMemberPushToken
}
override fun getUploadContentNotificationRecipientPushTokens(