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

Compare commits

base: klaus:f00ea03fad7b7ed54c782d67b2a68ec44112df03
Branches Tags
klaus:test
klaus:main
..
compare: klaus:f22e7b9ad12a366c0d5d49e6b11e644d2fd1c0b7
Branches Tags
klaus:main
klaus:test

No commits in common. "f00ea03fad7b7ed54c782d67b2a68ec44112df03" and "f22e7b9ad12a366c0d5d49e6b11e644d2fd1c0b7" have entirely different histories.
f00ea03fad ... f22e7b9ad1

16 changed files with 115 additions and 232 deletions
Show Stats Expand all files Collapse all files

4
src/main/kotlin/kr/co/vividnext/sodalive/audition/AuditionController.kt
View File

@ -18,11 +18,13 @@ class AuditionController(private val service: AuditionService) {
@AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member?,
pageable: Pageable
) = run {
if (member == null) throw SodaException("로그인 정보를 확인해주세요.")
ApiResponse.ok(
service.getAuditionList(
offset = pageable.offset,
limit = pageable.pageSize.toLong(),
isAdult = member?.auth != null
isAdult = member.auth != null
)
)
}

11
src/main/kotlin/kr/co/vividnext/sodalive/configs/SecurityConfig.kt
View File

@ -8,7 +8,6 @@ import kr.co.vividnext.sodalive.jwt.JwtFilter
import kr.co.vividnext.sodalive.jwt.TokenProvider
import org.springframework.context.annotation.Bean
import org.springframework.context.annotation.Configuration
import org.springframework.http.HttpMethod
import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity
import org.springframework.security.config.annotation.web.builders.HttpSecurity
import org.springframework.security.config.annotation.web.builders.WebSecurity
@ -75,16 +74,6 @@ class SecurityConfig(
.antMatchers("/stplat/terms_of_service").permitAll()
.antMatchers("/stplat/privacy_policy").permitAll()
.antMatchers("/charge/ads").permitAll()
.antMatchers("/v2/audio-content/main/home").permitAll()
.antMatchers("/v2/audio-content/main/home/popular-content-by-creator").permitAll()
.antMatchers("/v2/audio-content/main/home/content/ranking").permitAll()
.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()

4
src/main/kotlin/kr/co/vividnext/sodalive/content/AudioContentController.kt
View File

@ -184,6 +184,8 @@ class AudioContentController(private val service: AudioContentService) {
@AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member?,
pageable: Pageable
) = run {
if (member == null) throw SodaException("로그인 정보를 확인해주세요.")
val currentDateTime = LocalDateTime.now()
val startDate = currentDateTime
.withHour(15)
@ -196,7 +198,7 @@ class AudioContentController(private val service: AudioContentService) {
ApiResponse.ok(
service.getAudioContentRanking(
isAdult = member?.auth != null && (isAdultContentVisible ?: true),
isAdult = member.auth != null && (isAdultContentVisible ?: true),
contentType = contentType ?: ContentType.ALL,
startDate = startDate,
endDate = endDate,

6
src/main/kotlin/kr/co/vividnext/sodalive/content/main/banner/AudioContentBannerService.kt
View File

@ -13,12 +13,12 @@ class AudioContentBannerService(
@Value("\${cloud.aws.cloud-front.host}")
private val imageHost: String
) {
fun getBannerList(tabId: Long, memberId: Long?, isAdult: Boolean): List<GetAudioContentBannerResponse> {
fun getBannerList(tabId: Long, memberId: Long, isAdult: Boolean): List<GetAudioContentBannerResponse> {
return repository.getAudioContentMainBannerList(tabId, isAdult)
.filter {
if (it.type == AudioContentBannerType.CREATOR && it.creator != null && memberId != null) {
if (it.type == AudioContentBannerType.CREATOR && it.creator != null) {
!blockMemberRepository.isBlocked(blockedMemberId = memberId, memberId = it.creator!!.id!!)
} else if (it.type == AudioContentBannerType.SERIES && it.series != null && memberId != null) {
} else if (it.type == AudioContentBannerType.SERIES && it.series != null) {
!blockMemberRepository.isBlocked(blockedMemberId = memberId, memberId = it.series!!.member!!.id!!)
} else {
true

24
src/main/kotlin/kr/co/vividnext/sodalive/content/main/tab/home/AudioContentMainTabHomeController.kt
View File

@ -1,6 +1,7 @@
package kr.co.vividnext.sodalive.content.main.tab.home
import kr.co.vividnext.sodalive.common.ApiResponse
import kr.co.vividnext.sodalive.common.SodaException
import kr.co.vividnext.sodalive.content.ContentType
import kr.co.vividnext.sodalive.member.Member
import org.springframework.security.core.annotation.AuthenticationPrincipal
@ -18,6 +19,8 @@ class AudioContentMainTabHomeController(private val service: AudioContentMainTab
@RequestParam("contentType", required = false) contentType: ContentType? = null,
@AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member?
) = run {
if (member == null) throw SodaException("로그인 정보를 확인해주세요.")
ApiResponse.ok(
service.fetchData(
isAdultContentVisible = isAdultContentVisible ?: true,
@ -34,29 +37,14 @@ class AudioContentMainTabHomeController(private val service: AudioContentMainTab
@RequestParam("contentType", required = false) contentType: ContentType? = null,
@AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member?
) = run {
if (member == null) throw SodaException("로그인 정보를 확인해주세요.")
ApiResponse.ok(
service.getPopularContentByCreator(
creatorId = creatorId,
isAdult = member?.auth != null && (isAdultContentVisible ?: true),
isAdult = member.auth != null && (isAdultContentVisible ?: true),
contentType = contentType ?: ContentType.ALL
)
)
}
@GetMapping("/content/ranking")
fun getContentRanking(
@RequestParam("sort-type", required = false) sortType: String? = "매출",
@RequestParam("isAdultContentVisible", required = false) isAdultContentVisible: Boolean? = null,
@RequestParam("contentType", required = false) contentType: ContentType? = null,
@AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member?
) = run {
ApiResponse.ok(
service.getContentRanking(
sortType = sortType ?: "매출",
isAdultContentVisible = isAdultContentVisible ?: true,
contentType = contentType ?: ContentType.ALL,
member
)
)
}
}

42
src/main/kotlin/kr/co/vividnext/sodalive/content/main/tab/home/AudioContentMainTabHomeService.kt
View File

@ -23,7 +23,7 @@ class AudioContentMainTabHomeService(
fun fetchData(
isAdultContentVisible: Boolean,
contentType: ContentType,
member: Member?
member: Member
): GetContentMainTabHomeResponse {
// 주간 랭킹 기간
val currentDateTime = LocalDateTime.now()
@ -42,7 +42,7 @@ class AudioContentMainTabHomeService(
val formattedLastMonday = startDate.format(startDateFormatter)
val formattedLastSunday = endDate.format(endDateFormatter)
val isAdult = member?.auth != null && isAdultContentVisible
val isAdult = member.auth != null && isAdultContentVisible
// 최근 공지사항
val latestNotice = noticeService.getLatestNotice()
@ -50,19 +50,19 @@ class AudioContentMainTabHomeService(
// 메인 배너 (홈)
val contentBannerList = bannerService.getBannerList(
tabId = 1,
memberId = member?.id,
memberId = member.id!!,
isAdult = isAdult
)
// 인기 크리에이터
val rankCreatorList = rankingService.getCreatorRanking(
memberId = member?.id,
memberId = member.id!!,
rankingDate = "$formattedLastMonday ~ $formattedLastSunday"
)
// 인기 시리즈
val rankSeriesList = rankingService.getSeriesRanking(
memberId = member?.id,
memberId = member.id!!,
isAdult = isAdult,
contentType = contentType,
startDate = startDate.minusDays(1),
@ -71,7 +71,7 @@ class AudioContentMainTabHomeService(
// 인기 콘텐츠
val rankContentList = rankingService.getContentRanking(
memberId = member?.id,
memberId = member.id!!,
isAdult = isAdult,
contentType = contentType,
startDate = startDate.minusDays(1),
@ -82,7 +82,7 @@ class AudioContentMainTabHomeService(
val eventBannerList = eventService.getEventList(isAdult = isAdult)
val contentRankCreatorList = rankingService.fetchCreatorBySellContentCountRankTop20(
memberId = member?.id,
memberId = member.id!!,
isAdult = isAdult,
contentType = contentType,
startDate = startDate.minusDays(1),
@ -123,32 +123,4 @@ class AudioContentMainTabHomeService(
contentType = contentType
)
}
fun getContentRanking(
sortType: String,
isAdultContentVisible: Boolean,
contentType: ContentType,
member: Member?
): List<GetAudioContentRankingItem> {
val isAdult = member?.auth != null && isAdultContentVisible
val currentDateTime = LocalDateTime.now()
val startDate = currentDateTime
.withHour(15)
.withMinute(0)
.withSecond(0)
.minusWeeks(1)
.with(TemporalAdjusters.previousOrSame(DayOfWeek.MONDAY))
val endDate = startDate
.plusDays(6)
return rankingService.getContentRanking(
memberId = member?.id,
isAdult = isAdult,
contentType = contentType,
startDate = startDate.minusDays(1),
endDate = endDate,
sortType = sortType
)
}
}

2
src/main/kotlin/kr/co/vividnext/sodalive/faq/FaqController.kt
View File

@ -31,7 +31,7 @@ class FaqController(private val service: FaqService) {
@DeleteMapping("/{id}")
@PreAuthorize("hasRole('ADMIN')")
fun deleteFaq(@PathVariable id: Long) = ApiResponse.ok(service.delete(id), "삭제되었습니다.")
fun deleteCan(@PathVariable id: Long) = ApiResponse.ok(service.delete(id), "삭제되었습니다.")
@GetMapping
fun getFaqList(@RequestParam("category") category: String) = ApiResponse.ok(service.getFaqList(category))

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

@ -16,6 +16,8 @@ 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))
}
@ -23,6 +25,8 @@ 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))
}

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

@ -20,6 +20,7 @@ class LiveRecommendRepository(
private val cloudFrontHost: String
) {
fun getRecommendLive(
memberId: Long,
isBlocked: (Long) -> Boolean,
isAdult: Boolean
): List<GetRecommendLiveResponse> {
@ -50,6 +51,7 @@ class LiveRecommendRepository(
}
fun getOnAirRecommendChannelList(
memberId: Long,
isBlocked: (Long) -> Boolean,
isCreator: Boolean,
isAdult: Boolean
@ -93,6 +95,7 @@ class LiveRecommendRepository(
}
fun getRecommendChannelList(
memberId: Long,
withOutCreatorList: List<Long>,
limit: Long,
isBlocked: (Long) -> Boolean

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

@ -12,30 +12,20 @@ class LiveRecommendService(
private val blockMemberRepository: BlockMemberRepository
) {
fun getRecommendLive(member: Member?): List<GetRecommendLiveResponse> {
fun getRecommendLive(member: Member): List<GetRecommendLiveResponse> {
return repository.getRecommendLive(
isBlocked = {
if (member != null) {
blockMemberRepository.isBlocked(blockedMemberId = member.id!!, memberId = it)
} else {
false
}
},
isAdult = member?.auth != null
memberId = member.id!!,
isBlocked = { blockMemberRepository.isBlocked(blockedMemberId = member.id!!, memberId = it) },
isAdult = member.auth != null
)
}
fun getRecommendChannelList(member: Member?): List<GetRecommendChannelResponse> {
fun getRecommendChannelList(member: Member): List<GetRecommendChannelResponse> {
val onAirChannelList = repository.getOnAirRecommendChannelList(
isBlocked = {
if (member != null) {
blockMemberRepository.isBlocked(blockedMemberId = member.id!!, memberId = it)
} else {
false
}
},
isCreator = member?.role == MemberRole.CREATOR,
isAdult = member?.auth != null
member.id!!,
isBlocked = { blockMemberRepository.isBlocked(blockedMemberId = member.id!!, memberId = it) },
isCreator = member.role == MemberRole.CREATOR,
isAdult = member.auth != null
)
if (onAirChannelList.size >= 20) {
@ -45,15 +35,10 @@ class LiveRecommendService(
val onAirCreatorIdList = onAirChannelList.map { it.creatorId }
val notOnAirCreatorList = repository.getRecommendChannelList(
member.id!!,
withOutCreatorList = onAirCreatorIdList,
limit = (20 - onAirChannelList.size).toLong(),
isBlocked = {
if (member != null) {
blockMemberRepository.isBlocked(blockedMemberId = member.id!!, memberId = it)
} else {
false
}
}
isBlocked = { blockMemberRepository.isBlocked(blockedMemberId = member.id!!, memberId = it) }
)
return onAirChannelList + notOnAirCreatorList

2
src/main/kotlin/kr/co/vividnext/sodalive/live/room/LiveRoomController.kt
View File

@ -38,6 +38,8 @@ class LiveRoomController(
@AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member?,
pageable: Pageable
) = run {
if (member == null) throw SodaException("로그인 정보를 확인해주세요.")
ApiResponse.ok(
service.getRoomList(
dateString,

38
src/main/kotlin/kr/co/vividnext/sodalive/live/room/LiveRoomRepository.kt
View File

@ -29,7 +29,7 @@ interface LiveRoomQueryRepository {
offset: Long,
limit: Long,
timezone: String,
memberId: Long?,
memberId: Long,
isCreator: Boolean,
isAdult: Boolean
): List<LiveRoom>
@ -38,14 +38,14 @@ interface LiveRoomQueryRepository {
date: LocalDateTime,
offset: Long,
limit: Long,
memberId: Long?,
memberId: Long,
isCreator: Boolean,
isAdult: Boolean
): List<LiveRoom>
fun getLiveRoomListReservationWithoutDate(
timezone: String,
memberId: Long?,
memberId: Long,
isCreator: Boolean,
isAdult: Boolean
): List<LiveRoom>
@ -72,7 +72,7 @@ class LiveRoomQueryRepositoryImpl(
offset: Long,
limit: Long,
timezone: String,
memberId: Long?,
memberId: Long,
isCreator: Boolean,
isAdult: Boolean
): List<LiveRoom> {
@ -85,7 +85,7 @@ class LiveRoomQueryRepositoryImpl(
where = where.and(liveRoom.isAdult.isFalse)
}
if (isCreator && memberId != null) {
if (isCreator) {
where = where.and(
liveRoom.isAvailableJoinCreator.isTrue
.or(liveRoom.member.id.eq(memberId))
@ -112,7 +112,7 @@ class LiveRoomQueryRepositoryImpl(
date: LocalDateTime,
offset: Long,
limit: Long,
memberId: Long?,
memberId: Long,
isCreator: Boolean,
isAdult: Boolean
): List<LiveRoom> {
@ -129,7 +129,7 @@ class LiveRoomQueryRepositoryImpl(
where = where.and(liveRoom.isAdult.isFalse)
}
if (isCreator && memberId != null) {
if (isCreator) {
where = where.and(
liveRoom.isAvailableJoinCreator.isTrue
.or(liveRoom.member.id.eq(memberId))
@ -148,7 +148,7 @@ class LiveRoomQueryRepositoryImpl(
override fun getLiveRoomListReservationWithoutDate(
timezone: String,
memberId: Long?,
memberId: Long,
isCreator: Boolean,
isAdult: Boolean
): List<LiveRoom> {
@ -169,31 +169,25 @@ class LiveRoomQueryRepositoryImpl(
where = where.and(liveRoom.isAdult.isFalse)
}
if (isCreator && memberId != null) {
if (isCreator) {
where = where.and(
liveRoom.isAvailableJoinCreator.isTrue
.or(liveRoom.member.id.eq(memberId))
)
}
val orderBy = if (memberId != null) {
listOf(
CaseBuilder()
.`when`(member.id.eq(memberId)).then(1)
.otherwise(2)
.asc(),
liveRoom.beginDateTime.asc()
)
} else {
listOf(liveRoom.beginDateTime.asc())
}
return queryFactory
.selectFrom(liveRoom)
.innerJoin(liveRoom.member, member)
.limit(10)
.where(where)
.orderBy(*orderBy.toTypedArray())
.orderBy(
CaseBuilder()
.`when`(member.id.eq(memberId)).then(1)
.otherwise(2)
.asc(),
liveRoom.beginDateTime.asc()
)
.fetch()
}

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

@ -118,54 +118,42 @@ class LiveRoomService(
status: LiveRoomStatus,
isAdultContentVisible: Boolean,
pageable: Pageable,
member: Member?,
member: Member,
timezone: String
): List<GetRoomListResponse> {
val roomList = if (status == LiveRoomStatus.NOW) {
getLiveRoomListNow(
pageable,
timezone,
memberId = member?.id,
isCreator = member?.role == MemberRole.CREATOR,
isAdult = member?.auth != null && isAdultContentVisible
memberId = member.id!!,
isCreator = member.role == MemberRole.CREATOR,
isAdult = member.auth != null && isAdultContentVisible
)
} else if (dateString != null) {
getLiveRoomListReservationWithDate(
dateString,
pageable,
timezone,
memberId = member?.id,
isCreator = member?.role == MemberRole.CREATOR,
isAdult = member?.auth != null && isAdultContentVisible
memberId = member.id!!,
isCreator = member.role == MemberRole.CREATOR,
isAdult = member.auth != null && isAdultContentVisible
)
} else {
getLiveRoomListReservationWithoutDate(
timezone,
isCreator = member?.role == MemberRole.CREATOR,
memberId = member?.id,
isAdult = member?.auth != null && isAdultContentVisible
isCreator = member.role == MemberRole.CREATOR,
memberId = member.id!!,
isAdult = member.auth != null && isAdultContentVisible
)
}
return roomList
.filter {
if (member?.id != null) {
!blockMemberRepository.isBlocked(blockedMemberId = member.id!!, memberId = it.member!!.id!!)
} else {
true
}
}
.filter { !blockMemberRepository.isBlocked(blockedMemberId = member.id!!, memberId = it.member!!.id!!) }
.map {
val roomInfo = roomInfoRepository.findByIdOrNull(it.id!!)
val reservations = it.reservations
.filter { reservation ->
if (member?.id != null) {
reservation.member!!.id!! == member.id!! && reservation.isActive
} else {
true
}
}
.filter { reservation -> reservation.member!!.id!! == member.id!! && reservation.isActive }
val beginDateTime = it.beginDateTime
.atZone(ZoneId.of("UTC"))
@ -214,7 +202,7 @@ class LiveRoomService(
private fun getLiveRoomListNow(
pageable: Pageable,
timezone: String,
memberId: Long?,
memberId: Long,
isCreator: Boolean,
isAdult: Boolean
): List<LiveRoom> {
@ -232,7 +220,7 @@ class LiveRoomService(
dateString: String,
pageable: Pageable,
timezone: String,
memberId: Long?,
memberId: Long,
isCreator: Boolean,
isAdult: Boolean
): List<LiveRoom> {
@ -254,7 +242,7 @@ class LiveRoomService(
private fun getLiveRoomListReservationWithoutDate(
timezone: String,
memberId: Long?,
memberId: Long,
isCreator: Boolean,
isAdult: Boolean
): List<LiveRoom> {

2
src/main/kotlin/kr/co/vividnext/sodalive/notice/ServiceNoticeController.kt
View File

@ -31,7 +31,7 @@ class ServiceNoticeController(private val service: ServiceNoticeService) {
@DeleteMapping("/{id}")
@PreAuthorize("hasRole('ADMIN')")
fun deleteNotice(@PathVariable id: Long) = ApiResponse.ok(service.delete(id), "삭제되었습니다.")
fun deleteCan(@PathVariable id: Long) = ApiResponse.ok(service.delete(id), "삭제되었습니다.")
@GetMapping
fun getNoticeList(pageable: Pageable, timezone: String) = ApiResponse.ok(service.getNoticeList(pageable, timezone))

110
src/main/kotlin/kr/co/vividnext/sodalive/rank/RankingRepository.kt
View File

@ -43,7 +43,7 @@ class RankingRepository(
}
fun getAudioContentRanking(
memberId: Long?,
memberId: Long,
isAdult: Boolean,
contentType: ContentType,
startDate: LocalDateTime,
@ -53,13 +53,9 @@ class RankingRepository(
sortType: String,
theme: String = ""
): List<GetAudioContentRankingItem> {
val blockMemberCondition = if (memberId != null) {
blockMember.member.id.eq(member.id)
.and(blockMember.isActive.isTrue)
.and(blockMember.blockedMember.id.eq(memberId))
} else {
null
}
val blockMemberCondition = blockMember.member.id.eq(member.id)
.and(blockMember.isActive.isTrue)
.and(blockMember.blockedMember.id.eq(memberId))
var where = audioContent.isActive.isTrue
.and(audioContent.member.isActive.isTrue)
@ -68,6 +64,7 @@ class RankingRepository(
.and(audioContent.duration.isNotNull)
.and(audioContentTheme.isActive.isTrue)
.and(audioContent.limited.isNull)
.and(blockMember.id.isNull)
if (!isAdult) {
where = where.and(audioContent.isAdult.isFalse)
@ -113,41 +110,7 @@ class RankingRepository(
.innerJoin(audioContentComment.audioContent, audioContent)
.innerJoin(audioContent.member, member)
.innerJoin(audioContent.theme, audioContentTheme)
}
"댓글" -> {
select
.from(audioContentComment)
.innerJoin(audioContentComment.audioContent, audioContent)
.innerJoin(audioContent.member, member)
.innerJoin(audioContent.theme, audioContentTheme)
}
"좋아요" -> {
select
.from(audioContentLike)
.innerJoin(audioContentLike.audioContent, audioContent)
.innerJoin(audioContent.member, member)
.innerJoin(audioContent.theme, audioContentTheme)
}
else -> {
select
.from(order)
.innerJoin(order.audioContent, audioContent)
.innerJoin(audioContent.member, member)
.innerJoin(audioContent.theme, audioContentTheme)
}
}
if (memberId != null) {
where = where.and(blockMember.id.isNull)
select = select.leftJoin(blockMember).on(blockMemberCondition)
}
select = when (sortType) {
"후원" -> {
select
.leftJoin(blockMember).on(blockMemberCondition)
.where(
where
.and(audioContentComment.isActive.isTrue)
@ -161,6 +124,11 @@ class RankingRepository(
"댓글" -> {
select
.from(audioContentComment)
.innerJoin(audioContentComment.audioContent, audioContent)
.innerJoin(audioContent.member, member)
.innerJoin(audioContent.theme, audioContentTheme)
.leftJoin(blockMember).on(blockMemberCondition)
.where(
where
.and(audioContentComment.isActive.isTrue)
@ -173,6 +141,11 @@ class RankingRepository(
"좋아요" -> {
select
.from(audioContentLike)
.innerJoin(audioContentLike.audioContent, audioContent)
.innerJoin(audioContent.member, member)
.innerJoin(audioContent.theme, audioContentTheme)
.leftJoin(blockMember).on(blockMemberCondition)
.where(
where
.and(audioContentLike.isActive.isTrue)
@ -185,6 +158,11 @@ class RankingRepository(
else -> {
select
.from(order)
.innerJoin(order.audioContent, audioContent)
.innerJoin(audioContent.member, member)
.innerJoin(audioContent.theme, audioContentTheme)
.leftJoin(blockMember).on(blockMemberCondition)
.where(
where
.and(order.isActive.isTrue)
@ -203,19 +181,15 @@ class RankingRepository(
}
fun getSeriesRanking(
memberId: Long?,
memberId: Long,
isAdult: Boolean,
contentType: ContentType,
startDate: LocalDateTime,
endDate: LocalDateTime
): List<Series> {
val blockMemberCondition = if (memberId != null) {
blockMember.member.id.eq(member.id)
.and(blockMember.isActive.isTrue)
.and(blockMember.blockedMember.id.eq(memberId))
} else {
null
}
val blockMemberCondition = blockMember.member.id.eq(member.id)
.and(blockMember.isActive.isTrue)
.and(blockMember.blockedMember.id.eq(memberId))
var where = series.isActive.isTrue
.and(audioContent.isActive.isTrue)
@ -224,6 +198,7 @@ class RankingRepository(
.and(member.role.eq(MemberRole.CREATOR))
.and(audioContent.duration.isNotNull)
.and(audioContent.limited.isNull)
.and(blockMember.id.isNull)
.and(order.isActive.isTrue)
.and(order.createdAt.goe(startDate))
.and(order.createdAt.lt(endDate))
@ -246,20 +221,14 @@ class RankingRepository(
}
}
var select = queryFactory
return queryFactory
.select(series)
.from(seriesContent)
.innerJoin(seriesContent.series, series)
.innerJoin(seriesContent.content, audioContent)
.innerJoin(series.member, member)
.leftJoin(order).on(audioContent.id.eq(order.audioContent.id))
if (memberId != null) {
where = where.and(blockMember.id.isNull)
select = select.leftJoin(blockMember).on(blockMemberCondition)
}
return select
.leftJoin(blockMember).on(blockMemberCondition)
.where(where)
.groupBy(series.id)
.orderBy(
@ -439,19 +408,15 @@ class RankingRepository(
}
fun fetchCreatorBySellContentCountRankTop20(
memberId: Long?,
memberId: Long,
isAdult: Boolean,
contentType: ContentType,
startDate: LocalDateTime,
endDate: LocalDateTime
): List<ContentCreatorResponse> {
val blockMemberCondition = if (memberId != null) {
blockMember.member.id.eq(member.id)
.and(blockMember.isActive.isTrue)
.and(blockMember.blockedMember.id.eq(memberId))
} else {
null
}
val blockMemberCondition = blockMember.member.id.eq(member.id)
.and(blockMember.isActive.isTrue)
.and(blockMember.blockedMember.id.eq(memberId))
val ordersCondition = order.audioContent.id.eq(audioContent.id)
.and(order.isActive.isTrue)
@ -466,6 +431,7 @@ class RankingRepository(
.and(audioContent.price.gt(0))
.and(audioContent.duration.isNotNull)
.and(audioContent.limited.isNull)
.and(blockMember.id.isNull)
if (!isAdult) {
where = where.and(audioContent.isAdult.isFalse)
@ -485,7 +451,7 @@ class RankingRepository(
}
}
var select = queryFactory
return queryFactory
.select(
QContentCreatorResponse(
member.id,
@ -496,13 +462,7 @@ class RankingRepository(
.from(audioContent)
.innerJoin(member).on(memberCondition)
.leftJoin(order).on(ordersCondition)
if (memberId != null) {
where = where.and(blockMember.id.isNull)
select = select.leftJoin(blockMember).on(blockMemberCondition)
}
return select
.leftJoin(blockMember).on(blockMemberCondition)
.where(where)
.groupBy(member.id)
.having(audioContent.id.count().goe(4))

16
src/main/kotlin/kr/co/vividnext/sodalive/rank/RankingService.kt
View File

@ -23,16 +23,10 @@ class RankingService(
@Value("\${cloud.aws.cloud-front.host}")
private val imageHost: String
) {
fun getCreatorRanking(memberId: Long?, rankingDate: String): GetExplorerSectionResponse {
fun getCreatorRanking(memberId: Long, rankingDate: String): GetExplorerSectionResponse {
val creatorRankings = repository
.getCreatorRankings()
.filter {
if (memberId != null) {
!memberService.isBlocked(blockedMemberId = memberId, memberId = it.id!!)
} else {
true
}
}
.filter { !memberService.isBlocked(blockedMemberId = memberId, memberId = it.id!!) }
.map { it.toExplorerSectionCreator(imageHost) }
return GetExplorerSectionResponse(
@ -45,7 +39,7 @@ class RankingService(
}
fun getContentRanking(
memberId: Long?,
memberId: Long,
isAdult: Boolean,
contentType: ContentType,
startDate: LocalDateTime,
@ -77,7 +71,7 @@ class RankingService(
}
fun getSeriesRanking(
memberId: Long?,
memberId: Long,
isAdult: Boolean,
contentType: ContentType,
startDate: LocalDateTime,
@ -217,7 +211,7 @@ class RankingService(
}
fun fetchCreatorBySellContentCountRankTop20(
memberId: Long?,
memberId: Long,
isAdult: Boolean,
contentType: ContentType,
startDate: LocalDateTime,