From eece72bc400add4cb4e447bfd1eb21036857f293 Mon Sep 17 00:00:00 2001 From: Klaus Date: Wed, 30 Aug 2023 22:12:44 +0900 Subject: [PATCH] =?UTF-8?q?=EB=9D=BC=EC=9D=B4=EB=B8=8C=20=ED=83=AD=20?= =?UTF-8?q?=EC=83=81=EB=8B=A8=20=EC=B6=94=EC=B2=9C=EB=9D=BC=EC=9D=B4?= =?UTF-8?q?=EB=B8=8C=20-=20=EC=B0=A8=EB=8B=A8=20=EB=8B=B9=ED=95=9C=20?= =?UTF-8?q?=EC=9C=A0=EC=A0=80=EB=8A=94=20=EC=B0=A8=EB=8B=A8=ED=95=9C=20?= =?UTF-8?q?=EC=9C=A0=EC=A0=80=EC=9D=98=20=EB=B0=B0=EB=84=88=EA=B0=80=20?= =?UTF-8?q?=EC=A1=B0=ED=9A=8C=EB=90=98=EC=A7=80=20=EC=95=8A=EB=8F=84?= =?UTF-8?q?=EB=A1=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sodalive/live/recommend/LiveRecommendRepository.kt | 9 ++++++++- .../sodalive/live/recommend/LiveRecommendService.kt | 1 + 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/live/recommend/LiveRecommendRepository.kt b/src/main/kotlin/kr/co/vividnext/sodalive/live/recommend/LiveRecommendRepository.kt index 3287f3e..0f147df 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/live/recommend/LiveRecommendRepository.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/live/recommend/LiveRecommendRepository.kt @@ -19,7 +19,11 @@ class LiveRecommendRepository( @Value("\${cloud.aws.cloud-front.host}") private val cloudFrontHost: String ) { - fun getRecommendLive(memberId: Long, isAdult: Boolean): List { + fun getRecommendLive( + memberId: Long, + isBlocked: (Long) -> Boolean, + isAdult: Boolean + ): List { val dateNow = LocalDateTime.now() var where = recommendLiveCreatorBanner.startDate.loe(dateNow) @@ -41,6 +45,9 @@ class LiveRecommendRepository( .where(where) .orderBy(recommendLiveCreatorBanner.orders.asc()) .fetch() + .asSequence() + .filter { !isBlocked(it.creatorId) } + .toList() } fun getOnAirRecommendChannelList( diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/live/recommend/LiveRecommendService.kt b/src/main/kotlin/kr/co/vividnext/sodalive/live/recommend/LiveRecommendService.kt index a842415..52f3aac 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/live/recommend/LiveRecommendService.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/live/recommend/LiveRecommendService.kt @@ -14,6 +14,7 @@ class LiveRecommendService( fun getRecommendLive(member: Member): List { return repository.getRecommendLive( memberId = member.id!!, + isBlocked = { !blockMemberRepository.isBlocked(blockedMemberId = member.id!!, memberId = it) }, isAdult = member.auth != null ) }