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

Compare commits

base: klaus:56eb6b3ce320a20d2b52df2f4bc9a52e1bc95d4a
Branches Tags
klaus:test
klaus:main
..
compare: klaus:545836d43cd08c577b6fa4c9a68aa56687b5223d
Branches Tags
klaus:main
klaus:test

No commits in common. "56eb6b3ce320a20d2b52df2f4bc9a52e1bc95d4a" and "545836d43cd08c577b6fa4c9a68aa56687b5223d" have entirely different histories.
56eb6b3ce3 ... 545836d43c

27 changed files with 195 additions and 964 deletions
Show Stats Expand all files Collapse all files

106
src/main/kotlin/kr/co/vividnext/sodalive/content/AudioContentRepository.kt
View File

@ -77,7 +77,6 @@ interface AudioContentQueryRepository {
memberId: Long, memberId: Long,
theme: List<String>, theme: List<String>,
isAdult: Boolean = false, isAdult: Boolean = false,
contentType: ContentType,
offset: Long = 0, offset: Long = 0,
limit: Long = 20 limit: Long = 20
): List<GetAudioContentMainItem> ): List<GetAudioContentMainItem>
@ -85,8 +84,7 @@ interface AudioContentQueryRepository {
fun totalAlarmCountByTheme( fun totalAlarmCountByTheme(
memberId: Long, memberId: Long,
theme: List<String>, theme: List<String>,
isAdult: Boolean = false, isAdult: Boolean = false
contentType: ContentType
): Int ): Int
fun totalCountByTheme( fun totalCountByTheme(
@ -132,7 +130,6 @@ interface AudioContentQueryRepository {
curationId: Long, curationId: Long,
memberId: Long, memberId: Long,
isAdult: Boolean, isAdult: Boolean,
contentType: ContentType,
offset: Long = 0, offset: Long = 0,
limit: Long = 20 limit: Long = 20
): List<GetAudioContentMainItem> ): List<GetAudioContentMainItem>
@ -404,15 +401,7 @@ class AudioContentQueryRepositoryImpl(
} else { } else {
if (contentType != ContentType.ALL) { if (contentType != ContentType.ALL) {
where = where.and( where = where.and(
audioContent.member.isNull.or( audioContent.member.auth.gender.eq(if (contentType == ContentType.MALE) 0 else 1)
audioContent.member.auth.gender.eq(
if (contentType == ContentType.MALE) {
0
} else {
1
}
)
)
) )
} }
} }
@ -455,7 +444,6 @@ class AudioContentQueryRepositoryImpl(
memberId: Long, memberId: Long,
theme: List<String>, theme: List<String>,
isAdult: Boolean, isAdult: Boolean,
contentType: ContentType,
offset: Long, offset: Long,
limit: Long limit: Long
): List<GetAudioContentMainItem> { ): List<GetAudioContentMainItem> {
@ -476,20 +464,6 @@ class AudioContentQueryRepositoryImpl(
if (!isAdult) { if (!isAdult) {
where = where.and(audioContent.isAdult.isFalse) where = where.and(audioContent.isAdult.isFalse)
} else {
if (contentType != ContentType.ALL) {
where = where.and(
audioContent.member.isNull.or(
audioContent.member.auth.gender.eq(
if (contentType == ContentType.MALE) {
0
} else {
1
}
)
)
)
}
} }
if (theme.isNotEmpty()) { if (theme.isNotEmpty()) {
@ -520,12 +494,7 @@ class AudioContentQueryRepositoryImpl(
.fetch() .fetch()
} }
override fun totalAlarmCountByTheme( override fun totalAlarmCountByTheme(memberId: Long, theme: List<String>, isAdult: Boolean): Int {
memberId: Long,
theme: List<String>,
isAdult: Boolean,
contentType: ContentType
): Int {
val blockMemberCondition = blockMember.member.id.eq(member.id) val blockMemberCondition = blockMember.member.id.eq(member.id)
.and(blockMember.isActive.isTrue) .and(blockMember.isActive.isTrue)
.and(blockMember.blockedMember.id.eq(memberId)) .and(blockMember.blockedMember.id.eq(memberId))
@ -541,20 +510,6 @@ class AudioContentQueryRepositoryImpl(
if (!isAdult) { if (!isAdult) {
where = where.and(audioContent.isAdult.isFalse) where = where.and(audioContent.isAdult.isFalse)
} else {
if (contentType != ContentType.ALL) {
where = where.and(
audioContent.member.isNull.or(
audioContent.member.auth.gender.eq(
if (contentType == ContentType.MALE) {
0
} else {
1
}
)
)
)
}
} }
if (theme.isNotEmpty()) { if (theme.isNotEmpty()) {
@ -591,15 +546,7 @@ class AudioContentQueryRepositoryImpl(
} else { } else {
if (contentType != ContentType.ALL) { if (contentType != ContentType.ALL) {
where = where.and( where = where.and(
audioContent.member.isNull.or( audioContent.member.auth.gender.eq(if (contentType == ContentType.MALE) 0 else 1)
audioContent.member.auth.gender.eq(
if (contentType == ContentType.MALE) {
0
} else {
1
}
)
)
) )
} }
} }
@ -639,15 +586,7 @@ class AudioContentQueryRepositoryImpl(
} else { } else {
if (contentType != ContentType.ALL) { if (contentType != ContentType.ALL) {
where = where.and( where = where.and(
audioContent.member.isNull.or( audioContent.member.auth.gender.eq(if (contentType == ContentType.MALE) 0 else 1)
audioContent.member.auth.gender.eq(
if (contentType == ContentType.MALE) {
0
} else {
1
}
)
)
) )
} }
} }
@ -694,15 +633,7 @@ class AudioContentQueryRepositoryImpl(
} else { } else {
if (contentType != ContentType.ALL) { if (contentType != ContentType.ALL) {
where = where.and( where = where.and(
audioContent.member.isNull.or( audioContent.member.auth.gender.eq(if (contentType == ContentType.MALE) 0 else 1)
audioContent.member.auth.gender.eq(
if (contentType == ContentType.MALE) {
0
} else {
1
}
)
)
) )
} }
} }
@ -820,15 +751,7 @@ class AudioContentQueryRepositoryImpl(
} else { } else {
if (contentType != ContentType.ALL) { if (contentType != ContentType.ALL) {
where = where.and( where = where.and(
audioContent.member.isNull.or( audioContent.member.auth.gender.eq(if (contentType == ContentType.MALE) 0 else 1)
audioContent.member.auth.gender.eq(
if (contentType == ContentType.MALE) {
0
} else {
1
}
)
)
) )
} }
} }
@ -860,7 +783,6 @@ class AudioContentQueryRepositoryImpl(
curationId: Long, curationId: Long,
memberId: Long, memberId: Long,
isAdult: Boolean, isAdult: Boolean,
contentType: ContentType,
offset: Long, offset: Long,
limit: Long limit: Long
): List<GetAudioContentMainItem> { ): List<GetAudioContentMainItem> {
@ -879,20 +801,6 @@ class AudioContentQueryRepositoryImpl(
if (!isAdult) { if (!isAdult) {
where = where.and(audioContent.isAdult.isFalse) where = where.and(audioContent.isAdult.isFalse)
} else {
if (contentType != ContentType.ALL) {
where = where.and(
audioContent.member.isNull.or(
audioContent.member.auth.gender.eq(
if (contentType == ContentType.MALE) {
0
} else {
1
}
)
)
)
}
} }
return queryFactory return queryFactory

9
src/main/kotlin/kr/co/vividnext/sodalive/content/main/AudioContentMainController.kt
View File

@ -83,18 +83,11 @@ class AudioContentMainController(
@GetMapping("/theme") @GetMapping("/theme")
fun getThemeList( fun getThemeList(
@RequestParam("isAdultContentVisible", required = false) isAdultContentVisible: Boolean? = null,
@RequestParam("contentType", required = false) contentType: ContentType? = null,
@AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member? @AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member?
) = run { ) = run {
if (member == null) throw SodaException("로그인 정보를 확인해주세요.") if (member == null) throw SodaException("로그인 정보를 확인해주세요.")
ApiResponse.ok( ApiResponse.ok(service.getThemeList(isAdult = member.auth != null))
service.getThemeList(
isAdult = member.auth != null && (isAdultContentVisible ?: true),
contentType = contentType ?: ContentType.ALL
)
)
} }
@GetMapping("/new/all") @GetMapping("/new/all")

11
src/main/kotlin/kr/co/vividnext/sodalive/content/main/AudioContentMainService.kt
View File

@ -26,8 +26,8 @@ class AudioContentMainService(
) { ) {
@Transactional(readOnly = true) @Transactional(readOnly = true)
@Cacheable(cacheNames = ["default"], key = "'themeList:' + ':' + #isAdult") @Cacheable(cacheNames = ["default"], key = "'themeList:' + ':' + #isAdult")
fun getThemeList(isAdult: Boolean, contentType: ContentType): List<String> { fun getThemeList(isAdult: Boolean): List<String> {
return audioContentThemeRepository.getActiveThemeOfContent(isAdult = isAdult, contentType = contentType) return audioContentThemeRepository.getActiveThemeOfContent(isAdult = isAdult)
.filter { .filter {
it != "모닝콜" && it != "모닝콜" &&
it != "알람" && it != "알람" &&
@ -73,11 +73,8 @@ class AudioContentMainService(
): GetNewContentAllResponse { ): GetNewContentAllResponse {
val isAdult = member.auth != null && isAdultContentVisible val isAdult = member.auth != null && isAdultContentVisible
val themeList = if (theme.isBlank()) { val themeList = if (theme.isBlank()) {
audioContentThemeRepository.getActiveThemeOfContent( audioContentThemeRepository.getActiveThemeOfContent(isAdult = isAdult, isFree = isFree)
isAdult = isAdult, .filter {
isFree = isFree,
contentType = contentType
).filter {
it != "모닝콜" && it != "모닝콜" &&
it != "알람" && it != "알람" &&
it != "슬립콜" && it != "슬립콜" &&

21
src/main/kotlin/kr/co/vividnext/sodalive/content/main/curation/AudioContentCurationQueryRepository.kt
View File

@ -23,15 +23,7 @@ class AudioContentCurationQueryRepository(private val queryFactory: JPAQueryFact
} else { } else {
if (contentType != ContentType.ALL) { if (contentType != ContentType.ALL) {
where = where.and( where = where.and(
audioContent.member.isNull.or( audioContent.member.auth.gender.eq(if (contentType == ContentType.MALE) 0 else 1)
audioContent.member.auth.gender.eq(
if (contentType == ContentType.MALE) {
0
} else {
1
}
)
)
) )
} }
} }
@ -39,7 +31,6 @@ class AudioContentCurationQueryRepository(private val queryFactory: JPAQueryFact
return queryFactory return queryFactory
.select(audioContent.id) .select(audioContent.id)
.from(audioContent) .from(audioContent)
.innerJoin(audioContent.member, member)
.where(where) .where(where)
.fetch() .fetch()
.size .size
@ -71,15 +62,7 @@ class AudioContentCurationQueryRepository(private val queryFactory: JPAQueryFact
} else { } else {
if (contentType != ContentType.ALL) { if (contentType != ContentType.ALL) {
where = where.and( where = where.and(
audioContent.member.isNull.or( audioContent.member.auth.gender.eq(if (contentType == ContentType.MALE) 0 else 1)
audioContent.member.auth.gender.eq(
if (contentType == ContentType.MALE) {
0
} else {
1
}
)
)
) )
} }
} }

52
src/main/kotlin/kr/co/vividnext/sodalive/content/main/tab/AudioContentMainTabRepository.kt
View File

@ -2,7 +2,6 @@ package kr.co.vividnext.sodalive.content.main.tab
import com.querydsl.core.types.dsl.Expressions import com.querydsl.core.types.dsl.Expressions
import com.querydsl.jpa.impl.JPAQueryFactory import com.querydsl.jpa.impl.JPAQueryFactory
import kr.co.vividnext.sodalive.content.ContentType
import kr.co.vividnext.sodalive.content.QAudioContent.audioContent import kr.co.vividnext.sodalive.content.QAudioContent.audioContent
import kr.co.vividnext.sodalive.content.main.ContentCreatorResponse import kr.co.vividnext.sodalive.content.main.ContentCreatorResponse
import kr.co.vividnext.sodalive.content.main.QContentCreatorResponse import kr.co.vividnext.sodalive.content.main.QContentCreatorResponse
@ -23,15 +22,13 @@ class AudioContentMainTabRepository(
fun findCreatorByThemeContent( fun findCreatorByThemeContent(
memberId: Long, memberId: Long,
theme: String, theme: String,
minCount: Int, minCount: Int
isAdult: Boolean,
contentType: ContentType
): List<ContentCreatorResponse> { ): List<ContentCreatorResponse> {
val blockMemberCondition = blockMember.member.id.eq(member.id) val blockMemberCondition = blockMember.member.id.eq(member.id)
.and(blockMember.isActive.isTrue) .and(blockMember.isActive.isTrue)
.and(blockMember.blockedMember.id.eq(memberId)) .and(blockMember.blockedMember.id.eq(memberId))
var where = member.isActive.isTrue val where = member.isActive.isTrue
.and(member.role.eq(MemberRole.CREATOR)) .and(member.role.eq(MemberRole.CREATOR))
.and(audioContent.isActive.isTrue) .and(audioContent.isActive.isTrue)
.and(audioContent.price.gt(0)) .and(audioContent.price.gt(0))
@ -41,24 +38,6 @@ class AudioContentMainTabRepository(
.and(audioContentTheme.theme.eq(theme)) .and(audioContentTheme.theme.eq(theme))
.and(blockMember.id.isNull) .and(blockMember.id.isNull)
if (!isAdult) {
where = where.and(audioContent.isAdult.isFalse)
} else {
if (contentType != ContentType.ALL) {
where = where.and(
audioContent.member.isNull.or(
audioContent.member.auth.gender.eq(
if (contentType == ContentType.MALE) {
0
} else {
1
}
)
)
)
}
}
return queryFactory return queryFactory
.select( .select(
QContentCreatorResponse( QContentCreatorResponse(
@ -82,17 +61,12 @@ class AudioContentMainTabRepository(
.fetch() .fetch()
} }
fun findCreatorWithHasFreeContent( fun findCreatorWithHasFreeContent(memberId: Long, minCount: Int): List<ContentCreatorResponse> {
memberId: Long,
minCount: Int,
isAdult: Boolean,
contentType: ContentType
): List<ContentCreatorResponse> {
val blockMemberCondition = blockMember.member.id.eq(member.id) val blockMemberCondition = blockMember.member.id.eq(member.id)
.and(blockMember.isActive.isTrue) .and(blockMember.isActive.isTrue)
.and(blockMember.blockedMember.id.eq(memberId)) .and(blockMember.blockedMember.id.eq(memberId))
var where = member.isActive.isTrue val where = member.isActive.isTrue
.and(member.role.eq(MemberRole.CREATOR)) .and(member.role.eq(MemberRole.CREATOR))
.and(audioContent.isActive.isTrue) .and(audioContent.isActive.isTrue)
.and(audioContent.price.loe(0)) .and(audioContent.price.loe(0))
@ -100,24 +74,6 @@ class AudioContentMainTabRepository(
.and(audioContent.limited.isNull) .and(audioContent.limited.isNull)
.and(blockMember.id.isNull) .and(blockMember.id.isNull)
if (!isAdult) {
where = where.and(audioContent.isAdult.isFalse)
} else {
if (contentType != ContentType.ALL) {
where = where.and(
audioContent.member.isNull.or(
audioContent.member.auth.gender.eq(
if (contentType == ContentType.MALE) {
0
} else {
1
}
)
)
)
}
}
return queryFactory return queryFactory
.select( .select(
QContentCreatorResponse( QContentCreatorResponse(

33
src/main/kotlin/kr/co/vividnext/sodalive/content/main/tab/RecommendSeriesRepository.kt
View File

@ -1,7 +1,6 @@
package kr.co.vividnext.sodalive.content.main.tab package kr.co.vividnext.sodalive.content.main.tab
import com.querydsl.jpa.impl.JPAQueryFactory import com.querydsl.jpa.impl.JPAQueryFactory
import kr.co.vividnext.sodalive.content.ContentType
import kr.co.vividnext.sodalive.content.main.tab.QRecommendSeries.recommendSeries import kr.co.vividnext.sodalive.content.main.tab.QRecommendSeries.recommendSeries
import kr.co.vividnext.sodalive.creator.admin.content.series.QSeries.series import kr.co.vividnext.sodalive.creator.admin.content.series.QSeries.series
import kr.co.vividnext.sodalive.member.QMember.member import kr.co.vividnext.sodalive.member.QMember.member
@ -15,27 +14,13 @@ class RecommendSeriesRepository(
@Value("\${cloud.aws.cloud-front.host}") @Value("\${cloud.aws.cloud-front.host}")
private val imageHost: String private val imageHost: String
) { ) {
fun getNewSeriesList(isAdult: Boolean, contentType: ContentType): List<GetRecommendSeriesListResponse> { fun getNewSeriesList(isAdult: Boolean): List<GetRecommendSeriesListResponse> {
var where = recommendSeries.isActive.isTrue var where = recommendSeries.isActive.isTrue
.and(recommendSeries.isFree.isFalse) .and(recommendSeries.isFree.isFalse)
.and(series.isActive.isTrue) .and(series.isActive.isTrue)
if (!isAdult) { if (!isAdult) {
where = where.and(series.isAdult.isFalse) where = where.and(series.isAdult.isFalse)
} else {
if (contentType != ContentType.ALL) {
where = where.and(
series.member.isNull.or(
series.member.auth.gender.eq(
if (contentType == ContentType.MALE) {
0
} else {
1
}
)
)
)
}
} }
return queryFactory return queryFactory
@ -57,27 +42,13 @@ class RecommendSeriesRepository(
.fetch() .fetch()
} }
fun getRecommendSeriesList(isAdult: Boolean, contentType: ContentType): List<GetRecommendSeriesListResponse> { fun getRecommendSeriesList(isAdult: Boolean): List<GetRecommendSeriesListResponse> {
var where = recommendSeries.isActive.isTrue var where = recommendSeries.isActive.isTrue
.and(recommendSeries.isFree.isTrue) .and(recommendSeries.isFree.isTrue)
.and(series.isActive.isTrue) .and(series.isActive.isTrue)
if (!isAdult) { if (!isAdult) {
where = where.and(series.isAdult.isFalse) where = where.and(series.isAdult.isFalse)
} else {
if (contentType != ContentType.ALL) {
where = where.and(
series.member.isNull.or(
series.member.auth.gender.eq(
if (contentType == ContentType.MALE) {
0
} else {
1
}
)
)
)
}
} }
return queryFactory return queryFactory

15
src/main/kotlin/kr/co/vividnext/sodalive/content/main/tab/alarm/AudioContentMainTabAlarmController.kt
View File

@ -2,7 +2,6 @@ package kr.co.vividnext.sodalive.content.main.tab.alarm
import kr.co.vividnext.sodalive.common.ApiResponse import kr.co.vividnext.sodalive.common.ApiResponse
import kr.co.vividnext.sodalive.common.SodaException import kr.co.vividnext.sodalive.common.SodaException
import kr.co.vividnext.sodalive.content.ContentType
import kr.co.vividnext.sodalive.member.Member import kr.co.vividnext.sodalive.member.Member
import org.springframework.data.domain.Pageable import org.springframework.data.domain.Pageable
import org.springframework.security.core.annotation.AuthenticationPrincipal import org.springframework.security.core.annotation.AuthenticationPrincipal
@ -16,26 +15,16 @@ import org.springframework.web.bind.annotation.RestController
class AudioContentMainTabAlarmController(private val service: AudioContentMainTabAlarmService) { class AudioContentMainTabAlarmController(private val service: AudioContentMainTabAlarmService) {
@GetMapping @GetMapping
fun fetchContentMainTabAlarm( fun fetchContentMainTabAlarm(
@RequestParam("isAdultContentVisible", required = false) isAdultContentVisible: Boolean? = null,
@RequestParam("contentType", required = false) contentType: ContentType? = null,
@AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member? @AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member?
) = run { ) = run {
if (member == null) throw SodaException("로그인 정보를 확인해주세요.") if (member == null) throw SodaException("로그인 정보를 확인해주세요.")
ApiResponse.ok( ApiResponse.ok(service.fetchData(member))
service.fetchData(
isAdultContentVisible = isAdultContentVisible ?: true,
contentType = contentType ?: ContentType.ALL,
member
)
)
} }
@GetMapping("/all") @GetMapping("/all")
fun fetchAlarmContentByTheme( fun fetchAlarmContentByTheme(
@RequestParam("theme") theme: String, @RequestParam("theme") theme: String,
@RequestParam("isAdultContentVisible", required = false) isAdultContentVisible: Boolean? = null,
@RequestParam("contentType", required = false) contentType: ContentType? = null,
@AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member?, @AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member?,
pageable: Pageable pageable: Pageable
) = run { ) = run {
@ -45,8 +34,6 @@ class AudioContentMainTabAlarmController(private val service: AudioContentMainTa
service.fetchAlarmContentByTheme( service.fetchAlarmContentByTheme(
theme, theme,
member, member,
isAdultContentVisible = isAdultContentVisible ?: true,
contentType = contentType ?: ContentType.ALL,
offset = pageable.offset, offset = pageable.offset,
limit = pageable.pageSize.toLong() limit = pageable.pageSize.toLong()
) )

23
src/main/kotlin/kr/co/vividnext/sodalive/content/main/tab/alarm/AudioContentMainTabAlarmService.kt
View File

@ -1,7 +1,6 @@
package kr.co.vividnext.sodalive.content.main.tab.alarm package kr.co.vividnext.sodalive.content.main.tab.alarm
import kr.co.vividnext.sodalive.content.AudioContentRepository import kr.co.vividnext.sodalive.content.AudioContentRepository
import kr.co.vividnext.sodalive.content.ContentType
import kr.co.vividnext.sodalive.content.main.GetNewContentAllResponse import kr.co.vividnext.sodalive.content.main.GetNewContentAllResponse
import kr.co.vividnext.sodalive.content.main.banner.AudioContentBannerService import kr.co.vividnext.sodalive.content.main.banner.AudioContentBannerService
import kr.co.vividnext.sodalive.content.main.curation.AudioContentCurationQueryRepository import kr.co.vividnext.sodalive.content.main.curation.AudioContentCurationQueryRepository
@ -22,12 +21,8 @@ class AudioContentMainTabAlarmService(
private val eventService: EventService, private val eventService: EventService,
private val curationRepository: AudioContentCurationQueryRepository private val curationRepository: AudioContentCurationQueryRepository
) { ) {
fun fetchData( fun fetchData(member: Member): GetContentMainTabAlarmResponse {
isAdultContentVisible: Boolean, val isAdult = member.auth != null
contentType: ContentType,
member: Member
): GetContentMainTabAlarmResponse {
val isAdult = member.auth != null && isAdultContentVisible
val memberId = member.id!! val memberId = member.id!!
val contentBannerList = bannerService.getBannerList( val contentBannerList = bannerService.getBannerList(
@ -41,7 +36,6 @@ class AudioContentMainTabAlarmService(
memberId = memberId, memberId = memberId,
theme = alarmThemeList, theme = alarmThemeList,
isAdult = isAdult, isAdult = isAdult,
contentType = contentType,
limit = 10 limit = 10
) )
@ -59,7 +53,6 @@ class AudioContentMainTabAlarmService(
val rankAlarmContentList = rankingService.getContentRanking( val rankAlarmContentList = rankingService.getContentRanking(
memberId = memberId, memberId = memberId,
isAdult = isAdult, isAdult = isAdult,
contentType = contentType,
startDate = startDate, startDate = startDate,
endDate = endDate, endDate = endDate,
theme = alarmThemeList[0] theme = alarmThemeList[0]
@ -73,12 +66,10 @@ class AudioContentMainTabAlarmService(
items = contentRepository.findAudioContentByCurationIdV2( items = contentRepository.findAudioContentByCurationIdV2(
curationId = it.id!!, curationId = it.id!!,
memberId = memberId, memberId = memberId,
isAdult = isAdult, isAdult = isAdult
contentType = contentType
) )
) )
} }
.filter { it.items.isNotEmpty() }
return GetContentMainTabAlarmResponse( return GetContentMainTabAlarmResponse(
contentBannerList = contentBannerList, contentBannerList = contentBannerList,
@ -93,8 +84,6 @@ class AudioContentMainTabAlarmService(
fun fetchAlarmContentByTheme( fun fetchAlarmContentByTheme(
theme: String, theme: String,
member: Member, member: Member,
isAdultContentVisible: Boolean,
contentType: ContentType,
offset: Long, offset: Long,
limit: Long limit: Long
): GetNewContentAllResponse { ): GetNewContentAllResponse {
@ -105,20 +94,18 @@ class AudioContentMainTabAlarmService(
} }
val memberId = member.id!! val memberId = member.id!!
val isAdult = member.auth != null && isAdultContentVisible val isAdult = member.auth != null
val totalCount = contentRepository.totalAlarmCountByTheme( val totalCount = contentRepository.totalAlarmCountByTheme(
memberId = memberId, memberId = memberId,
theme = alarmThemeList, theme = alarmThemeList,
isAdult = isAdult, isAdult = isAdult
contentType = contentType
) )
val items = contentRepository.findAlarmContentByTheme( val items = contentRepository.findAlarmContentByTheme(
memberId = memberId, memberId = memberId,
theme = alarmThemeList, theme = alarmThemeList,
isAdult = isAdult, isAdult = isAdult,
contentType = contentType,
offset = offset, offset = offset,
limit = limit limit = limit
) )

16
src/main/kotlin/kr/co/vividnext/sodalive/content/main/tab/asmr/AudioContentMainTabAsmrController.kt
View File

@ -2,7 +2,6 @@ package kr.co.vividnext.sodalive.content.main.tab.asmr
import kr.co.vividnext.sodalive.common.ApiResponse import kr.co.vividnext.sodalive.common.ApiResponse
import kr.co.vividnext.sodalive.common.SodaException import kr.co.vividnext.sodalive.common.SodaException
import kr.co.vividnext.sodalive.content.ContentType
import kr.co.vividnext.sodalive.member.Member import kr.co.vividnext.sodalive.member.Member
import org.springframework.security.core.annotation.AuthenticationPrincipal import org.springframework.security.core.annotation.AuthenticationPrincipal
import org.springframework.web.bind.annotation.GetMapping import org.springframework.web.bind.annotation.GetMapping
@ -15,26 +14,16 @@ import org.springframework.web.bind.annotation.RestController
class AudioContentMainTabAsmrController(private val service: AudioContentMainTabAsmrService) { class AudioContentMainTabAsmrController(private val service: AudioContentMainTabAsmrService) {
@GetMapping @GetMapping
fun fetchContentMainTabAsmr( fun fetchContentMainTabAsmr(
@RequestParam("isAdultContentVisible", required = false) isAdultContentVisible: Boolean? = null,
@RequestParam("contentType", required = false) contentType: ContentType? = null,
@AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member? @AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member?
) = run { ) = run {
if (member == null) throw SodaException("로그인 정보를 확인해주세요.") if (member == null) throw SodaException("로그인 정보를 확인해주세요.")
ApiResponse.ok( ApiResponse.ok(service.fetchData(member))
service.fetchData(
isAdultContentVisible = isAdultContentVisible ?: true,
contentType = contentType ?: ContentType.ALL,
member
)
)
} }
@GetMapping("/popular-content-by-creator") @GetMapping("/popular-content-by-creator")
fun getPopularContentByCreator( fun getPopularContentByCreator(
@RequestParam creatorId: Long, @RequestParam creatorId: Long,
@RequestParam("isAdultContentVisible", required = false) isAdultContentVisible: Boolean? = null,
@RequestParam("contentType", required = false) contentType: ContentType? = null,
@AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member? @AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member?
) = run { ) = run {
if (member == null) throw SodaException("로그인 정보를 확인해주세요.") if (member == null) throw SodaException("로그인 정보를 확인해주세요.")
@ -42,8 +31,7 @@ class AudioContentMainTabAsmrController(private val service: AudioContentMainTab
ApiResponse.ok( ApiResponse.ok(
service.getPopularContentByCreator( service.getPopularContentByCreator(
creatorId = creatorId, creatorId = creatorId,
isAdult = member.auth != null && (isAdultContentVisible ?: true), isAdult = member.auth != null
contentType = contentType ?: ContentType.ALL
) )
) )
} }

26
src/main/kotlin/kr/co/vividnext/sodalive/content/main/tab/asmr/AudioContentMainTabAsmrService.kt
View File

@ -21,12 +21,8 @@ class AudioContentMainTabAsmrService(
private val eventService: EventService, private val eventService: EventService,
private val curationRepository: AudioContentCurationQueryRepository private val curationRepository: AudioContentCurationQueryRepository
) { ) {
fun fetchData( fun fetchData(member: Member): GetContentMainTabAsmrResponse {
isAdultContentVisible: Boolean, val isAdult = member.auth != null
contentType: ContentType,
member: Member
): GetContentMainTabAsmrResponse {
val isAdult = member.auth != null && isAdultContentVisible
val memberId = member.id!! val memberId = member.id!!
val theme = "ASMR" val theme = "ASMR"
val tabId = 5L val tabId = 5L
@ -41,23 +37,20 @@ class AudioContentMainTabAsmrService(
memberId = memberId, memberId = memberId,
theme = listOf(theme), theme = listOf(theme),
isAdult = isAdult, isAdult = isAdult,
contentType = contentType, contentType = ContentType.ALL,
limit = 10 limit = 10
) )
val creatorList = repository.findCreatorByThemeContent( val creatorList = repository.findCreatorByThemeContent(
memberId = memberId, memberId = memberId,
theme = theme, theme = theme,
minCount = 4, minCount = 4
isAdult = isAdult,
contentType = contentType
) )
val salesCountRankContentList = if (creatorList.isNotEmpty()) { val salesCountRankContentList = if (creatorList.isNotEmpty()) {
rankingService.fetchCreatorContentBySalesCountTop4( rankingService.fetchCreatorContentBySalesCountTop4(
creatorId = creatorList[0].creatorId, creatorId = creatorList[0].creatorId,
isAdult = isAdult, isAdult = isAdult,
contentType = contentType,
theme = theme theme = theme
) )
} else { } else {
@ -73,12 +66,10 @@ class AudioContentMainTabAsmrService(
items = contentRepository.findAudioContentByCurationIdV2( items = contentRepository.findAudioContentByCurationIdV2(
curationId = it.id!!, curationId = it.id!!,
memberId = memberId, memberId = memberId,
isAdult = isAdult, isAdult = isAdult
contentType = contentType
) )
) )
} }
.filter { it.items.isNotEmpty() }
return GetContentMainTabAsmrResponse( return GetContentMainTabAsmrResponse(
contentBannerList = contentBannerList, contentBannerList = contentBannerList,
@ -90,15 +81,10 @@ class AudioContentMainTabAsmrService(
) )
} }
fun getPopularContentByCreator( fun getPopularContentByCreator(creatorId: Long, isAdult: Boolean): List<GetAudioContentRankingItem> {
creatorId: Long,
isAdult: Boolean,
contentType: ContentType
): List<GetAudioContentRankingItem> {
return rankingService.fetchCreatorContentBySalesCountTop4( return rankingService.fetchCreatorContentBySalesCountTop4(
creatorId = creatorId, creatorId = creatorId,
isAdult = isAdult, isAdult = isAdult,
contentType = contentType,
theme = "ASMR" theme = "ASMR"
) )
} }

17
src/main/kotlin/kr/co/vividnext/sodalive/content/main/tab/content/AudioContentMainTabContentController.kt
View File

@ -34,8 +34,6 @@ class AudioContentMainTabContentController(private val service: AudioContentMain
@GetMapping("/ranking") @GetMapping("/ranking")
fun getAudioContentRanking( fun getAudioContentRanking(
@RequestParam("sort-type", required = false) sortType: String?, @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?, @AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member?,
pageable: Pageable pageable: Pageable
) = run { ) = run {
@ -44,8 +42,7 @@ class AudioContentMainTabContentController(private val service: AudioContentMain
ApiResponse.ok( ApiResponse.ok(
service.getAudioContentRanking( service.getAudioContentRanking(
memberId = member.id!!, memberId = member.id!!,
isAdult = member.auth != null && (isAdultContentVisible ?: true), isAdult = member.auth != null,
contentType = contentType ?: ContentType.ALL,
sortType = sortType ?: "매출" sortType = sortType ?: "매출"
) )
) )
@ -74,8 +71,6 @@ class AudioContentMainTabContentController(private val service: AudioContentMain
@GetMapping("/popular-content-by-creator") @GetMapping("/popular-content-by-creator")
fun getPopularContentByCreator( fun getPopularContentByCreator(
@RequestParam creatorId: Long, @RequestParam creatorId: Long,
@RequestParam("isAdultContentVisible", required = false) isAdultContentVisible: Boolean? = null,
@RequestParam("contentType", required = false) contentType: ContentType? = null,
@AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member? @AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member?
) = run { ) = run {
if (member == null) throw SodaException("로그인 정보를 확인해주세요.") if (member == null) throw SodaException("로그인 정보를 확인해주세요.")
@ -83,8 +78,7 @@ class AudioContentMainTabContentController(private val service: AudioContentMain
ApiResponse.ok( ApiResponse.ok(
service.getPopularContentByCreator( service.getPopularContentByCreator(
creatorId = creatorId, creatorId = creatorId,
isAdult = member.auth != null && (isAdultContentVisible ?: true), isAdult = member.auth != null
contentType = contentType ?: ContentType.ALL
) )
) )
} }
@ -92,16 +86,11 @@ class AudioContentMainTabContentController(private val service: AudioContentMain
@GetMapping("/recommend-content-by-tag") @GetMapping("/recommend-content-by-tag")
fun getRecommendedContentByTag( fun getRecommendedContentByTag(
@RequestParam tag: String, @RequestParam tag: String,
@RequestParam("contentType", required = false) contentType: ContentType? = null,
@AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member? @AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member?
) = run { ) = run {
if (member == null) throw SodaException("로그인 정보를 확인해주세요.") if (member == null) throw SodaException("로그인 정보를 확인해주세요.")
ApiResponse.ok( ApiResponse.ok(
service.getRecommendedContentByTag( service.getRecommendedContentByTag(memberId = member.id!!, tag = tag)
memberId = member.id!!,
tag = tag,
contentType = contentType ?: ContentType.ALL
)
) )
} }
} }

50
src/main/kotlin/kr/co/vividnext/sodalive/content/main/tab/content/AudioContentMainTabContentService.kt
View File

@ -30,7 +30,7 @@ class AudioContentMainTabContentService(
member: Member member: Member
): GetContentMainTabContentResponse { ): GetContentMainTabContentResponse {
val memberId = member.id!! val memberId = member.id!!
val isAdult = member.auth != null && isAdultContentVisible val isAdult = member.auth != null
val tabId = 3L val tabId = 3L
// 단편 배너 // 단편 배너
@ -41,10 +41,8 @@ class AudioContentMainTabContentService(
) )
// 새로운 단편 테마 // 새로운 단편 테마
val themeOfContentList = audioContentThemeRepository.getActiveThemeOfContent( val themeOfContentList = audioContentThemeRepository.getActiveThemeOfContent(isAdult = isAdult)
isAdult = isAdult, .filter {
contentType = contentType
).filter {
it != "모닝콜" && it != "모닝콜" &&
it != "알람" && it != "알람" &&
it != "슬립콜" && it != "슬립콜" &&
@ -59,8 +57,8 @@ class AudioContentMainTabContentService(
val newContentList = audioContentRepository.findByTheme( val newContentList = audioContentRepository.findByTheme(
memberId = member.id!!, memberId = member.id!!,
theme = themeOfContentList, theme = themeOfContentList,
isAdult = isAdult, isAdult = member.auth != null,
contentType = contentType, contentType = ContentType.ALL,
offset = 0, offset = 0,
limit = 10 limit = 10
) )
@ -78,7 +76,6 @@ class AudioContentMainTabContentService(
val rankContentList = rankingService.getContentRanking( val rankContentList = rankingService.getContentRanking(
memberId = memberId, memberId = memberId,
isAdult = isAdult, isAdult = isAdult,
contentType = contentType,
startDate = dailyRankingStartDate, startDate = dailyRankingStartDate,
endDate = dailyRankingEndDate endDate = dailyRankingEndDate
) )
@ -88,7 +85,6 @@ class AudioContentMainTabContentService(
val contentRankCreatorList = rankingService.fetchCreatorBySellContentCountRankTop20( val contentRankCreatorList = rankingService.fetchCreatorBySellContentCountRankTop20(
memberId = member.id!!, memberId = member.id!!,
contentType = contentType,
startDate = dailyRankingStartDate, startDate = dailyRankingStartDate,
endDate = dailyRankingEndDate endDate = dailyRankingEndDate
) )
@ -96,25 +92,20 @@ class AudioContentMainTabContentService(
val likeCountRankContentList = if (contentRankCreatorList.isNotEmpty()) { val likeCountRankContentList = if (contentRankCreatorList.isNotEmpty()) {
rankingService.fetchCreatorContentByLikeCountTop4( rankingService.fetchCreatorContentByLikeCountTop4(
creatorId = contentRankCreatorList[0].creatorId, creatorId = contentRankCreatorList[0].creatorId,
isAdult = isAdult, isAdult = member.auth != null
contentType = contentType
) )
} else { } else {
emptyList() emptyList()
} }
val tagList = if (isAdult) { val tagList = if (isAdult) {
tagCurationService.getTagList(isAdult = isAdult, contentType = contentType) tagCurationService.getTagList(isAdult = isAdult)
} else { } else {
emptyList() emptyList()
} }
val tagCurationContentList = if (tagList.isNotEmpty()) { val tagCurationContentList = if (tagList.isNotEmpty()) {
tagCurationService.getTagCurationContentList( tagCurationService.getTagCurationContentList(memberId = memberId, tag = tagList[0])
memberId = memberId,
tag = tagList[0],
contentType = contentType
)
} else { } else {
emptyList() emptyList()
} }
@ -126,12 +117,10 @@ class AudioContentMainTabContentService(
items = audioContentRepository.findAudioContentByCurationIdV2( items = audioContentRepository.findAudioContentByCurationIdV2(
curationId = it.id!!, curationId = it.id!!,
memberId = memberId, memberId = memberId,
isAdult = isAdult, isAdult = isAdult
contentType = contentType
) )
) )
} }
.filter { it.items.isNotEmpty() }
return GetContentMainTabContentResponse( return GetContentMainTabContentResponse(
bannerList = contentBannerList, bannerList = contentBannerList,
@ -152,7 +141,6 @@ class AudioContentMainTabContentService(
fun getAudioContentRanking( fun getAudioContentRanking(
memberId: Long, memberId: Long,
isAdult: Boolean, isAdult: Boolean,
contentType: ContentType,
sortType: String sortType: String
): List<GetAudioContentRankingItem> { ): List<GetAudioContentRankingItem> {
val currentDateTime = LocalDateTime.now() val currentDateTime = LocalDateTime.now()
@ -167,7 +155,6 @@ class AudioContentMainTabContentService(
return rankingService.getContentRanking( return rankingService.getContentRanking(
memberId = memberId, memberId = memberId,
isAdult = isAdult, isAdult = isAdult,
contentType = contentType,
startDate = dailyRankingStartDate, startDate = dailyRankingStartDate,
endDate = dailyRankingEndDate, endDate = dailyRankingEndDate,
sortType = sortType sortType = sortType
@ -183,7 +170,7 @@ class AudioContentMainTabContentService(
val isAdult = member.auth != null && isAdultContentVisible val isAdult = member.auth != null && isAdultContentVisible
val themeList = if (theme.isBlank()) { val themeList = if (theme.isBlank()) {
audioContentThemeRepository.getActiveThemeOfContent(isAdult = isAdult, contentType = contentType) audioContentThemeRepository.getActiveThemeOfContent(isAdult = isAdult)
.filter { .filter {
it != "모닝콜" && it != "모닝콜" &&
it != "알람" && it != "알람" &&
@ -208,23 +195,14 @@ class AudioContentMainTabContentService(
) )
} }
fun getPopularContentByCreator( fun getPopularContentByCreator(creatorId: Long, isAdult: Boolean): List<GetAudioContentRankingItem> {
creatorId: Long,
isAdult: Boolean,
contentType: ContentType
): List<GetAudioContentRankingItem> {
return rankingService.fetchCreatorContentByLikeCountTop4( return rankingService.fetchCreatorContentByLikeCountTop4(
creatorId = creatorId, creatorId = creatorId,
isAdult = isAdult, isAdult = isAdult
contentType = contentType
) )
} }
fun getRecommendedContentByTag( fun getRecommendedContentByTag(memberId: Long, tag: String): List<GetAudioContentMainItem> {
memberId: Long, return tagCurationService.getTagCurationContentList(memberId = memberId, tag = tag)
tag: String,
contentType: ContentType
): List<GetAudioContentMainItem> {
return tagCurationService.getTagCurationContentList(memberId = memberId, tag = tag, contentType = contentType)
} }
} }

39
src/main/kotlin/kr/co/vividnext/sodalive/content/main/tab/content/ContentMainTabTagCurationRepository.kt
View File

@ -1,7 +1,6 @@
package kr.co.vividnext.sodalive.content.main.tab.content package kr.co.vividnext.sodalive.content.main.tab.content
import com.querydsl.jpa.impl.JPAQueryFactory import com.querydsl.jpa.impl.JPAQueryFactory
import kr.co.vividnext.sodalive.content.ContentType
import kr.co.vividnext.sodalive.content.QAudioContent.audioContent import kr.co.vividnext.sodalive.content.QAudioContent.audioContent
import kr.co.vividnext.sodalive.content.main.GetAudioContentMainItem import kr.co.vividnext.sodalive.content.main.GetAudioContentMainItem
import kr.co.vividnext.sodalive.content.main.QGetAudioContentMainItem import kr.co.vividnext.sodalive.content.main.QGetAudioContentMainItem
@ -19,7 +18,7 @@ class ContentMainTabTagCurationRepository(
@Value("\${cloud.aws.cloud-front.host}") @Value("\${cloud.aws.cloud-front.host}")
private val imageHost: String private val imageHost: String
) { ) {
fun getTagList(isAdult: Boolean, contentType: ContentType): List<String> { fun getTagList(isAdult: Boolean): List<String> {
var where = contentHashTagCuration.isActive.isTrue var where = contentHashTagCuration.isActive.isTrue
.and(audioContent.isActive.isTrue) .and(audioContent.isActive.isTrue)
.and(audioContent.duration.isNotNull) .and(audioContent.duration.isNotNull)
@ -28,20 +27,6 @@ class ContentMainTabTagCurationRepository(
if (!isAdult) { if (!isAdult) {
where = where.and(contentHashTagCuration.isAdult.isFalse) where = where.and(contentHashTagCuration.isAdult.isFalse)
} else {
if (contentType != ContentType.ALL) {
where = where.and(
audioContent.member.isNull.or(
audioContent.member.auth.gender.eq(
if (contentType == ContentType.MALE) {
0
} else {
1
}
)
)
)
}
} }
return queryFactory return queryFactory
@ -57,36 +42,18 @@ class ContentMainTabTagCurationRepository(
.fetch() .fetch()
} }
fun getTagCurationContentList( fun getTagCurationContentList(memberId: Long, tag: String): List<GetAudioContentMainItem> {
memberId: Long,
tag: String,
contentType: ContentType
): List<GetAudioContentMainItem> {
val blockMemberCondition = blockMember.member.id.eq(member.id) val blockMemberCondition = blockMember.member.id.eq(member.id)
.and(blockMember.isActive.isTrue) .and(blockMember.isActive.isTrue)
.and(blockMember.blockedMember.id.eq(memberId)) .and(blockMember.blockedMember.id.eq(memberId))
var where = audioContent.isActive.isTrue val where = audioContent.isActive.isTrue
.and(audioContent.duration.isNotNull) .and(audioContent.duration.isNotNull)
.and(audioContent.limited.isNull) .and(audioContent.limited.isNull)
.and(blockMember.id.isNull) .and(blockMember.id.isNull)
.and(contentHashTagCurationItem.isActive.isTrue) .and(contentHashTagCurationItem.isActive.isTrue)
.and(contentHashTagCuration.tag.eq(tag)) .and(contentHashTagCuration.tag.eq(tag))
if (contentType != ContentType.ALL) {
where = where.and(
audioContent.member.isNull.or(
audioContent.member.auth.gender.eq(
if (contentType == ContentType.MALE) {
0
} else {
1
}
)
)
)
}
return queryFactory return queryFactory
.select( .select(
QGetAudioContentMainItem( QGetAudioContentMainItem(

13
src/main/kotlin/kr/co/vividnext/sodalive/content/main/tab/content/ContentMainTabTagCurationService.kt
View File

@ -1,20 +1,15 @@
package kr.co.vividnext.sodalive.content.main.tab.content package kr.co.vividnext.sodalive.content.main.tab.content
import kr.co.vividnext.sodalive.content.ContentType
import kr.co.vividnext.sodalive.content.main.GetAudioContentMainItem import kr.co.vividnext.sodalive.content.main.GetAudioContentMainItem
import org.springframework.stereotype.Service import org.springframework.stereotype.Service
@Service @Service
class ContentMainTabTagCurationService(private val repository: ContentMainTabTagCurationRepository) { class ContentMainTabTagCurationService(private val repository: ContentMainTabTagCurationRepository) {
fun getTagList(isAdult: Boolean, contentType: ContentType): List<String> { fun getTagList(isAdult: Boolean): List<String> {
return repository.getTagList(isAdult = isAdult, contentType = contentType) return repository.getTagList(isAdult = isAdult)
} }
fun getTagCurationContentList( fun getTagCurationContentList(memberId: Long, tag: String): List<GetAudioContentMainItem> {
memberId: Long, return repository.getTagCurationContentList(memberId = memberId, tag = tag)
tag: String,
contentType: ContentType
): List<GetAudioContentMainItem> {
return repository.getTagCurationContentList(memberId = memberId, tag = tag, contentType = contentType)
} }
} }

19
src/main/kotlin/kr/co/vividnext/sodalive/content/main/tab/free/AudioContentMainTabFreeController.kt
View File

@ -16,25 +16,15 @@ import org.springframework.web.bind.annotation.RestController
class AudioContentMainTabFreeController(private val service: AudioContentMainTabFreeService) { class AudioContentMainTabFreeController(private val service: AudioContentMainTabFreeService) {
@GetMapping @GetMapping
fun fetchContentMainFree( fun fetchContentMainFree(
@RequestParam("isAdultContentVisible", required = false) isAdultContentVisible: Boolean? = null,
@RequestParam("contentType", required = false) contentType: ContentType? = null,
@AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member? @AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member?
) = run { ) = run {
if (member == null) throw SodaException("로그인 정보를 확인해주세요.") if (member == null) throw SodaException("로그인 정보를 확인해주세요.")
ApiResponse.ok( ApiResponse.ok(service.fetchData(member))
service.fetchData(
isAdultContentVisible = isAdultContentVisible ?: true,
contentType = contentType ?: ContentType.ALL,
member
)
)
} }
@GetMapping("/introduce-creator") @GetMapping("/introduce-creator")
fun getIntroduceCreator( fun getIntroduceCreator(
@RequestParam("isAdultContentVisible", required = false) isAdultContentVisible: Boolean? = null,
@RequestParam("contentType", required = false) contentType: ContentType? = null,
@AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member?, @AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member?,
pageable: Pageable pageable: Pageable
) = run { ) = run {
@ -43,8 +33,6 @@ class AudioContentMainTabFreeController(private val service: AudioContentMainTab
ApiResponse.ok( ApiResponse.ok(
service.getIntroduceCreator( service.getIntroduceCreator(
member, member,
isAdultContentVisible = isAdultContentVisible ?: true,
contentType = contentType ?: ContentType.ALL,
offset = pageable.offset, offset = pageable.offset,
limit = pageable.pageSize.toLong() limit = pageable.pageSize.toLong()
) )
@ -76,8 +64,6 @@ class AudioContentMainTabFreeController(private val service: AudioContentMainTab
@GetMapping("/popular-content-by-creator") @GetMapping("/popular-content-by-creator")
fun getPopularContentByCreator( fun getPopularContentByCreator(
@RequestParam creatorId: Long, @RequestParam creatorId: Long,
@RequestParam("isAdultContentVisible", required = false) isAdultContentVisible: Boolean? = null,
@RequestParam("contentType", required = false) contentType: ContentType? = null,
@AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member? @AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member?
) = run { ) = run {
if (member == null) throw SodaException("로그인 정보를 확인해주세요.") if (member == null) throw SodaException("로그인 정보를 확인해주세요.")
@ -85,8 +71,7 @@ class AudioContentMainTabFreeController(private val service: AudioContentMainTab
ApiResponse.ok( ApiResponse.ok(
service.getPopularContentByCreator( service.getPopularContentByCreator(
creatorId = creatorId, creatorId = creatorId,
isAdult = member.auth != null && (isAdultContentVisible ?: true), isAdult = member.auth != null
contentType = contentType ?: ContentType.ALL
) )
) )
} }

65
src/main/kotlin/kr/co/vividnext/sodalive/content/main/tab/free/AudioContentMainTabFreeService.kt
View File

@ -25,12 +25,8 @@ class AudioContentMainTabFreeService(
private val audioContentRepository: AudioContentRepository, private val audioContentRepository: AudioContentRepository,
private val audioContentThemeRepository: AudioContentThemeQueryRepository private val audioContentThemeRepository: AudioContentThemeQueryRepository
) { ) {
fun fetchData( fun fetchData(member: Member): GetContentMainTabFreeResponse {
isAdultContentVisible: Boolean, val isAdult = member.auth != null
contentType: ContentType,
member: Member
): GetContentMainTabFreeResponse {
val isAdult = member.auth != null && isAdultContentVisible
val memberId = member.id!! val memberId = member.id!!
val tabId = 7L val tabId = 7L
@ -44,28 +40,22 @@ class AudioContentMainTabFreeService(
tabId = tabId, tabId = tabId,
title = "크리에이터 소개", title = "크리에이터 소개",
isAdult = isAdult isAdult = isAdult
).map { )
.map {
GetContentCurationResponse( GetContentCurationResponse(
title = it.title, title = it.title,
items = contentRepository.findAudioContentByCurationIdV2( items = contentRepository.findAudioContentByCurationIdV2(
curationId = it.id!!, curationId = it.id!!,
memberId = memberId, memberId = memberId,
isAdult = isAdult, isAdult = isAdult
contentType = contentType
) )
) )
}.filter { it.items.isNotEmpty() } }
val recommendSeriesList = recommendSeriesRepository.getRecommendSeriesList( val recommendSeriesList = recommendSeriesRepository.getRecommendSeriesList(isAdult = isAdult)
isAdult = isAdult,
contentType = contentType
)
val themeList = audioContentThemeRepository.getActiveThemeOfContent( val themeList = audioContentThemeRepository.getActiveThemeOfContent(isAdult = isAdult, isFree = true)
isAdult = isAdult, .filter {
isFree = true,
contentType = contentType
).filter {
it != "모닝콜" && it != "모닝콜" &&
it != "알람" && it != "알람" &&
it != "슬립콜" && it != "슬립콜" &&
@ -79,8 +69,8 @@ class AudioContentMainTabFreeService(
audioContentRepository.findByTheme( audioContentRepository.findByTheme(
memberId = member.id!!, memberId = member.id!!,
theme = themeList, theme = themeList,
isAdult = isAdult, isAdult = member.auth != null,
contentType = contentType, contentType = ContentType.ALL,
offset = 0, offset = 0,
limit = 10, limit = 10,
isFree = true isFree = true
@ -89,9 +79,9 @@ class AudioContentMainTabFreeService(
emptyList() emptyList()
} }
val creatorList = repository.findCreatorWithHasFreeContent(memberId, 4, isAdult, contentType) val creatorList = repository.findCreatorWithHasFreeContent(memberId, 4)
val playCountRankContentList = if (creatorList.isNotEmpty()) { val playCountRankContentList = if (creatorList.isNotEmpty()) {
rankingService.fetchFreeContentByCreatorIdTop4(creatorList[0].creatorId, isAdult, contentType) rankingService.fetchFreeContentByCreatorIdTop4(creatorList[0].creatorId, isAdult)
} else { } else {
emptyList() emptyList()
} }
@ -104,12 +94,10 @@ class AudioContentMainTabFreeService(
items = contentRepository.findAudioContentByCurationIdV2( items = contentRepository.findAudioContentByCurationIdV2(
curationId = it.id!!, curationId = it.id!!,
memberId = memberId, memberId = memberId,
isAdult = isAdult, isAdult = isAdult
contentType = contentType
) )
) )
} }
.filter { it.items.isNotEmpty() }
return GetContentMainTabFreeResponse( return GetContentMainTabFreeResponse(
contentBannerList = contentBannerList, contentBannerList = contentBannerList,
@ -127,14 +115,8 @@ class AudioContentMainTabFreeService(
) )
} }
fun getIntroduceCreator( fun getIntroduceCreator(member: Member, offset: Long, limit: Long): List<GetAudioContentMainItem> {
member: Member, val isAdult = member.auth != null
isAdultContentVisible: Boolean,
contentType: ContentType,
offset: Long,
limit: Long
): List<GetAudioContentMainItem> {
val isAdult = member.auth != null && isAdultContentVisible
val memberId = member.id!! val memberId = member.id!!
val introduceCreatorCuration = curationRepository.findByContentMainTabIdAndTitle( val introduceCreatorCuration = curationRepository.findByContentMainTabIdAndTitle(
@ -148,7 +130,6 @@ class AudioContentMainTabFreeService(
curationId = introduceCreatorCuration[0].id!!, curationId = introduceCreatorCuration[0].id!!,
memberId = memberId, memberId = memberId,
isAdult = isAdult, isAdult = isAdult,
contentType = contentType,
offset = offset, offset = offset,
limit = limit limit = limit
) )
@ -172,9 +153,9 @@ class AudioContentMainTabFreeService(
} else { } else {
audioContentThemeRepository.getActiveThemeOfContent( audioContentThemeRepository.getActiveThemeOfContent(
isAdult = member.auth != null && isAdultContentVisible, isAdult = member.auth != null && isAdultContentVisible,
isFree = true, isFree = true
contentType = contentType )
).filter { .filter {
it != "모닝콜" && it != "모닝콜" &&
it != "알람" && it != "알람" &&
it != "슬립콜" && it != "슬립콜" &&
@ -193,11 +174,7 @@ class AudioContentMainTabFreeService(
) )
} }
fun getPopularContentByCreator( fun getPopularContentByCreator(creatorId: Long, isAdult: Boolean): List<GetAudioContentRankingItem> {
creatorId: Long, return rankingService.fetchFreeContentByCreatorIdTop4(creatorId, isAdult)
isAdult: Boolean,
contentType: ContentType
): List<GetAudioContentRankingItem> {
return rankingService.fetchFreeContentByCreatorIdTop4(creatorId, isAdult, contentType)
} }
} }

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

@ -2,7 +2,6 @@ package kr.co.vividnext.sodalive.content.main.tab.home
import kr.co.vividnext.sodalive.common.ApiResponse import kr.co.vividnext.sodalive.common.ApiResponse
import kr.co.vividnext.sodalive.common.SodaException import kr.co.vividnext.sodalive.common.SodaException
import kr.co.vividnext.sodalive.content.ContentType
import kr.co.vividnext.sodalive.member.Member import kr.co.vividnext.sodalive.member.Member
import org.springframework.security.core.annotation.AuthenticationPrincipal import org.springframework.security.core.annotation.AuthenticationPrincipal
import org.springframework.web.bind.annotation.GetMapping import org.springframework.web.bind.annotation.GetMapping
@ -15,26 +14,16 @@ import org.springframework.web.bind.annotation.RestController
class AudioContentMainTabHomeController(private val service: AudioContentMainTabHomeService) { class AudioContentMainTabHomeController(private val service: AudioContentMainTabHomeService) {
@GetMapping @GetMapping
fun fetchContentMainHome( fun fetchContentMainHome(
@RequestParam("isAdultContentVisible", required = false) isAdultContentVisible: Boolean? = null,
@RequestParam("contentType", required = false) contentType: ContentType? = null,
@AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member? @AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member?
) = run { ) = run {
if (member == null) throw SodaException("로그인 정보를 확인해주세요.") if (member == null) throw SodaException("로그인 정보를 확인해주세요.")
ApiResponse.ok( ApiResponse.ok(service.fetchData(member))
service.fetchData(
isAdultContentVisible = isAdultContentVisible ?: true,
contentType = contentType ?: ContentType.ALL,
member
)
)
} }
@GetMapping("/popular-content-by-creator") @GetMapping("/popular-content-by-creator")
fun getPopularContentByCreator( fun getPopularContentByCreator(
@RequestParam creatorId: Long, @RequestParam creatorId: Long,
@RequestParam("isAdultContentVisible", required = false) isAdultContentVisible: Boolean? = null,
@RequestParam("contentType", required = false) contentType: ContentType? = null,
@AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member? @AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member?
) = run { ) = run {
if (member == null) throw SodaException("로그인 정보를 확인해주세요.") if (member == null) throw SodaException("로그인 정보를 확인해주세요.")
@ -42,8 +31,7 @@ class AudioContentMainTabHomeController(private val service: AudioContentMainTab
ApiResponse.ok( ApiResponse.ok(
service.getPopularContentByCreator( service.getPopularContentByCreator(
creatorId = creatorId, creatorId = creatorId,
isAdult = member.auth != null && (isAdultContentVisible ?: true), isAdult = member.auth != null
contentType = contentType ?: ContentType.ALL
) )
) )
} }

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

@ -1,6 +1,5 @@
package kr.co.vividnext.sodalive.content.main.tab.home package kr.co.vividnext.sodalive.content.main.tab.home
import kr.co.vividnext.sodalive.content.ContentType
import kr.co.vividnext.sodalive.content.main.GetAudioContentRankingItem import kr.co.vividnext.sodalive.content.main.GetAudioContentRankingItem
import kr.co.vividnext.sodalive.content.main.banner.AudioContentBannerService import kr.co.vividnext.sodalive.content.main.banner.AudioContentBannerService
import kr.co.vividnext.sodalive.event.EventService import kr.co.vividnext.sodalive.event.EventService
@ -20,11 +19,7 @@ class AudioContentMainTabHomeService(
private val rankingService: RankingService, private val rankingService: RankingService,
private val eventService: EventService private val eventService: EventService
) { ) {
fun fetchData( fun fetchData(member: Member): GetContentMainTabHomeResponse {
isAdultContentVisible: Boolean,
contentType: ContentType,
member: Member
): GetContentMainTabHomeResponse {
// 주간 랭킹 기간 // 주간 랭킹 기간
val currentDateTime = LocalDateTime.now() val currentDateTime = LocalDateTime.now()
val startDate = currentDateTime val startDate = currentDateTime
@ -42,8 +37,6 @@ class AudioContentMainTabHomeService(
val formattedLastMonday = startDate.format(startDateFormatter) val formattedLastMonday = startDate.format(startDateFormatter)
val formattedLastSunday = endDate.format(endDateFormatter) val formattedLastSunday = endDate.format(endDateFormatter)
val isAdult = member.auth != null && isAdultContentVisible
// 최근 공지사항 // 최근 공지사항
val latestNotice = noticeService.getLatestNotice() val latestNotice = noticeService.getLatestNotice()
@ -51,7 +44,7 @@ class AudioContentMainTabHomeService(
val contentBannerList = bannerService.getBannerList( val contentBannerList = bannerService.getBannerList(
tabId = 1, tabId = 1,
memberId = member.id!!, memberId = member.id!!,
isAdult = isAdult isAdult = member.auth != null
) )
// 인기 크리에이터 // 인기 크리에이터
@ -63,8 +56,7 @@ class AudioContentMainTabHomeService(
// 인기 시리즈 // 인기 시리즈
val rankSeriesList = rankingService.getSeriesRanking( val rankSeriesList = rankingService.getSeriesRanking(
memberId = member.id!!, memberId = member.id!!,
isAdult = isAdult, isAdult = member.auth != null,
contentType = contentType,
startDate = startDate.minusDays(1), startDate = startDate.minusDays(1),
endDate = endDate endDate = endDate
) )
@ -72,18 +64,16 @@ class AudioContentMainTabHomeService(
// 인기 콘텐츠 // 인기 콘텐츠
val rankContentList = rankingService.getContentRanking( val rankContentList = rankingService.getContentRanking(
memberId = member.id!!, memberId = member.id!!,
isAdult = isAdult, isAdult = member.auth != null,
contentType = contentType,
startDate = startDate.minusDays(1), startDate = startDate.minusDays(1),
endDate = endDate endDate = endDate
) )
// 이벤트 배너 // 이벤트 배너
val eventBannerList = eventService.getEventList(isAdult = isAdult) val eventBannerList = eventService.getEventList(isAdult = member.auth != null)
val contentRankCreatorList = rankingService.fetchCreatorBySellContentCountRankTop20( val contentRankCreatorList = rankingService.fetchCreatorBySellContentCountRankTop20(
memberId = member.id!!, memberId = member.id!!,
contentType = contentType,
startDate = startDate.minusDays(1), startDate = startDate.minusDays(1),
endDate = endDate endDate = endDate
) )
@ -91,8 +81,7 @@ class AudioContentMainTabHomeService(
val salesCountRankContentList = if (contentRankCreatorList.isNotEmpty()) { val salesCountRankContentList = if (contentRankCreatorList.isNotEmpty()) {
rankingService.fetchCreatorContentBySalesCountTop4( rankingService.fetchCreatorContentBySalesCountTop4(
creatorId = contentRankCreatorList[0].creatorId, creatorId = contentRankCreatorList[0].creatorId,
isAdult = isAdult, isAdult = member.auth != null
contentType = contentType
) )
} else { } else {
emptyList() emptyList()
@ -111,15 +100,10 @@ class AudioContentMainTabHomeService(
) )
} }
fun getPopularContentByCreator( fun getPopularContentByCreator(creatorId: Long, isAdult: Boolean): List<GetAudioContentRankingItem> {
creatorId: Long,
isAdult: Boolean,
contentType: ContentType
): List<GetAudioContentRankingItem> {
return rankingService.fetchCreatorContentBySalesCountTop4( return rankingService.fetchCreatorContentBySalesCountTop4(
creatorId = creatorId, creatorId = creatorId,
isAdult = isAdult, isAdult = isAdult
contentType = contentType
) )
} }
} }

16
src/main/kotlin/kr/co/vividnext/sodalive/content/main/tab/replay/AudioContentMainTabLiveReplayController.kt
View File

@ -2,7 +2,6 @@ package kr.co.vividnext.sodalive.content.main.tab.replay
import kr.co.vividnext.sodalive.common.ApiResponse import kr.co.vividnext.sodalive.common.ApiResponse
import kr.co.vividnext.sodalive.common.SodaException import kr.co.vividnext.sodalive.common.SodaException
import kr.co.vividnext.sodalive.content.ContentType
import kr.co.vividnext.sodalive.member.Member import kr.co.vividnext.sodalive.member.Member
import org.springframework.security.core.annotation.AuthenticationPrincipal import org.springframework.security.core.annotation.AuthenticationPrincipal
import org.springframework.web.bind.annotation.GetMapping import org.springframework.web.bind.annotation.GetMapping
@ -15,26 +14,16 @@ import org.springframework.web.bind.annotation.RestController
class AudioContentMainTabLiveReplayController(private val service: AudioContentMainTabLiveReplayService) { class AudioContentMainTabLiveReplayController(private val service: AudioContentMainTabLiveReplayService) {
@GetMapping @GetMapping
fun fetchContentMainTabLiveReplay( fun fetchContentMainTabLiveReplay(
@RequestParam("isAdultContentVisible", required = false) isAdultContentVisible: Boolean? = null,
@RequestParam("contentType", required = false) contentType: ContentType? = null,
@AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member? @AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member?
) = run { ) = run {
if (member == null) throw SodaException("로그인 정보를 확인해주세요.") if (member == null) throw SodaException("로그인 정보를 확인해주세요.")
ApiResponse.ok( ApiResponse.ok(service.fetchData(member))
service.fetchData(
isAdultContentVisible = isAdultContentVisible ?: true,
contentType = contentType ?: ContentType.ALL,
member
)
)
} }
@GetMapping("/popular-content-by-creator") @GetMapping("/popular-content-by-creator")
fun getPopularContentByCreator( fun getPopularContentByCreator(
@RequestParam creatorId: Long, @RequestParam creatorId: Long,
@RequestParam("isAdultContentVisible", required = false) isAdultContentVisible: Boolean? = null,
@RequestParam("contentType", required = false) contentType: ContentType? = null,
@AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member? @AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member?
) = run { ) = run {
if (member == null) throw SodaException("로그인 정보를 확인해주세요.") if (member == null) throw SodaException("로그인 정보를 확인해주세요.")
@ -42,8 +31,7 @@ class AudioContentMainTabLiveReplayController(private val service: AudioContentM
ApiResponse.ok( ApiResponse.ok(
service.getPopularContentByCreator( service.getPopularContentByCreator(
creatorId = creatorId, creatorId = creatorId,
isAdult = member.auth != null && (isAdultContentVisible ?: true), isAdult = member.auth != null
contentType = contentType ?: ContentType.ALL
) )
) )
} }

26
src/main/kotlin/kr/co/vividnext/sodalive/content/main/tab/replay/AudioContentMainTabLiveReplayService.kt
View File

@ -21,12 +21,8 @@ class AudioContentMainTabLiveReplayService(
private val eventService: EventService, private val eventService: EventService,
private val curationRepository: AudioContentCurationQueryRepository private val curationRepository: AudioContentCurationQueryRepository
) { ) {
fun fetchData( fun fetchData(member: Member): GetContentMainTabLiveReplayResponse {
isAdultContentVisible: Boolean, val isAdult = member.auth != null
contentType: ContentType,
member: Member
): GetContentMainTabLiveReplayResponse {
val isAdult = member.auth != null && isAdultContentVisible
val memberId = member.id!! val memberId = member.id!!
val theme = "다시듣기" val theme = "다시듣기"
val tabId = 6L val tabId = 6L
@ -41,23 +37,20 @@ class AudioContentMainTabLiveReplayService(
memberId = memberId, memberId = memberId,
theme = listOf(theme), theme = listOf(theme),
isAdult = isAdult, isAdult = isAdult,
contentType = contentType, contentType = ContentType.ALL,
limit = 10 limit = 10
) )
val creatorList = repository.findCreatorByThemeContent( val creatorList = repository.findCreatorByThemeContent(
memberId = memberId, memberId = memberId,
theme = theme, theme = theme,
minCount = 4, minCount = 4
isAdult = isAdult,
contentType = contentType
) )
val salesCountRankContentList = if (creatorList.isNotEmpty()) { val salesCountRankContentList = if (creatorList.isNotEmpty()) {
rankingService.fetchCreatorContentBySalesCountTop4( rankingService.fetchCreatorContentBySalesCountTop4(
creatorId = creatorList[0].creatorId, creatorId = creatorList[0].creatorId,
isAdult = isAdult, isAdult = isAdult,
contentType = contentType,
theme = theme theme = theme
) )
} else { } else {
@ -73,12 +66,10 @@ class AudioContentMainTabLiveReplayService(
items = contentRepository.findAudioContentByCurationIdV2( items = contentRepository.findAudioContentByCurationIdV2(
curationId = it.id!!, curationId = it.id!!,
memberId = memberId, memberId = memberId,
isAdult = isAdult, isAdult = isAdult
contentType = contentType
) )
) )
} }
.filter { it.items.isNotEmpty() }
return GetContentMainTabLiveReplayResponse( return GetContentMainTabLiveReplayResponse(
contentBannerList = contentBannerList, contentBannerList = contentBannerList,
@ -90,15 +81,10 @@ class AudioContentMainTabLiveReplayService(
) )
} }
fun getPopularContentByCreator( fun getPopularContentByCreator(creatorId: Long, isAdult: Boolean): List<GetAudioContentRankingItem> {
creatorId: Long,
isAdult: Boolean,
contentType: ContentType
): List<GetAudioContentRankingItem> {
return rankingService.fetchCreatorContentBySalesCountTop4( return rankingService.fetchCreatorContentBySalesCountTop4(
creatorId = creatorId, creatorId = creatorId,
isAdult = isAdult, isAdult = isAdult,
contentType = contentType,
theme = "다시듣기" theme = "다시듣기"
) )
} }

31
src/main/kotlin/kr/co/vividnext/sodalive/content/main/tab/series/AudioContentMainTabSeriesController.kt
View File

@ -2,7 +2,6 @@ package kr.co.vividnext.sodalive.content.main.tab.series
import kr.co.vividnext.sodalive.common.ApiResponse import kr.co.vividnext.sodalive.common.ApiResponse
import kr.co.vividnext.sodalive.common.SodaException import kr.co.vividnext.sodalive.common.SodaException
import kr.co.vividnext.sodalive.content.ContentType
import kr.co.vividnext.sodalive.member.Member import kr.co.vividnext.sodalive.member.Member
import org.springframework.data.domain.Pageable import org.springframework.data.domain.Pageable
import org.springframework.security.core.annotation.AuthenticationPrincipal import org.springframework.security.core.annotation.AuthenticationPrincipal
@ -16,25 +15,15 @@ import org.springframework.web.bind.annotation.RestController
class AudioContentMainTabSeriesController(private val service: AudioContentMainTabSeriesService) { class AudioContentMainTabSeriesController(private val service: AudioContentMainTabSeriesService) {
@GetMapping @GetMapping
fun fetchContentMainSeries( fun fetchContentMainSeries(
@RequestParam("isAdultContentVisible", required = false) isAdultContentVisible: Boolean? = null,
@RequestParam("contentType", required = false) contentType: ContentType? = null,
@AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member? @AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member?
) = run { ) = run {
if (member == null) throw SodaException("로그인 정보를 확인해주세요.") if (member == null) throw SodaException("로그인 정보를 확인해주세요.")
ApiResponse.ok( ApiResponse.ok(service.fetchData(member))
service.fetchData(
isAdultContentVisible = isAdultContentVisible ?: true,
contentType = contentType ?: ContentType.ALL,
member
)
)
} }
@GetMapping("/original") @GetMapping("/original")
fun getOriginalAudioDramaList( fun getOriginalAudioDramaList(
@RequestParam("isAdultContentVisible", required = false) isAdultContentVisible: Boolean? = null,
@RequestParam("contentType", required = false) contentType: ContentType? = null,
@AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member?, @AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member?,
pageable: Pageable pageable: Pageable
) = run { ) = run {
@ -43,8 +32,7 @@ class AudioContentMainTabSeriesController(private val service: AudioContentMainT
ApiResponse.ok( ApiResponse.ok(
service.getOriginalAudioDramaList( service.getOriginalAudioDramaList(
memberId = member.id!!, memberId = member.id!!,
isAdult = member.auth != null && (isAdultContentVisible ?: true), isAdult = member.auth != null,
contentType = contentType ?: ContentType.ALL,
offset = pageable.offset, offset = pageable.offset,
limit = pageable.pageSize.toLong() limit = pageable.pageSize.toLong()
) )
@ -53,8 +41,6 @@ class AudioContentMainTabSeriesController(private val service: AudioContentMainT
@GetMapping("/completed-rank") @GetMapping("/completed-rank")
fun getRank10DaysCompletedSeriesList( fun getRank10DaysCompletedSeriesList(
@RequestParam("isAdultContentVisible", required = false) isAdultContentVisible: Boolean? = null,
@RequestParam("contentType", required = false) contentType: ContentType? = null,
@AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member?, @AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member?,
pageable: Pageable pageable: Pageable
) = run { ) = run {
@ -63,8 +49,7 @@ class AudioContentMainTabSeriesController(private val service: AudioContentMainT
ApiResponse.ok( ApiResponse.ok(
service.getRank10DaysCompletedSeriesList( service.getRank10DaysCompletedSeriesList(
memberId = member.id!!, memberId = member.id!!,
isAdult = member.auth != null && (isAdultContentVisible ?: true), isAdult = member.auth != null,
contentType = contentType ?: ContentType.ALL,
offset = pageable.offset, offset = pageable.offset,
limit = pageable.pageSize.toLong() limit = pageable.pageSize.toLong()
) )
@ -74,8 +59,6 @@ class AudioContentMainTabSeriesController(private val service: AudioContentMainT
@GetMapping("/recommend-by-genre") @GetMapping("/recommend-by-genre")
fun getRecommendSeriesListByGenre( fun getRecommendSeriesListByGenre(
@RequestParam genreId: Long, @RequestParam genreId: Long,
@RequestParam("isAdultContentVisible", required = false) isAdultContentVisible: Boolean? = null,
@RequestParam("contentType", required = false) contentType: ContentType? = null,
@AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member? @AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member?
) = run { ) = run {
if (member == null) throw SodaException("로그인 정보를 확인해주세요.") if (member == null) throw SodaException("로그인 정보를 확인해주세요.")
@ -84,8 +67,7 @@ class AudioContentMainTabSeriesController(private val service: AudioContentMainT
service.getRecommendSeriesListByGenre( service.getRecommendSeriesListByGenre(
genreId, genreId,
memberId = member.id!!, memberId = member.id!!,
isAdult = member.auth != null && (isAdultContentVisible ?: true), isAdult = member.auth != null
contentType = contentType ?: ContentType.ALL
) )
) )
} }
@ -93,8 +75,6 @@ class AudioContentMainTabSeriesController(private val service: AudioContentMainT
@GetMapping("/recommend-series-by-creator") @GetMapping("/recommend-series-by-creator")
fun getRecommendSeriesByCreator( fun getRecommendSeriesByCreator(
@RequestParam creatorId: Long, @RequestParam creatorId: Long,
@RequestParam("isAdultContentVisible", required = false) isAdultContentVisible: Boolean? = null,
@RequestParam("contentType", required = false) contentType: ContentType? = null,
@AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member? @AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member?
) = run { ) = run {
if (member == null) throw SodaException("로그인 정보를 확인해주세요.") if (member == null) throw SodaException("로그인 정보를 확인해주세요.")
@ -102,8 +82,7 @@ class AudioContentMainTabSeriesController(private val service: AudioContentMainT
ApiResponse.ok( ApiResponse.ok(
service.getRecommendSeriesByCreator( service.getRecommendSeriesByCreator(
creatorId = creatorId, creatorId = creatorId,
isAdult = member.auth != null && (isAdultContentVisible ?: true), isAdult = member.auth != null
contentType = contentType ?: ContentType.ALL
) )
) )
} }

46
src/main/kotlin/kr/co/vividnext/sodalive/content/main/tab/series/AudioContentMainTabSeriesService.kt
View File

@ -1,6 +1,5 @@
package kr.co.vividnext.sodalive.content.main.tab.series package kr.co.vividnext.sodalive.content.main.tab.series
import kr.co.vividnext.sodalive.content.ContentType
import kr.co.vividnext.sodalive.content.main.banner.AudioContentBannerService import kr.co.vividnext.sodalive.content.main.banner.AudioContentBannerService
import kr.co.vividnext.sodalive.content.main.curation.AudioContentCurationQueryRepository import kr.co.vividnext.sodalive.content.main.curation.AudioContentCurationQueryRepository
import kr.co.vividnext.sodalive.content.main.tab.RecommendSeriesRepository import kr.co.vividnext.sodalive.content.main.tab.RecommendSeriesRepository
@ -25,12 +24,8 @@ class AudioContentMainTabSeriesService(
private val eventService: EventService, private val eventService: EventService,
private val curationRepository: AudioContentCurationQueryRepository private val curationRepository: AudioContentCurationQueryRepository
) { ) {
fun fetchData( fun fetchData(member: Member): GetContentMainTabSeriesResponse {
isAdultContentVisible: Boolean, val isAdult = member.auth != null
contentType: ContentType,
member: Member
): GetContentMainTabSeriesResponse {
val isAdult = member.auth != null && isAdultContentVisible
val memberId = member.id!! val memberId = member.id!!
// 메인 배너 (시리즈) // 메인 배너 (시리즈)
@ -43,7 +38,6 @@ class AudioContentMainTabSeriesService(
val originalAudioDrama = seriesService.getOriginalAudioDramaList( val originalAudioDrama = seriesService.getOriginalAudioDramaList(
memberId = memberId, memberId = memberId,
isAdult = isAdult, isAdult = isAdult,
contentType = contentType,
offset = 0, offset = 0,
limit = 20 limit = 20
) )
@ -61,20 +55,18 @@ class AudioContentMainTabSeriesService(
val rankSeriesList = rankingService.getSeriesRanking( val rankSeriesList = rankingService.getSeriesRanking(
memberId = memberId, memberId = memberId,
isAdult = isAdult, isAdult = isAdult,
contentType = contentType,
startDate = dailyRankingStartDate, startDate = dailyRankingStartDate,
endDate = dailyRankingEndDate endDate = dailyRankingEndDate
) )
// 시리즈 장르 // 시리즈 장르
val genreList = seriesService.getGenreList(memberId = memberId, isAdult = isAdult, contentType = contentType) val genreList = seriesService.getGenreList(memberId = memberId, isAdult = isAdult)
// 장르별 추천 시리즈 // 장르별 추천 시리즈
val recommendSeriesList = if (genreList.isNotEmpty()) { val recommendSeriesList = if (genreList.isNotEmpty()) {
rankingService.getSeriesAllRankingByGenre( rankingService.getSeriesAllRankingByGenre(
memberId = memberId, memberId = memberId,
isAdult = isAdult, isAdult = isAdult,
contentType = contentType,
genreId = genreList[0].id genreId = genreList[0].id
) )
} else { } else {
@ -82,14 +74,13 @@ class AudioContentMainTabSeriesService(
} }
// 새로운 시리즈 // 새로운 시리즈
val newSeriesList = recommendSeriesRepository.getNewSeriesList(isAdult = isAdult, contentType = contentType) val newSeriesList = recommendSeriesRepository.getNewSeriesList(isAdult = isAdult)
val (completedRankStartDate, completedRankEndDate) = calculateStartAndEndDate() val (completedRankStartDate, completedRankEndDate) = calculateStartAndEndDate()
val rankCompleteSeriesList = rankingService.getCompleteSeriesRanking( val rankCompleteSeriesList = rankingService.getCompleteSeriesRanking(
memberId = memberId, memberId = memberId,
isAdult = isAdult, isAdult = isAdult,
contentType = contentType,
startDate = completedRankStartDate, startDate = completedRankStartDate,
endDate = completedRankEndDate endDate = completedRankEndDate
) )
@ -105,7 +96,6 @@ class AudioContentMainTabSeriesService(
val seriesRankCreatorList = rankingService.fetchCreatorBySeriesRevenueRankTop20( val seriesRankCreatorList = rankingService.fetchCreatorBySeriesRevenueRankTop20(
memberId = memberId, memberId = memberId,
contentType = contentType,
startDate = startDate.minusDays(1), startDate = startDate.minusDays(1),
endDate = endDate endDate = endDate
) )
@ -113,8 +103,7 @@ class AudioContentMainTabSeriesService(
val salesRankContentList = if (seriesRankCreatorList.isNotEmpty()) { val salesRankContentList = if (seriesRankCreatorList.isNotEmpty()) {
rankingService.fetchCreatorSeriesBySales( rankingService.fetchCreatorSeriesBySales(
creatorId = seriesRankCreatorList[0].creatorId, creatorId = seriesRankCreatorList[0].creatorId,
isAdult = isAdult, isAdult = isAdult
contentType = contentType
) )
} else { } else {
emptyList() emptyList()
@ -131,8 +120,7 @@ class AudioContentMainTabSeriesService(
items = seriesService.fetchSeriesByCurationId( items = seriesService.fetchSeriesByCurationId(
curationId = it.id!!, curationId = it.id!!,
memberId = memberId, memberId = memberId,
isAdult = isAdult, isAdult = isAdult
contentType = contentType
) )
) )
} }
@ -160,15 +148,13 @@ class AudioContentMainTabSeriesService(
fun getOriginalAudioDramaList( fun getOriginalAudioDramaList(
memberId: Long, memberId: Long,
isAdult: Boolean, isAdult: Boolean,
contentType: ContentType,
offset: Long, offset: Long,
limit: Long limit: Long
): GetSeriesListResponse { ): GetSeriesListResponse {
val totalCount = seriesService.getOriginalAudioDramaTotalCount(memberId, isAdult, contentType) val totalCount = seriesService.getOriginalAudioDramaTotalCount(memberId, isAdult)
val items = seriesService.getOriginalAudioDramaList( val items = seriesService.getOriginalAudioDramaList(
memberId = memberId, memberId = memberId,
isAdult = isAdult, isAdult = isAdult,
contentType = contentType,
offset = offset, offset = offset,
limit = limit limit = limit
) )
@ -179,7 +165,6 @@ class AudioContentMainTabSeriesService(
fun getRank10DaysCompletedSeriesList( fun getRank10DaysCompletedSeriesList(
memberId: Long, memberId: Long,
isAdult: Boolean, isAdult: Boolean,
contentType: ContentType,
offset: Long, offset: Long,
limit: Long limit: Long
): GetSeriesListResponse { ): GetSeriesListResponse {
@ -187,14 +172,12 @@ class AudioContentMainTabSeriesService(
val totalCount = rankingService.getCompleteSeriesRankingTotalCount( val totalCount = rankingService.getCompleteSeriesRankingTotalCount(
memberId = memberId, memberId = memberId,
isAdult = isAdult, isAdult = isAdult
contentType = contentType
) )
val items = rankingService.getCompleteSeriesRanking( val items = rankingService.getCompleteSeriesRanking(
memberId = memberId, memberId = memberId,
isAdult = isAdult, isAdult = isAdult,
contentType = contentType,
startDate = startDate, startDate = startDate,
endDate = endDate, endDate = endDate,
offset = offset, offset = offset,
@ -207,26 +190,19 @@ class AudioContentMainTabSeriesService(
fun getRecommendSeriesListByGenre( fun getRecommendSeriesListByGenre(
genreId: Long, genreId: Long,
memberId: Long, memberId: Long,
isAdult: Boolean, isAdult: Boolean
contentType: ContentType
): List<GetSeriesListResponse.SeriesListItem> { ): List<GetSeriesListResponse.SeriesListItem> {
return rankingService.getSeriesAllRankingByGenre( return rankingService.getSeriesAllRankingByGenre(
memberId = memberId, memberId = memberId,
isAdult = isAdult, isAdult = isAdult,
contentType = contentType,
genreId = genreId genreId = genreId
) )
} }
fun getRecommendSeriesByCreator( fun getRecommendSeriesByCreator(creatorId: Long, isAdult: Boolean): List<GetSeriesListResponse.SeriesListItem> {
creatorId: Long,
isAdult: Boolean,
contentType: ContentType
): List<GetSeriesListResponse.SeriesListItem> {
return rankingService.fetchCreatorSeriesBySales( return rankingService.fetchCreatorSeriesBySales(
creatorId = creatorId, creatorId = creatorId,
isAdult = isAdult, isAdult = isAdult
contentType = contentType
) )
} }

104
src/main/kotlin/kr/co/vividnext/sodalive/content/series/ContentSeriesRepository.kt
View File

@ -35,17 +35,10 @@ interface ContentSeriesQueryRepository {
fun getKeywordList(seriesId: Long): List<String> fun getKeywordList(seriesId: Long): List<String>
fun getSeriesContentMinMaxPrice(seriesId: Long): GetSeriesContentMinMaxPriceResponse fun getSeriesContentMinMaxPrice(seriesId: Long): GetSeriesContentMinMaxPriceResponse
fun getRecommendSeriesList(isAuth: Boolean, contentType: ContentType, limit: Long): List<Series> fun getRecommendSeriesList(isAuth: Boolean, contentType: ContentType, limit: Long): List<Series>
fun getOriginalAudioDramaList( fun getOriginalAudioDramaList(memberId: Long, isAdult: Boolean, offset: Long = 0, limit: Long = 20): List<Series>
memberId: Long, fun getOriginalAudioDramaTotalCount(memberId: Long, isAdult: Boolean): Int
isAdult: Boolean, fun getGenreList(isAdult: Boolean, memberId: Long): List<GetSeriesGenreListResponse>
contentType: ContentType, fun findByCurationId(curationId: Long, memberId: Long, isAdult: Boolean): List<Series>
offset: Long = 0,
limit: Long = 20
): List<Series>
fun getOriginalAudioDramaTotalCount(memberId: Long, isAdult: Boolean, contentType: ContentType): Int
fun getGenreList(isAdult: Boolean, memberId: Long, contentType: ContentType): List<GetSeriesGenreListResponse>
fun findByCurationId(curationId: Long, memberId: Long, isAdult: Boolean, contentType: ContentType): List<Series>
} }
class ContentSeriesQueryRepositoryImpl( class ContentSeriesQueryRepositoryImpl(
@ -137,15 +130,7 @@ class ContentSeriesQueryRepositoryImpl(
} else { } else {
if (contentType != ContentType.ALL) { if (contentType != ContentType.ALL) {
where = where.and( where = where.and(
series.member.isNull.or( series.member.auth.gender.eq(if (contentType == ContentType.MALE) 0 else 1)
series.member.auth.gender.eq(
if (contentType == ContentType.MALE) {
0
} else {
1
}
)
)
) )
} }
} }
@ -159,13 +144,7 @@ class ContentSeriesQueryRepositoryImpl(
.fetch() .fetch()
} }
override fun getOriginalAudioDramaList( override fun getOriginalAudioDramaList(memberId: Long, isAdult: Boolean, offset: Long, limit: Long): List<Series> {
memberId: Long,
isAdult: Boolean,
contentType: ContentType,
offset: Long,
limit: Long
): List<Series> {
val blockMemberCondition = blockMember.member.id.eq(member.id) val blockMemberCondition = blockMember.member.id.eq(member.id)
.and(blockMember.isActive.isTrue) .and(blockMember.isActive.isTrue)
.and(blockMember.blockedMember.id.eq(memberId)) .and(blockMember.blockedMember.id.eq(memberId))
@ -176,20 +155,6 @@ class ContentSeriesQueryRepositoryImpl(
if (!isAdult) { if (!isAdult) {
where = where.and(series.isAdult.isFalse) where = where.and(series.isAdult.isFalse)
} else {
if (contentType != ContentType.ALL) {
where = where.and(
series.member.isNull.or(
series.member.auth.gender.eq(
if (contentType == ContentType.MALE) {
0
} else {
1
}
)
)
)
}
} }
return queryFactory return queryFactory
@ -203,7 +168,7 @@ class ContentSeriesQueryRepositoryImpl(
.fetch() .fetch()
} }
override fun getOriginalAudioDramaTotalCount(memberId: Long, isAdult: Boolean, contentType: ContentType): Int { override fun getOriginalAudioDramaTotalCount(memberId: Long, isAdult: Boolean): Int {
val blockMemberCondition = blockMember.member.id.eq(member.id) val blockMemberCondition = blockMember.member.id.eq(member.id)
.and(blockMember.isActive.isTrue) .and(blockMember.isActive.isTrue)
.and(blockMember.blockedMember.id.eq(memberId)) .and(blockMember.blockedMember.id.eq(memberId))
@ -214,20 +179,6 @@ class ContentSeriesQueryRepositoryImpl(
if (!isAdult) { if (!isAdult) {
where = where.and(series.isAdult.isFalse) where = where.and(series.isAdult.isFalse)
} else {
if (contentType != ContentType.ALL) {
where = where.and(
series.member.isNull.or(
series.member.auth.gender.eq(
if (contentType == ContentType.MALE) {
0
} else {
1
}
)
)
)
}
} }
return queryFactory return queryFactory
@ -240,11 +191,7 @@ class ContentSeriesQueryRepositoryImpl(
.size .size
} }
override fun getGenreList( override fun getGenreList(isAdult: Boolean, memberId: Long): List<GetSeriesGenreListResponse> {
isAdult: Boolean,
memberId: Long,
contentType: ContentType
): List<GetSeriesGenreListResponse> {
val blockMemberCondition = blockMember.member.id.eq(member.id) val blockMemberCondition = blockMember.member.id.eq(member.id)
.and(blockMember.isActive.isTrue) .and(blockMember.isActive.isTrue)
.and(blockMember.blockedMember.id.eq(memberId)) .and(blockMember.blockedMember.id.eq(memberId))
@ -262,20 +209,6 @@ class ContentSeriesQueryRepositoryImpl(
if (!isAdult) { if (!isAdult) {
where = where.and(seriesGenre.isAdult.isFalse) where = where.and(seriesGenre.isAdult.isFalse)
.and(series.isAdult.isFalse) .and(series.isAdult.isFalse)
} else {
if (contentType != ContentType.ALL) {
where = where.and(
series.member.isNull.or(
series.member.auth.gender.eq(
if (contentType == ContentType.MALE) {
0
} else {
1
}
)
)
)
}
} }
return queryFactory return queryFactory
@ -292,12 +225,7 @@ class ContentSeriesQueryRepositoryImpl(
.fetch() .fetch()
} }
override fun findByCurationId( override fun findByCurationId(curationId: Long, memberId: Long, isAdult: Boolean): List<Series> {
curationId: Long,
memberId: Long,
isAdult: Boolean,
contentType: ContentType
): List<Series> {
val blockMemberCondition = blockMember.member.id.eq(member.id) val blockMemberCondition = blockMember.member.id.eq(member.id)
.and(blockMember.isActive.isTrue) .and(blockMember.isActive.isTrue)
.and(blockMember.blockedMember.id.eq(memberId)) .and(blockMember.blockedMember.id.eq(memberId))
@ -311,20 +239,6 @@ class ContentSeriesQueryRepositoryImpl(
if (!isAdult) { if (!isAdult) {
where = where.and(series.isAdult.isFalse) where = where.and(series.isAdult.isFalse)
} else {
if (contentType != ContentType.ALL) {
where = where.and(
series.member.isNull.or(
series.member.auth.gender.eq(
if (contentType == ContentType.MALE) {
0
} else {
1
}
)
)
)
}
} }
return queryFactory return queryFactory

21
src/main/kotlin/kr/co/vividnext/sodalive/content/series/ContentSeriesService.kt
View File

@ -30,23 +30,22 @@ class ContentSeriesService(
@Value("\${cloud.aws.cloud-front.host}") @Value("\${cloud.aws.cloud-front.host}")
private val coverImageHost: String private val coverImageHost: String
) { ) {
fun getOriginalAudioDramaTotalCount(memberId: Long, isAdult: Boolean, contentType: ContentType): Int { fun getOriginalAudioDramaTotalCount(memberId: Long, isAdult: Boolean): Int {
return repository.getOriginalAudioDramaTotalCount(memberId, isAdult, contentType) return repository.getOriginalAudioDramaTotalCount(memberId, isAdult)
} }
fun getOriginalAudioDramaList( fun getOriginalAudioDramaList(
memberId: Long, memberId: Long,
isAdult: Boolean, isAdult: Boolean,
contentType: ContentType,
offset: Long = 0, offset: Long = 0,
limit: Long = 20 limit: Long = 20
): List<GetSeriesListResponse.SeriesListItem> { ): List<GetSeriesListResponse.SeriesListItem> {
val originalAudioDramaList = repository.getOriginalAudioDramaList(memberId, isAdult, contentType, offset, limit) val originalAudioDramaList = repository.getOriginalAudioDramaList(memberId, isAdult, offset, limit)
return seriesToSeriesListItem(originalAudioDramaList, isAdult) return seriesToSeriesListItem(originalAudioDramaList, isAdult)
} }
fun getGenreList(memberId: Long, isAdult: Boolean, contentType: ContentType): List<GetSeriesGenreListResponse> { fun getGenreList(memberId: Long, isAdult: Boolean): List<GetSeriesGenreListResponse> {
return repository.getGenreList(memberId = memberId, isAdult = isAdult, contentType = contentType) return repository.getGenreList(memberId = memberId, isAdult = isAdult)
} }
fun getSeriesList( fun getSeriesList(
@ -192,15 +191,9 @@ class ContentSeriesService(
fun fetchSeriesByCurationId( fun fetchSeriesByCurationId(
curationId: Long, curationId: Long,
memberId: Long, memberId: Long,
isAdult: Boolean, isAdult: Boolean
contentType: ContentType
): List<GetSeriesListResponse.SeriesListItem> { ): List<GetSeriesListResponse.SeriesListItem> {
val seriesList = repository.findByCurationId( val seriesList = repository.findByCurationId(curationId = curationId, memberId = memberId, isAdult = isAdult)
curationId = curationId,
memberId = memberId,
isAdult = isAdult,
contentType = contentType
)
return seriesToSeriesListItem(seriesList, isAdult) return seriesToSeriesListItem(seriesList, isAdult)
} }

23
src/main/kotlin/kr/co/vividnext/sodalive/content/theme/AudioContentThemeQueryRepository.kt
View File

@ -1,10 +1,8 @@
package kr.co.vividnext.sodalive.content.theme package kr.co.vividnext.sodalive.content.theme
import com.querydsl.jpa.impl.JPAQueryFactory import com.querydsl.jpa.impl.JPAQueryFactory
import kr.co.vividnext.sodalive.content.ContentType
import kr.co.vividnext.sodalive.content.QAudioContent.audioContent import kr.co.vividnext.sodalive.content.QAudioContent.audioContent
import kr.co.vividnext.sodalive.content.theme.QAudioContentTheme.audioContentTheme import kr.co.vividnext.sodalive.content.theme.QAudioContentTheme.audioContentTheme
import kr.co.vividnext.sodalive.member.QMember.member
import org.springframework.beans.factory.annotation.Value import org.springframework.beans.factory.annotation.Value
import org.springframework.stereotype.Repository import org.springframework.stereotype.Repository
@ -29,30 +27,12 @@ class AudioContentThemeQueryRepository(
.fetch() .fetch()
} }
fun getActiveThemeOfContent( fun getActiveThemeOfContent(isAdult: Boolean = false, isFree: Boolean = false): List<String> {
isAdult: Boolean = false,
isFree: Boolean = false,
contentType: ContentType
): List<String> {
var where = audioContent.isActive.isTrue var where = audioContent.isActive.isTrue
.and(audioContentTheme.isActive.isTrue) .and(audioContentTheme.isActive.isTrue)
if (!isAdult) { if (!isAdult) {
where = where.and(audioContent.isAdult.isFalse) where = where.and(audioContent.isAdult.isFalse)
} else {
if (contentType != ContentType.ALL) {
where = where.and(
audioContent.member.isNull.or(
audioContent.member.auth.gender.eq(
if (contentType == ContentType.MALE) {
0
} else {
1
}
)
)
)
}
} }
where = if (isFree) { where = if (isFree) {
@ -64,7 +44,6 @@ class AudioContentThemeQueryRepository(
return queryFactory return queryFactory
.select(audioContentTheme.theme) .select(audioContentTheme.theme)
.from(audioContent) .from(audioContent)
.innerJoin(audioContent.member, member)
.innerJoin(audioContent.theme, audioContentTheme) .innerJoin(audioContent.theme, audioContentTheme)
.where(where) .where(where)
.groupBy(audioContentTheme.id) .groupBy(audioContentTheme.id)

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

@ -3,7 +3,6 @@ package kr.co.vividnext.sodalive.rank
import com.querydsl.core.types.dsl.Expressions import com.querydsl.core.types.dsl.Expressions
import com.querydsl.jpa.impl.JPAQueryFactory import com.querydsl.jpa.impl.JPAQueryFactory
import kr.co.vividnext.sodalive.admin.content.series.genre.QSeriesGenre.seriesGenre import kr.co.vividnext.sodalive.admin.content.series.genre.QSeriesGenre.seriesGenre
import kr.co.vividnext.sodalive.content.ContentType
import kr.co.vividnext.sodalive.content.QAudioContent.audioContent import kr.co.vividnext.sodalive.content.QAudioContent.audioContent
import kr.co.vividnext.sodalive.content.comment.QAudioContentComment.audioContentComment import kr.co.vividnext.sodalive.content.comment.QAudioContentComment.audioContentComment
import kr.co.vividnext.sodalive.content.like.QAudioContentLike.audioContentLike import kr.co.vividnext.sodalive.content.like.QAudioContentLike.audioContentLike
@ -45,7 +44,6 @@ class RankingRepository(
fun getAudioContentRanking( fun getAudioContentRanking(
memberId: Long, memberId: Long,
isAdult: Boolean, isAdult: Boolean,
contentType: ContentType,
startDate: LocalDateTime, startDate: LocalDateTime,
endDate: LocalDateTime, endDate: LocalDateTime,
offset: Long, offset: Long,
@ -68,20 +66,6 @@ class RankingRepository(
if (!isAdult) { if (!isAdult) {
where = where.and(audioContent.isAdult.isFalse) where = where.and(audioContent.isAdult.isFalse)
} else {
if (contentType != ContentType.ALL) {
where = where.and(
audioContent.member.isNull.or(
audioContent.member.auth.gender.eq(
if (contentType == ContentType.MALE) {
0
} else {
1
}
)
)
)
}
} }
if (theme.isNotBlank()) { if (theme.isNotBlank()) {
@ -183,7 +167,6 @@ class RankingRepository(
fun getSeriesRanking( fun getSeriesRanking(
memberId: Long, memberId: Long,
isAdult: Boolean, isAdult: Boolean,
contentType: ContentType,
startDate: LocalDateTime, startDate: LocalDateTime,
endDate: LocalDateTime endDate: LocalDateTime
): List<Series> { ): List<Series> {
@ -205,20 +188,6 @@ class RankingRepository(
if (!isAdult) { if (!isAdult) {
where = where.and(series.isAdult.isFalse) where = where.and(series.isAdult.isFalse)
} else {
if (contentType != ContentType.ALL) {
where = where.and(
series.member.isNull.or(
series.member.auth.gender.eq(
if (contentType == ContentType.MALE) {
0
} else {
1
}
)
)
)
}
} }
return queryFactory return queryFactory
@ -240,7 +209,7 @@ class RankingRepository(
.fetch() .fetch()
} }
fun getCompleteSeriesRankingTotalCount(memberId: Long, isAdult: Boolean, contentType: ContentType): Int { fun getCompleteSeriesRankingTotalCount(memberId: Long, isAdult: Boolean): Int {
val blockMemberCondition = blockMember.member.id.eq(member.id) val blockMemberCondition = blockMember.member.id.eq(member.id)
.and(blockMember.isActive.isTrue) .and(blockMember.isActive.isTrue)
.and(blockMember.blockedMember.id.eq(memberId)) .and(blockMember.blockedMember.id.eq(memberId))
@ -257,20 +226,6 @@ class RankingRepository(
if (!isAdult) { if (!isAdult) {
where = where.and(series.isAdult.isFalse) where = where.and(series.isAdult.isFalse)
} else {
if (contentType != ContentType.ALL) {
where = where.and(
series.member.isNull.or(
series.member.auth.gender.eq(
if (contentType == ContentType.MALE) {
0
} else {
1
}
)
)
)
}
} }
return queryFactory return queryFactory
@ -289,7 +244,6 @@ class RankingRepository(
fun getCompleteSeriesRanking( fun getCompleteSeriesRanking(
memberId: Long, memberId: Long,
isAdult: Boolean, isAdult: Boolean,
contentType: ContentType,
startDate: LocalDateTime, startDate: LocalDateTime,
endDate: LocalDateTime, endDate: LocalDateTime,
offset: Long, offset: Long,
@ -316,20 +270,6 @@ class RankingRepository(
if (!isAdult) { if (!isAdult) {
where = where.and(series.isAdult.isFalse) where = where.and(series.isAdult.isFalse)
} else {
if (contentType != ContentType.ALL) {
where = where.and(
series.member.isNull.or(
series.member.auth.gender.eq(
if (contentType == ContentType.MALE) {
0
} else {
1
}
)
)
)
}
} }
return queryFactory return queryFactory
@ -348,12 +288,7 @@ class RankingRepository(
.fetch() .fetch()
} }
fun getSeriesAllRankingByGenre( fun getSeriesAllRankingByGenre(memberId: Long, isAdult: Boolean, genreId: Long): List<Series> {
memberId: Long,
isAdult: Boolean,
contentType: ContentType,
genreId: Long
): List<Series> {
val blockMemberCondition = blockMember.member.id.eq(member.id) val blockMemberCondition = blockMember.member.id.eq(member.id)
.and(blockMember.isActive.isTrue) .and(blockMember.isActive.isTrue)
.and(blockMember.blockedMember.id.eq(memberId)) .and(blockMember.blockedMember.id.eq(memberId))
@ -371,20 +306,6 @@ class RankingRepository(
if (!isAdult) { if (!isAdult) {
where = where.and(series.isAdult.isFalse) where = where.and(series.isAdult.isFalse)
} else {
if (contentType != ContentType.ALL) {
where = where.and(
series.member.isNull.or(
series.member.auth.gender.eq(
if (contentType == ContentType.MALE) {
0
} else {
1
}
)
)
)
}
} }
return queryFactory return queryFactory
@ -409,7 +330,6 @@ class RankingRepository(
fun fetchCreatorBySellContentCountRankTop20( fun fetchCreatorBySellContentCountRankTop20(
memberId: Long, memberId: Long,
contentType: ContentType,
startDate: LocalDateTime, startDate: LocalDateTime,
endDate: LocalDateTime endDate: LocalDateTime
): List<ContentCreatorResponse> { ): List<ContentCreatorResponse> {
@ -422,30 +342,16 @@ class RankingRepository(
.and(order.createdAt.goe(startDate)) .and(order.createdAt.goe(startDate))
.and(order.createdAt.lt(endDate)) .and(order.createdAt.lt(endDate))
var memberCondition = member.isActive.isTrue val memberCondition = member.isActive.isTrue
.and(member.role.eq(MemberRole.CREATOR)) .and(member.role.eq(MemberRole.CREATOR))
.and(member.id.eq(audioContent.member.id)) .and(member.id.eq(audioContent.member.id))
var where = audioContent.isActive.isTrue val where = audioContent.isActive.isTrue
.and(audioContent.price.gt(0)) .and(audioContent.price.gt(0))
.and(audioContent.duration.isNotNull) .and(audioContent.duration.isNotNull)
.and(audioContent.limited.isNull) .and(audioContent.limited.isNull)
.and(blockMember.id.isNull) .and(blockMember.id.isNull)
if (contentType != ContentType.ALL) {
where = where.and(
audioContent.member.auth.isNull.or(
audioContent.member.auth.gender.eq(
if (contentType == ContentType.MALE) {
0
} else {
1
}
)
)
)
}
return queryFactory return queryFactory
.select( .select(
QContentCreatorResponse( QContentCreatorResponse(
@ -470,7 +376,6 @@ class RankingRepository(
fun fetchCreatorContentBySalesCountTop4( fun fetchCreatorContentBySalesCountTop4(
creatorId: Long, creatorId: Long,
isAdult: Boolean, isAdult: Boolean,
contentType: ContentType,
theme: String theme: String
): List<GetAudioContentRankingItem> { ): List<GetAudioContentRankingItem> {
var where = member.isActive.isTrue var where = member.isActive.isTrue
@ -484,20 +389,6 @@ class RankingRepository(
if (!isAdult) { if (!isAdult) {
where = where.and(audioContent.isAdult.isFalse) where = where.and(audioContent.isAdult.isFalse)
} else {
if (contentType != ContentType.ALL) {
where = where.and(
audioContent.member.isNull.or(
audioContent.member.auth.gender.eq(
if (contentType == ContentType.MALE) {
0
} else {
1
}
)
)
)
}
} }
if (theme.isNotBlank()) { if (theme.isNotBlank()) {
@ -532,7 +423,6 @@ class RankingRepository(
fun fetchCreatorBySeriesRevenueRankTop20( fun fetchCreatorBySeriesRevenueRankTop20(
memberId: Long, memberId: Long,
contentType: ContentType,
startDate: LocalDateTime, startDate: LocalDateTime,
endDate: LocalDateTime endDate: LocalDateTime
): List<ContentCreatorResponse> { ): List<ContentCreatorResponse> {
@ -545,7 +435,7 @@ class RankingRepository(
.and(order.createdAt.goe(startDate)) .and(order.createdAt.goe(startDate))
.and(order.createdAt.lt(startDate)) .and(order.createdAt.lt(startDate))
var where = member.isActive.isTrue val where = member.isActive.isTrue
.and(member.role.eq(MemberRole.CREATOR)) .and(member.role.eq(MemberRole.CREATOR))
.and(series.isActive.isTrue) .and(series.isActive.isTrue)
.and(audioContent.isActive.isTrue) .and(audioContent.isActive.isTrue)
@ -553,20 +443,6 @@ class RankingRepository(
.and(audioContent.limited.isNull) .and(audioContent.limited.isNull)
.and(blockMember.id.isNull) .and(blockMember.id.isNull)
if (contentType != ContentType.ALL) {
where = where.and(
audioContent.member.isNull.or(
audioContent.member.auth.gender.eq(
if (contentType == ContentType.MALE) {
0
} else {
1
}
)
)
)
}
return queryFactory return queryFactory
.select( .select(
QContentCreatorResponse( QContentCreatorResponse(
@ -593,7 +469,7 @@ class RankingRepository(
.fetch() .fetch()
} }
fun fetchCreatorSeriesBySales(creatorId: Long, isAdult: Boolean, contentType: ContentType): List<Series> { fun fetchCreatorSeriesBySales(creatorId: Long, isAdult: Boolean): List<Series> {
var where = member.isActive.isTrue var where = member.isActive.isTrue
.and(member.role.eq(MemberRole.CREATOR)) .and(member.role.eq(MemberRole.CREATOR))
.and(series.isActive.isTrue) .and(series.isActive.isTrue)
@ -605,20 +481,6 @@ class RankingRepository(
if (!isAdult) { if (!isAdult) {
where = where.and(series.isAdult.isFalse) where = where.and(series.isAdult.isFalse)
} else {
if (contentType != ContentType.ALL) {
where = where.and(
series.member.isNull.or(
series.member.auth.gender.eq(
if (contentType == ContentType.MALE) {
0
} else {
1
}
)
)
)
}
} }
return queryFactory return queryFactory
@ -639,11 +501,7 @@ class RankingRepository(
.fetch() .fetch()
} }
fun fetchFreeContentByCreatorIdTop4( fun fetchFreeContentByCreatorIdTop4(creatorId: Long, isAdult: Boolean): List<GetAudioContentRankingItem> {
creatorId: Long,
isAdult: Boolean,
contentType: ContentType
): List<GetAudioContentRankingItem> {
var where = member.isActive.isTrue var where = member.isActive.isTrue
.and(member.id.eq(creatorId)) .and(member.id.eq(creatorId))
.and(member.role.eq(MemberRole.CREATOR)) .and(member.role.eq(MemberRole.CREATOR))
@ -654,20 +512,6 @@ class RankingRepository(
if (!isAdult) { if (!isAdult) {
where = where.and(audioContent.isAdult.isFalse) where = where.and(audioContent.isAdult.isFalse)
} else {
if (contentType != ContentType.ALL) {
where = where.and(
audioContent.member.isNull.or(
audioContent.member.auth.gender.eq(
if (contentType == ContentType.MALE) {
0
} else {
1
}
)
)
)
}
} }
return queryFactory return queryFactory
@ -694,11 +538,7 @@ class RankingRepository(
.fetch() .fetch()
} }
fun fetchCreatorContentByLikeCountTop4( fun fetchCreatorContentByLikeCountTop4(creatorId: Long, isAdult: Boolean): List<GetAudioContentRankingItem> {
creatorId: Long,
isAdult: Boolean,
contentType: ContentType
): List<GetAudioContentRankingItem> {
var where = member.isActive.isTrue var where = member.isActive.isTrue
.and(member.id.eq(creatorId)) .and(member.id.eq(creatorId))
.and(member.role.eq(MemberRole.CREATOR)) .and(member.role.eq(MemberRole.CREATOR))
@ -710,20 +550,6 @@ class RankingRepository(
if (!isAdult) { if (!isAdult) {
where = where.and(audioContent.isAdult.isFalse) where = where.and(audioContent.isAdult.isFalse)
} else {
if (contentType != ContentType.ALL) {
where = where.and(
audioContent.member.isNull.or(
audioContent.member.auth.gender.eq(
if (contentType == ContentType.MALE) {
0
} else {
1
}
)
)
)
}
} }
return queryFactory return queryFactory

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

@ -1,6 +1,5 @@
package kr.co.vividnext.sodalive.rank package kr.co.vividnext.sodalive.rank
import kr.co.vividnext.sodalive.content.ContentType
import kr.co.vividnext.sodalive.content.main.ContentCreatorResponse import kr.co.vividnext.sodalive.content.main.ContentCreatorResponse
import kr.co.vividnext.sodalive.content.main.GetAudioContentRankingItem import kr.co.vividnext.sodalive.content.main.GetAudioContentRankingItem
import kr.co.vividnext.sodalive.content.series.GetSeriesListResponse import kr.co.vividnext.sodalive.content.series.GetSeriesListResponse
@ -41,7 +40,6 @@ class RankingService(
fun getContentRanking( fun getContentRanking(
memberId: Long, memberId: Long,
isAdult: Boolean, isAdult: Boolean,
contentType: ContentType,
startDate: LocalDateTime, startDate: LocalDateTime,
endDate: LocalDateTime, endDate: LocalDateTime,
offset: Long = 0, offset: Long = 0,
@ -52,7 +50,6 @@ class RankingService(
return repository.getAudioContentRanking( return repository.getAudioContentRanking(
memberId = memberId, memberId = memberId,
isAdult = isAdult, isAdult = isAdult,
contentType = contentType,
startDate = startDate, startDate = startDate,
endDate = endDate, endDate = endDate,
offset = offset, offset = offset,
@ -65,24 +62,21 @@ class RankingService(
fun getSeriesRanking( fun getSeriesRanking(
memberId: Long, memberId: Long,
isAdult: Boolean, isAdult: Boolean,
contentType: ContentType,
startDate: LocalDateTime, startDate: LocalDateTime,
endDate: LocalDateTime endDate: LocalDateTime
): List<GetSeriesListResponse.SeriesListItem> { ): List<GetSeriesListResponse.SeriesListItem> {
val seriesList = repository.getSeriesRanking(memberId, isAdult, contentType, startDate, endDate) val seriesList = repository.getSeriesRanking(memberId, isAdult, startDate, endDate)
return seriesToSeriesListItem(seriesList = seriesList, isAdult = isAdult) return seriesToSeriesListItem(seriesList = seriesList, isAdult = isAdult)
} }
fun getSeriesAllRankingByGenre( fun getSeriesAllRankingByGenre(
memberId: Long, memberId: Long,
isAdult: Boolean, isAdult: Boolean,
contentType: ContentType,
genreId: Long genreId: Long
): List<GetSeriesListResponse.SeriesListItem> { ): List<GetSeriesListResponse.SeriesListItem> {
val seriesList = repository.getSeriesAllRankingByGenre( val seriesList = repository.getSeriesAllRankingByGenre(
memberId = memberId, memberId = memberId,
isAdult = isAdult, isAdult = isAdult,
contentType = contentType,
genreId = genreId genreId = genreId
) )
return seriesToSeriesListItem(seriesList = seriesList, isAdult = isAdult) return seriesToSeriesListItem(seriesList = seriesList, isAdult = isAdult)
@ -90,20 +84,17 @@ class RankingService(
fun getCompleteSeriesRankingTotalCount( fun getCompleteSeriesRankingTotalCount(
memberId: Long, memberId: Long,
isAdult: Boolean, isAdult: Boolean
contentType: ContentType
): Int { ): Int {
return repository.getCompleteSeriesRankingTotalCount( return repository.getCompleteSeriesRankingTotalCount(
memberId = memberId, memberId = memberId,
isAdult = isAdult, isAdult = isAdult
contentType = contentType
) )
} }
fun getCompleteSeriesRanking( fun getCompleteSeriesRanking(
memberId: Long, memberId: Long,
isAdult: Boolean, isAdult: Boolean,
contentType: ContentType,
startDate: LocalDateTime, startDate: LocalDateTime,
endDate: LocalDateTime, endDate: LocalDateTime,
offset: Long = 0, offset: Long = 0,
@ -112,7 +103,6 @@ class RankingService(
val seriesList = repository.getCompleteSeriesRanking( val seriesList = repository.getCompleteSeriesRanking(
memberId = memberId, memberId = memberId,
isAdult = isAdult, isAdult = isAdult,
contentType = contentType,
startDate = startDate, startDate = startDate,
endDate = endDate, endDate = endDate,
offset = offset, offset = offset,
@ -189,57 +179,38 @@ class RankingService(
fun fetchCreatorBySellContentCountRankTop20( fun fetchCreatorBySellContentCountRankTop20(
memberId: Long, memberId: Long,
contentType: ContentType,
startDate: LocalDateTime, startDate: LocalDateTime,
endDate: LocalDateTime endDate: LocalDateTime
): List<ContentCreatorResponse> { ): List<ContentCreatorResponse> {
return repository.fetchCreatorBySellContentCountRankTop20(memberId, contentType, startDate, endDate) return repository.fetchCreatorBySellContentCountRankTop20(memberId, startDate, endDate)
} }
fun fetchCreatorContentBySalesCountTop4( fun fetchCreatorContentBySalesCountTop4(
creatorId: Long, creatorId: Long,
isAdult: Boolean, isAdult: Boolean,
contentType: ContentType,
theme: String = "" theme: String = ""
): List<GetAudioContentRankingItem> { ): List<GetAudioContentRankingItem> {
return repository.fetchCreatorContentBySalesCountTop4(creatorId, isAdult, contentType, theme) return repository.fetchCreatorContentBySalesCountTop4(creatorId, isAdult, theme)
} }
fun fetchCreatorContentByLikeCountTop4( fun fetchCreatorContentByLikeCountTop4(creatorId: Long, isAdult: Boolean): List<GetAudioContentRankingItem> {
creatorId: Long, return repository.fetchCreatorContentByLikeCountTop4(creatorId, isAdult)
isAdult: Boolean,
contentType: ContentType
): List<GetAudioContentRankingItem> {
return repository.fetchCreatorContentByLikeCountTop4(creatorId, isAdult, contentType)
} }
fun fetchCreatorBySeriesRevenueRankTop20( fun fetchCreatorBySeriesRevenueRankTop20(
memberId: Long, memberId: Long,
contentType: ContentType,
startDate: LocalDateTime, startDate: LocalDateTime,
endDate: LocalDateTime endDate: LocalDateTime
): List<ContentCreatorResponse> { ): List<ContentCreatorResponse> {
return repository.fetchCreatorBySeriesRevenueRankTop20(memberId, contentType, startDate, endDate) return repository.fetchCreatorBySeriesRevenueRankTop20(memberId, startDate, endDate)
} }
fun fetchCreatorSeriesBySales( fun fetchCreatorSeriesBySales(creatorId: Long, isAdult: Boolean): List<GetSeriesListResponse.SeriesListItem> {
creatorId: Long, val seriesList = repository.fetchCreatorSeriesBySales(creatorId = creatorId, isAdult = isAdult)
isAdult: Boolean,
contentType: ContentType
): List<GetSeriesListResponse.SeriesListItem> {
val seriesList = repository.fetchCreatorSeriesBySales(
creatorId = creatorId,
isAdult = isAdult,
contentType = contentType
)
return seriesToSeriesListItem(seriesList, isAdult) return seriesToSeriesListItem(seriesList, isAdult)
} }
fun fetchFreeContentByCreatorIdTop4( fun fetchFreeContentByCreatorIdTop4(creatorId: Long, isAdult: Boolean): List<GetAudioContentRankingItem> {
creatorId: Long, return repository.fetchFreeContentByCreatorIdTop4(creatorId, isAdult)
isAdult: Boolean,
contentType: ContentType
): List<GetAudioContentRankingItem> {
return repository.fetchFreeContentByCreatorIdTop4(creatorId, isAdult, contentType)
} }
} }