From c876378b219a575d0e6f5286f04158b89c8c2c65 Mon Sep 17 00:00:00 2001 From: Klaus Date: Wed, 9 Aug 2023 11:56:15 +0900 Subject: [PATCH] =?UTF-8?q?=ED=91=B8=EC=8B=9C=20=EB=B0=9C=EC=86=A1=20?= =?UTF-8?q?=EB=8C=80=EC=83=81=20=EC=9C=A0=EC=A0=80=20=EC=A1=B0=ED=9A=8C=20?= =?UTF-8?q?=EB=A1=9C=EC=A7=81=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sodalive/member/MemberRepository.kt | 20 +++++++------------ 1 file changed, 7 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 db53dc1..615774c 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/member/MemberRepository.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/member/MemberRepository.kt @@ -9,7 +9,6 @@ import kr.co.vividnext.sodalive.member.block.BlockMemberRepository import kr.co.vividnext.sodalive.member.following.QCreatorFollowing.creatorFollowing 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 @@ -93,8 +92,6 @@ class MemberQueryRepositoryImpl( .chunked(500) } - private val logger = LoggerFactory.getLogger(MemberRepository::class.java) - override fun getCreateLiveRoomNotificationRecipientPushTokens( creatorId: Long, isAuth: Boolean, @@ -103,13 +100,10 @@ class MemberQueryRepositoryImpl( val member = QMember.member val creator = QMember.member - logger.info("creatorId: $creatorId") - logger.info("isAuth: $isAuth") - logger.info("container: $container") - var where = creatorFollowing.isActive.isTrue .and(creatorFollowing.creator.id.eq(creatorId)) .and(creatorFollowing.member.notification.live.isTrue) + .and(creatorFollowing.member.container.eq(container)) .and(creatorFollowing.member.email.notIn("admin@sodalive.net")) .and( creatorFollowing.member.id.notIn( @@ -143,12 +137,12 @@ class MemberQueryRepositoryImpl( val creator = QMember.member var where = creatorFollowing.isActive.isTrue - .and(creator.id.eq(creatorId)) - .and(member.email.notIn("admin@sodalive.net")) - .and(member.container.eq(container)) - .and(memberNotification.uploadContent.isTrue) + .and(creatorFollowing.creator.id.eq(creatorId)) + .and(creatorFollowing.member.email.notIn("admin@sodalive.net")) + .and(creatorFollowing.member.container.eq(container)) + .and(creatorFollowing.member.notification.uploadContent.isTrue) .and( - member.id.notIn( + creatorFollowing.member.id.notIn( blockMemberRepository.getBlockedMemberList(creatorId) ) ) @@ -158,7 +152,7 @@ class MemberQueryRepositoryImpl( } return queryFactory - .select(member.pushToken) + .select(creatorFollowing.member.pushToken) .from(creatorFollowing) .innerJoin(creatorFollowing.creator, creator) .innerJoin(creatorFollowing.member, member)