From 6dd6be183bd7c99ceeff7bc33e81fbb8604c91b0 Mon Sep 17 00:00:00 2001 From: Klaus Date: Sat, 22 Mar 2025 06:10:28 +0900 Subject: [PATCH] =?UTF-8?q?=EB=9D=BC=EC=9D=B4=EB=B8=8C=20=EB=A9=94?= =?UTF-8?q?=EC=9D=B8=20-=20=EB=A1=9C=EA=B7=B8=EC=9D=B8=20=EC=97=86?= =?UTF-8?q?=EC=9D=B4=20=EC=A1=B0=ED=9A=8C=20=EA=B0=80=EB=8A=A5=ED=95=98?= =?UTF-8?q?=EB=8F=84=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/configs/SecurityConfig.kt | 4 ++ .../live/recommend/LiveRecommendController.kt | 4 -- .../live/recommend/LiveRecommendRepository.kt | 3 -- .../live/recommend/LiveRecommendService.kt | 37 +++++++++++++------ 4 files changed, 30 insertions(+), 18 deletions(-) diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/configs/SecurityConfig.kt b/src/main/kotlin/kr/co/vividnext/sodalive/configs/SecurityConfig.kt index efe74dc..f9e5969 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/configs/SecurityConfig.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/configs/SecurityConfig.kt @@ -81,6 +81,10 @@ class SecurityConfig( .antMatchers(HttpMethod.GET, "/faq").permitAll() .antMatchers(HttpMethod.GET, "/faq/category").permitAll() .antMatchers("/audition").permitAll() + .antMatchers("/live/recommend/channel").permitAll() + .antMatchers(HttpMethod.GET, "/live/room").permitAll() + .antMatchers(HttpMethod.GET, "/event").permitAll() + .antMatchers(HttpMethod.GET, "/live/recommend").permitAll() .anyRequest().authenticated() .and() .build() diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/live/recommend/LiveRecommendController.kt b/src/main/kotlin/kr/co/vividnext/sodalive/live/recommend/LiveRecommendController.kt index a7c005c..3b8a252 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/live/recommend/LiveRecommendController.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/live/recommend/LiveRecommendController.kt @@ -16,8 +16,6 @@ class LiveRecommendController(private val service: LiveRecommendService) { fun getRecommendLive( @AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member? ) = run { - if (member == null) throw SodaException("로그인 정보를 확인해주세요.") - ApiResponse.ok(service.getRecommendLive(member)) } @@ -25,8 +23,6 @@ class LiveRecommendController(private val service: LiveRecommendService) { fun getRecommendChannelList( @AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member? ) = run { - if (member == null) throw SodaException("로그인 정보를 확인해주세요.") - ApiResponse.ok(service.getRecommendChannelList(member)) } 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 b3c3bf5..88ed214 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 @@ -20,7 +20,6 @@ class LiveRecommendRepository( private val cloudFrontHost: String ) { fun getRecommendLive( - memberId: Long, isBlocked: (Long) -> Boolean, isAdult: Boolean ): List { @@ -51,7 +50,6 @@ class LiveRecommendRepository( } fun getOnAirRecommendChannelList( - memberId: Long, isBlocked: (Long) -> Boolean, isCreator: Boolean, isAdult: Boolean @@ -95,7 +93,6 @@ class LiveRecommendRepository( } fun getRecommendChannelList( - memberId: Long, withOutCreatorList: List, limit: Long, isBlocked: (Long) -> Boolean 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 5ec9478..67d86fa 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 @@ -12,20 +12,30 @@ class LiveRecommendService( private val blockMemberRepository: BlockMemberRepository ) { - fun getRecommendLive(member: Member): List { + fun getRecommendLive(member: Member?): List { return repository.getRecommendLive( - memberId = member.id!!, - isBlocked = { blockMemberRepository.isBlocked(blockedMemberId = member.id!!, memberId = it) }, - isAdult = member.auth != null + isBlocked = { + if (member != null) { + blockMemberRepository.isBlocked(blockedMemberId = member.id!!, memberId = it) + } else { + false + } + }, + isAdult = member?.auth != null ) } - fun getRecommendChannelList(member: Member): List { + fun getRecommendChannelList(member: Member?): List { val onAirChannelList = repository.getOnAirRecommendChannelList( - member.id!!, - isBlocked = { blockMemberRepository.isBlocked(blockedMemberId = member.id!!, memberId = it) }, - isCreator = member.role == MemberRole.CREATOR, - isAdult = member.auth != null + isBlocked = { + if (member != null) { + blockMemberRepository.isBlocked(blockedMemberId = member.id!!, memberId = it) + } else { + false + } + }, + isCreator = member?.role == MemberRole.CREATOR, + isAdult = member?.auth != null ) if (onAirChannelList.size >= 20) { @@ -35,10 +45,15 @@ class LiveRecommendService( val onAirCreatorIdList = onAirChannelList.map { it.creatorId } val notOnAirCreatorList = repository.getRecommendChannelList( - member.id!!, withOutCreatorList = onAirCreatorIdList, limit = (20 - onAirChannelList.size).toLong(), - isBlocked = { blockMemberRepository.isBlocked(blockedMemberId = member.id!!, memberId = it) } + isBlocked = { + if (member != null) { + blockMemberRepository.isBlocked(blockedMemberId = member.id!!, memberId = it) + } else { + false + } + } ) return onAirChannelList + notOnAirCreatorList