주문목록 - 크리에이터 닉네임 추가 #29

Merged
klaus merged 16 commits from test into main 2023-09-08 16:29:31 +00:00
1 changed files with 9 additions and 3 deletions
Showing only changes of commit 06bb2ea228 - Show all commits

View File

@ -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<Member> {
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
}