klaus
/
sodalive-backend-spring-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

푸시 발송 대상 유저 조회 로직 수정

This commit is contained in:
Klaus 2023-08-09 11:56:15 +09:00
parent 0fa16762bd
commit c876378b21
1 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/kotlin/kr/co/vividnext/sodalive/member/MemberRepository.kt
View File

@ -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.following.QCreatorFollowing.creatorFollowing
import kr.co.vividnext.sodalive.member.notification.QMemberNotification.memberNotification import kr.co.vividnext.sodalive.member.notification.QMemberNotification.memberNotification
import kr.co.vividnext.sodalive.message.QMessage.message import kr.co.vividnext.sodalive.message.QMessage.message
import org.slf4j.LoggerFactory
import org.springframework.data.jpa.repository.JpaRepository import org.springframework.data.jpa.repository.JpaRepository
import org.springframework.stereotype.Repository import org.springframework.stereotype.Repository
@ -93,8 +92,6 @@ class MemberQueryRepositoryImpl(
.chunked(500) .chunked(500)
} }
private val logger = LoggerFactory.getLogger(MemberRepository::class.java)
override fun getCreateLiveRoomNotificationRecipientPushTokens( override fun getCreateLiveRoomNotificationRecipientPushTokens(
creatorId: Long, creatorId: Long,
isAuth: Boolean, isAuth: Boolean,
@ -103,13 +100,10 @@ class MemberQueryRepositoryImpl(
val member = QMember.member val member = QMember.member
val creator = QMember.member val creator = QMember.member
logger.info("creatorId: $creatorId")
logger.info("isAuth: $isAuth")
logger.info("container: $container")
var where = creatorFollowing.isActive.isTrue var where = creatorFollowing.isActive.isTrue
.and(creatorFollowing.creator.id.eq(creatorId)) .and(creatorFollowing.creator.id.eq(creatorId))
.and(creatorFollowing.member.notification.live.isTrue) .and(creatorFollowing.member.notification.live.isTrue)
.and(creatorFollowing.member.container.eq(container))
.and(creatorFollowing.member.email.notIn("admin@sodalive.net")) .and(creatorFollowing.member.email.notIn("admin@sodalive.net"))
.and( .and(
creatorFollowing.member.id.notIn( creatorFollowing.member.id.notIn(
@ -143,12 +137,12 @@ class MemberQueryRepositoryImpl(
val creator = QMember.member val creator = QMember.member
var where = creatorFollowing.isActive.isTrue var where = creatorFollowing.isActive.isTrue
.and(creator.id.eq(creatorId)) .and(creatorFollowing.creator.id.eq(creatorId))
.and(member.email.notIn("admin@sodalive.net")) .and(creatorFollowing.member.email.notIn("admin@sodalive.net"))
.and(member.container.eq(container)) .and(creatorFollowing.member.container.eq(container))
.and(memberNotification.uploadContent.isTrue) .and(creatorFollowing.member.notification.uploadContent.isTrue)
.and( .and(
member.id.notIn( creatorFollowing.member.id.notIn(
blockMemberRepository.getBlockedMemberList(creatorId) blockMemberRepository.getBlockedMemberList(creatorId)
) )
) )
@ -158,7 +152,7 @@ class MemberQueryRepositoryImpl(
} }
return queryFactory return queryFactory
.select(member.pushToken) .select(creatorFollowing.member.pushToken)
.from(creatorFollowing) .from(creatorFollowing)
.innerJoin(creatorFollowing.creator, creator) .innerJoin(creatorFollowing.creator, creator)
.innerJoin(creatorFollowing.member, member) .innerJoin(creatorFollowing.member, member)