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

Compare commits

base: klaus:ba3444fd26de0b983a474d7cc727118f43edd6a8
Branches Tags
klaus:test
klaus:main
..
compare: klaus:705bf0b6b24dd8c342959f3129ee88ab81286971
Branches Tags
klaus:main
klaus:test

No commits in common. "ba3444fd26de0b983a474d7cc727118f43edd6a8" and "705bf0b6b24dd8c342959f3129ee88ab81286971" have entirely different histories.
ba3444fd26 ... 705bf0b6b2

4 changed files with 9 additions and 143 deletions
Show Stats Expand all files Collapse all files

15
src/main/kotlin/kr/co/vividnext/sodalive/live/recommend/LiveRecommendController.kt
View File

@ -5,13 +5,11 @@ import kr.co.vividnext.sodalive.common.SodaException
import kr.co.vividnext.sodalive.member.Member
import org.springframework.security.core.annotation.AuthenticationPrincipal
import org.springframework.web.bind.annotation.GetMapping
import org.springframework.web.bind.annotation.RequestMapping
import org.springframework.web.bind.annotation.RestController
@RestController
@RequestMapping("/live/recommend")
class LiveRecommendController(private val service: LiveRecommendService) {
@GetMapping
@GetMapping("/live/recommend")
fun getRecommendLive(
@AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member?
) = run {
@ -20,7 +18,7 @@ class LiveRecommendController(private val service: LiveRecommendService) {
ApiResponse.ok(service.getRecommendLive(member))
}
@GetMapping("/channel")
@GetMapping("/live/recommend/channel")
fun getRecommendChannelList(
@AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member?
) = run {
@ -28,13 +26,4 @@ class LiveRecommendController(private val service: LiveRecommendService) {
ApiResponse.ok(service.getRecommendChannelList(member))
}
@GetMapping("/following/channel/list")
fun getFollowingChannelList(
@AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member?
) = run {
if (member == null) throw SodaException("로그인 정보를 확인해주세요.")
ApiResponse.ok(service.getFollowingChannelList(member))
}
}

83
src/main/kotlin/kr/co/vividnext/sodalive/live/recommend/LiveRecommendRepository.kt
View File

@ -7,7 +7,6 @@ import kr.co.vividnext.sodalive.live.recommend.QRecommendLiveCreatorBanner.recom
import kr.co.vividnext.sodalive.live.room.QLiveRoom.liveRoom
import kr.co.vividnext.sodalive.member.MemberRole
import kr.co.vividnext.sodalive.member.QMember.member
import kr.co.vividnext.sodalive.member.following.QCreatorFollowing.creatorFollowing
import org.springframework.beans.factory.annotation.Value
import org.springframework.stereotype.Repository
import java.time.LocalDateTime
@ -45,7 +44,6 @@ class LiveRecommendRepository(
fun getOnAirRecommendChannelList(
memberId: Long,
isBlocked: (Long) -> Boolean,
isAdult: Boolean
): List<GetRecommendChannelResponse> {
var where = member.role.eq(MemberRole.CREATOR)
@ -77,16 +75,12 @@ class LiveRecommendRepository(
.orderBy(Expressions.numberTemplate(Double::class.java, "function('rand')").asc())
.limit(20)
.fetch()
.asSequence()
.filter { !isBlocked(it.creatorId) }
.toList()
}
fun getRecommendChannelList(
memberId: Long,
withOutCreatorList: List<Long>,
limit: Long,
isBlocked: (Long) -> Boolean
limit: Long
): List<GetRecommendChannelResponse> {
val where = member.role.eq(MemberRole.CREATOR)
.and(member.isActive.isTrue)
@ -107,79 +101,4 @@ class LiveRecommendRepository(
.limit(limit)
.fetch()
}
fun getOnAirFollowingChannelList(
memberId: Long,
isBlocked: (Long) -> Boolean,
isAdult: Boolean
): List<GetRecommendChannelResponse> {
var where = member.role.eq(MemberRole.CREATOR)
.and(member.isActive.isTrue)
if (!isAdult) {
where = where.and(liveRoom.isAdult.isFalse)
}
return queryFactory
.select(
Projections.constructor(
GetRecommendChannelResponse::class.java,
member.id,
member.nickname,
member.profileImage.prepend("/").prepend(cloudFrontHost),
Expressions.asBoolean(true)
)
)
.from(liveRoom, creatorFollowing)
.rightJoin(liveRoom.member, member)
.innerJoin(creatorFollowing.creator, member)
.where(
where
.and(liveRoom.member.id.eq(creatorFollowing.creator.id))
.and(creatorFollowing.isActive.isTrue)
.and(creatorFollowing.member.id.eq(memberId))
.and(liveRoom.isActive.isTrue)
.and(liveRoom.channelName.isNotNull)
.and(liveRoom.channelName.isNotEmpty)
)
.groupBy(member.id)
.orderBy(Expressions.numberTemplate(Double::class.java, "function('rand')").asc())
.limit(20)
.fetch()
.asSequence()
.filter { !isBlocked(it.creatorId) }
.toList()
}
fun getFollowingChannelList(
memberId: Long,
withOutCreatorList: List<Long>,
limit: Long,
isBlocked: (Long) -> Boolean
): List<GetRecommendChannelResponse> {
val where = member.role.eq(MemberRole.CREATOR)
.and(member.isActive.isTrue)
return queryFactory
.select(
Projections.constructor(
GetRecommendChannelResponse::class.java,
member.id,
member.nickname,
member.profileImage.prepend("/").prepend(cloudFrontHost),
Expressions.asBoolean(false)
)
)
.from(creatorFollowing)
.innerJoin(creatorFollowing.creator, member)
.where(
where
.and(member.id.notIn(withOutCreatorList))
.and(creatorFollowing.isActive.isTrue)
.and(creatorFollowing.member.id.eq(memberId))
)
.orderBy(Expressions.numberTemplate(Double::class.java, "function('rand')").asc())
.limit(limit)
.fetch()
}
}

40
src/main/kotlin/kr/co/vividnext/sodalive/live/recommend/LiveRecommendService.kt
View File

@ -1,14 +1,10 @@
package kr.co.vividnext.sodalive.live.recommend
import kr.co.vividnext.sodalive.member.Member
import kr.co.vividnext.sodalive.member.block.BlockMemberRepository
import org.springframework.stereotype.Service
@Service
class LiveRecommendService(
private val repository: LiveRecommendRepository,
private val blockMemberRepository: BlockMemberRepository
) {
class LiveRecommendService(private val repository: LiveRecommendRepository) {
fun getRecommendLive(member: Member): List<GetRecommendLiveResponse> {
return repository.getRecommendLive(
@ -18,11 +14,7 @@ class LiveRecommendService(
}
fun getRecommendChannelList(member: Member): List<GetRecommendChannelResponse> {
val onAirChannelList = repository.getOnAirRecommendChannelList(
member.id!!,
isBlocked = { blockMemberRepository.isBlocked(blockedMemberId = member.id!!, memberId = it) },
isAdult = member.auth != null
)
val onAirChannelList = repository.getOnAirRecommendChannelList(member.id!!, isAdult = member.auth != null)
if (onAirChannelList.size >= 20) {
return onAirChannelList
@ -35,35 +27,9 @@ class LiveRecommendService(
val notOnAirCreatorList = repository.getRecommendChannelList(
member.id!!,
withOutCreatorList = onAirCreatorIdList,
limit = (20 - onAirChannelList.size).toLong(),
isBlocked = { blockMemberRepository.isBlocked(blockedMemberId = member.id!!, memberId = it) }
limit = (20 - onAirChannelList.size).toLong()
)
return onAirChannelList + notOnAirCreatorList
}
fun getFollowingChannelList(member: Member): List<GetRecommendChannelResponse> {
val onAirFollowingChannelList = repository.getOnAirFollowingChannelList(
memberId = member.id!!,
isBlocked = { blockMemberRepository.isBlocked(blockedMemberId = member.id!!, memberId = it) },
isAdult = member.auth != null
)
if (onAirFollowingChannelList.size >= 20) {
return onAirFollowingChannelList
}
val onAirCreatorIdList = onAirFollowingChannelList.asSequence()
.map { it.creatorId }
.toList()
val notOnAirFollowingChannelList = repository.getFollowingChannelList(
memberId = member.id!!,
withOutCreatorList = onAirCreatorIdList,
limit = (20 - onAirCreatorIdList.size).toLong(),
isBlocked = { blockMemberRepository.isBlocked(blockedMemberId = member.id!!, memberId = it) }
)
return onAirFollowingChannelList + notOnAirFollowingChannelList
}
}

14
src/main/kotlin/kr/co/vividnext/sodalive/live/room/LiveRoomService.kt
View File

@ -115,13 +115,9 @@ 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))
@ -142,17 +138,13 @@ class LiveRoomService(
channelName = it.channelName,
managerNickname = it.member!!.nickname,
managerId = it.member!!.id!!,
tags = it.tags
.asSequence()
.filter { tag -> tag.tag.isActive }
.map { tag -> tag.tag.tag }
.toList(),
tags = listOf(),
coverImageUrl = if (it.coverImage!!.startsWith("https://")) {
it.coverImage!!
} else {
"$cloudFrontHost/${it.coverImage!!}"
},
isReservation = reservations.isNotEmpty(),
isReservation = false,
isPrivateRoom = it.type == LiveRoomType.PRIVATE
)
}
@ -750,7 +742,7 @@ class LiveRoomService(
isSpeaker = isSpeaker,
isManager = isManager,
isFollowing = isFollowing,
isBlock = blockMemberRepository.isBlocked(blockedMemberId = userResponse.id, memberId = memberResponse.id)
isBlock = false
)
}