From 06bb2ea228b0433c52414b78fff491137da88ebc Mon Sep 17 00:00:00 2001 From: Klaus Date: Sat, 9 Sep 2023 00:51:38 +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 --- .../co/vividnext/sodalive/member/MemberRepository.kt | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 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 d89faea..2ad3580 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/member/MemberRepository.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/member/MemberRepository.kt @@ -12,6 +12,7 @@ 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 @@ -58,6 +59,7 @@ 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 { return queryFactory .selectFrom(member) @@ -173,7 +175,9 @@ class MemberQueryRepositoryImpl( .toSet() .chunked(500) - where = liveReservation.isActive.isTrue + logger.info("팔로잉 한 사람: $followingMemberPushToken") + + var where2 = liveReservation.isActive.isTrue .and(liveReservation.member.notification.live.isTrue) .and(liveReservation.member.container.eq(container)) .and(liveReservation.member.email.notIn("admin@sodalive.net")) @@ -185,17 +189,19 @@ class MemberQueryRepositoryImpl( ) if (isAuth) { - where = where.and(liveReservation.member.auth.isNotNull) + where2 = where2.and(liveReservation.member.auth.isNotNull) } val reservationMemberPushToken = queryFactory .select(liveReservation.member.pushToken) .from(liveReservation) - .where(where) + .where(where2) .fetch() .toSet() .chunked(500) + logger.info("예약한 사람: $reservationMemberPushToken") + return followingMemberPushToken + reservationMemberPushToken }