차단유저 필터링 로직 추가
This commit is contained in:
@@ -115,9 +115,13 @@ class LiveRoomService(
|
||||
isAdult = member.auth != null
|
||||
)
|
||||
.asSequence()
|
||||
.filter { !blockMemberRepository.isBlocked(blockedMemberId = member.id!!, memberId = it.member!!.id!!) }
|
||||
.map {
|
||||
val roomInfo = roomInfoRepository.findByIdOrNull(it.id!!)
|
||||
|
||||
val reservations = it.reservations
|
||||
.filter { reservation -> reservation.member!!.id!! == member.id!! && reservation.isActive }
|
||||
|
||||
val beginDateTime = it.beginDateTime
|
||||
.atZone(ZoneId.of("UTC"))
|
||||
.withZoneSameInstant(ZoneId.of(timezone))
|
||||
@@ -138,13 +142,17 @@ class LiveRoomService(
|
||||
channelName = it.channelName,
|
||||
managerNickname = it.member!!.nickname,
|
||||
managerId = it.member!!.id!!,
|
||||
tags = listOf(),
|
||||
tags = it.tags
|
||||
.asSequence()
|
||||
.filter { tag -> tag.tag.isActive }
|
||||
.map { tag -> tag.tag.tag }
|
||||
.toList(),
|
||||
coverImageUrl = if (it.coverImage!!.startsWith("https://")) {
|
||||
it.coverImage!!
|
||||
} else {
|
||||
"$cloudFrontHost/${it.coverImage!!}"
|
||||
},
|
||||
isReservation = false,
|
||||
isReservation = reservations.isNotEmpty(),
|
||||
isPrivateRoom = it.type == LiveRoomType.PRIVATE
|
||||
)
|
||||
}
|
||||
@@ -742,7 +750,7 @@ class LiveRoomService(
|
||||
isSpeaker = isSpeaker,
|
||||
isManager = isManager,
|
||||
isFollowing = isFollowing,
|
||||
isBlock = false
|
||||
isBlock = blockMemberRepository.isBlocked(blockedMemberId = userResponse.id, memberId = memberResponse.id)
|
||||
)
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user