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

Compare commits

base: klaus:22f28a2f8a60e07b8631780a2ddfb23389e6819a
Branches Tags
klaus:test
klaus:main
..
compare: klaus:ceef9ca9798d154e7b7369e996589edbdec4af6f
Branches Tags
klaus:main
klaus:test

No commits in common. "22f28a2f8a60e07b8631780a2ddfb23389e6819a" and "ceef9ca9798d154e7b7369e996589edbdec4af6f" have entirely different histories.
22f28a2f8a ... ceef9ca979

7 changed files with 20 additions and 55 deletions
Show Stats Expand all files Collapse all files

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

@ -64,7 +64,7 @@ interface AudioContentQueryRepository {
theme: String = "",
sortType: SortType = SortType.NEWEST,
isAdult: Boolean = false,
contentType: ContentType,
contentType: ContentType = ContentType.ALL,
offset: Long = 0,
limit: Long = 20
): List<GetAudioContentMainItem>
@ -72,8 +72,7 @@ interface AudioContentQueryRepository {
fun totalCountByTheme(
memberId: Long,
theme: String = "",
isAdult: Boolean = false,
contentType: ContentType
isAdult: Boolean = false
): Int
fun findByThemeFor2Weeks(
@ -81,7 +80,7 @@ interface AudioContentQueryRepository {
memberId: Long,
theme: String = "",
isAdult: Boolean = false,
contentType: ContentType,
contentType: ContentType = ContentType.ALL,
offset: Long = 0,
limit: Long = 20
): List<GetAudioContentMainItem>
@ -90,7 +89,7 @@ interface AudioContentQueryRepository {
theme: String,
memberId: Long,
isAdult: Boolean,
contentType: ContentType
contentType: ContentType = ContentType.ALL
): Int
fun getNewContentUploadCreatorList(
@ -104,7 +103,7 @@ interface AudioContentQueryRepository {
curationId: Long,
cloudfrontHost: String,
isAdult: Boolean,
contentType: ContentType
contentType: ContentType = ContentType.ALL
): List<GetAudioContentMainItem>
fun getAudioContentRanking(
@ -375,6 +374,7 @@ class AudioContentQueryRepositoryImpl(private val queryFactory: JPAQueryFactory)
if (contentType != ContentType.ALL) {
where = where.and(
audioContent.member.auth.gender.eq(if (contentType == ContentType.MALE) 0 else 1)
.or(audioContent.isAdult.isFalse)
)
}
}
@ -406,7 +406,7 @@ class AudioContentQueryRepositoryImpl(private val queryFactory: JPAQueryFactory)
.fetch()
}
override fun totalCountByTheme(memberId: Long, theme: String, isAdult: Boolean, contentType: ContentType): Int {
override fun totalCountByTheme(memberId: Long, theme: String, isAdult: Boolean): Int {
var where = audioContent.isActive.isTrue
.and(audioContent.duration.isNotNull)
.and(
@ -417,12 +417,6 @@ class AudioContentQueryRepositoryImpl(private val queryFactory: JPAQueryFactory)
if (!isAdult) {
where = where.and(audioContent.isAdult.isFalse)
} else {
if (contentType != ContentType.ALL) {
where = where.and(
audioContent.member.auth.gender.eq(if (contentType == ContentType.MALE) 0 else 1)
)
}
}
if (theme.isNotBlank()) {
@ -460,6 +454,7 @@ class AudioContentQueryRepositoryImpl(private val queryFactory: JPAQueryFactory)
if (contentType != ContentType.ALL) {
where = where.and(
audioContent.member.auth.gender.eq(if (contentType == ContentType.MALE) 0 else 1)
.or(audioContent.isAdult.isFalse)
)
}
}
@ -502,6 +497,7 @@ class AudioContentQueryRepositoryImpl(private val queryFactory: JPAQueryFactory)
if (contentType != ContentType.ALL) {
where = where.and(
audioContent.member.auth.gender.eq(if (contentType == ContentType.MALE) 0 else 1)
.or(audioContent.isAdult.isFalse)
)
}
}
@ -615,6 +611,7 @@ class AudioContentQueryRepositoryImpl(private val queryFactory: JPAQueryFactory)
if (contentType != ContentType.ALL) {
where = where.and(
audioContent.member.auth.gender.eq(if (contentType == ContentType.MALE) 0 else 1)
.or(audioContent.isAdult.isFalse)
)
}
}

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

@ -143,8 +143,7 @@ class AudioContentMainService(
@Transactional(readOnly = true)
@Cacheable(
cacheNames = ["default"],
key = "'getAudioContentCurationListWithPaging:' + #memberId + ':' + #isAdult + ':' + #contentType" +
"+ ':' + #offset + ':' + #limit"
key = "'getAudioContentCurationListWithPaging:' + #memberId + ':' + #isAdult + ':' + #offset + ':' + #limit"
)
fun getAudioContentCurationListWithPaging(
memberId: Long,

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

@ -2,7 +2,6 @@ package kr.co.vividnext.sodalive.content.series
import kr.co.vividnext.sodalive.common.ApiResponse
import kr.co.vividnext.sodalive.common.SodaException
import kr.co.vividnext.sodalive.content.ContentType
import kr.co.vividnext.sodalive.creator.admin.content.series.SeriesSortType
import kr.co.vividnext.sodalive.member.Member
import org.springframework.data.domain.Pageable
@ -70,18 +69,10 @@ class ContentSeriesController(private val service: ContentSeriesService) {
@GetMapping("/recommend")
fun getRecommendSeriesList(
@RequestParam("isAdultContentVisible", required = false) isAdultContentVisible: Boolean? = null,
@RequestParam("contentType", required = false) contentType: ContentType? = null,
@AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member?
) = run {
if (member == null) throw SodaException("로그인 정보를 확인해주세요.")
ApiResponse.ok(
service.getRecommendSeriesList(
isAdultContentVisible = isAdultContentVisible ?: true,
contentType = contentType ?: ContentType.ALL,
member = member
)
)
ApiResponse.ok(service.getRecommendSeriesList(member = member))
}
}

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

@ -2,7 +2,6 @@ package kr.co.vividnext.sodalive.content.series
import com.querydsl.core.types.dsl.Expressions
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.hashtag.QHashTag.hashTag
import kr.co.vividnext.sodalive.content.series.content.GetSeriesContentMinMaxPriceResponse
@ -28,7 +27,7 @@ interface ContentSeriesQueryRepository {
fun getSeriesDetail(seriesId: Long, isAuth: Boolean): Series?
fun getKeywordList(seriesId: Long): List<String>
fun getSeriesContentMinMaxPrice(seriesId: Long): GetSeriesContentMinMaxPriceResponse
fun getRecommendSeriesList(isAuth: Boolean, contentType: ContentType, limit: Long): List<Series>
fun getRecommendSeriesList(memberId: Long, isAuth: Boolean, limit: Long): List<Series>
}
class ContentSeriesQueryRepositoryImpl(
@ -112,17 +111,11 @@ class ContentSeriesQueryRepositoryImpl(
.fetchFirst()
}
override fun getRecommendSeriesList(isAuth: Boolean, contentType: ContentType, limit: Long): List<Series> {
override fun getRecommendSeriesList(memberId: Long, isAuth: Boolean, limit: Long): List<Series> {
var where = series.isActive.isTrue
if (!isAuth) {
where = where.and(audioContent.isAdult.isFalse)
} else {
if (contentType != ContentType.ALL) {
where = where.and(
series.member.auth.gender.eq(if (contentType == ContentType.MALE) 0 else 1)
)
}
where = where.and(series.isAdult.isFalse)
}
return queryFactory

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

@ -1,7 +1,6 @@
package kr.co.vividnext.sodalive.content.series
import kr.co.vividnext.sodalive.common.SodaException
import kr.co.vividnext.sodalive.content.ContentType
import kr.co.vividnext.sodalive.content.order.OrderRepository
import kr.co.vividnext.sodalive.content.order.OrderType
import kr.co.vividnext.sodalive.content.series.content.ContentSeriesContentRepository
@ -156,14 +155,10 @@ class ContentSeriesService(
return GetSeriesContentListResponse(totalCount, contentList)
}
fun getRecommendSeriesList(
isAdultContentVisible: Boolean,
contentType: ContentType,
member: Member
): List<GetSeriesListResponse.SeriesListItem> {
fun getRecommendSeriesList(member: Member): List<GetSeriesListResponse.SeriesListItem> {
val seriesList = repository.getRecommendSeriesList(
isAuth = member.auth != null && isAdultContentVisible,
contentType = contentType,
memberId = member.id!!,
isAuth = member.auth != null,
limit = 10
).filter { !blockMemberRepository.isBlocked(blockedMemberId = member.id!!, memberId = it.member!!.id!!) }

5
src/main/kotlin/kr/co/vividnext/sodalive/content/theme/AudioContentThemeController.kt
View File

@ -2,7 +2,6 @@ package kr.co.vividnext.sodalive.content.theme
import kr.co.vividnext.sodalive.common.ApiResponse
import kr.co.vividnext.sodalive.common.SodaException
import kr.co.vividnext.sodalive.content.ContentType
import kr.co.vividnext.sodalive.content.SortType
import kr.co.vividnext.sodalive.member.Member
import org.springframework.data.domain.Pageable
@ -31,8 +30,6 @@ class AudioContentThemeController(private val service: AudioContentThemeService)
fun getContentByTheme(
@PathVariable id: Long,
@RequestParam("sort-type", required = false) sortType: SortType? = SortType.NEWEST,
@RequestParam("isAdultContentVisible", required = false) isAdultContentVisible: Boolean? = null,
@RequestParam("contentType", required = false) contentType: ContentType? = null,
@AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member?,
pageable: Pageable
) = run {
@ -42,8 +39,6 @@ class AudioContentThemeController(private val service: AudioContentThemeService)
service.getContentByTheme(
themeId = id,
sortType = sortType ?: SortType.NEWEST,
isAdultContentVisible = isAdultContentVisible ?: true,
contentType = contentType ?: ContentType.ALL,
member = member,
offset = pageable.offset,
limit = pageable.pageSize.toLong()

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

@ -2,7 +2,6 @@ package kr.co.vividnext.sodalive.content.theme
import kr.co.vividnext.sodalive.common.SodaException
import kr.co.vividnext.sodalive.content.AudioContentRepository
import kr.co.vividnext.sodalive.content.ContentType
import kr.co.vividnext.sodalive.content.SortType
import kr.co.vividnext.sodalive.content.theme.content.GetContentByThemeResponse
import kr.co.vividnext.sodalive.member.Member
@ -29,8 +28,6 @@ class AudioContentThemeService(
fun getContentByTheme(
themeId: Long,
sortType: SortType,
isAdultContentVisible: Boolean,
contentType: ContentType,
member: Member,
offset: Long,
limit: Long
@ -41,8 +38,7 @@ class AudioContentThemeService(
val totalCount = contentRepository.totalCountByTheme(
memberId = member.id!!,
theme = theme.theme,
isAdult = member.auth != null && isAdultContentVisible,
contentType = contentType
isAdult = member.auth != null
)
val items = contentRepository.findByTheme(
@ -50,8 +46,7 @@ class AudioContentThemeService(
memberId = member.id!!,
theme = theme.theme,
sortType = sortType,
isAdult = member.auth != null && isAdultContentVisible,
contentType = contentType,
isAdult = member.auth != null,
offset = offset,
limit = limit
)