Compare commits

..

No commits in common. "685ad7afaff1aa315e114271ab3535a867df1590" and "264cf75964e9e8892ae8f13c9a4e5a8486f51cad" have entirely different histories.

4 changed files with 13 additions and 6 deletions

View File

@ -400,6 +400,8 @@ class AudioContentQueryRepositoryImpl(private val queryFactory: JPAQueryFactory)
return queryFactory return queryFactory
.selectFrom(audioContentCuration) .selectFrom(audioContentCuration)
.where(where) .where(where)
.offset(0)
.limit(15)
.orderBy(audioContentCuration.orders.asc()) .orderBy(audioContentCuration.orders.asc())
.fetch() .fetch()
} }

View File

@ -20,7 +20,7 @@ class AudioContentMainController(private val service: AudioContentMainService) {
) = run { ) = run {
if (member == null) throw SodaException("로그인 정보를 확인해주세요.") if (member == null) throw SodaException("로그인 정보를 확인해주세요.")
ApiResponse.ok(service.getMain(memberId = member.id!!, isAdult = member.auth != null)) ApiResponse.ok(service.getMain(member = member))
} }
@GetMapping("/new") @GetMapping("/new")

View File

@ -29,8 +29,10 @@ class AudioContentMainService(
@Value("\${cloud.aws.cloud-front.host}") @Value("\${cloud.aws.cloud-front.host}")
private val imageHost: String private val imageHost: String
) { ) {
@Cacheable(cacheNames = ["default"], key = "'contentMain:' + #memberId + ':' + #isAdult") fun getMain(member: Member): GetAudioContentMainResponse {
fun getMain(memberId: Long, isAdult: Boolean): GetAudioContentMainResponse { val isAdult = member.auth != null
val memberId = member.id!!
// 2주일 이내에 콘텐츠를 올린 크리에이터 20명 조회 // 2주일 이내에 콘텐츠를 올린 크리에이터 20명 조회
val newContentUploadCreatorList = getNewContentUploadCreatorList(memberId = memberId, isAdult = isAdult) val newContentUploadCreatorList = getNewContentUploadCreatorList(memberId = memberId, isAdult = isAdult)
@ -38,7 +40,7 @@ class AudioContentMainService(
// 구매목록 20개 // 구매목록 20개
val orderList = orderService.getAudioContentMainOrderList( val orderList = orderService.getAudioContentMainOrderList(
memberId = memberId, member = member,
limit = 20 limit = 20
) )
@ -116,6 +118,7 @@ class AudioContentMainService(
return GetNewContentAllResponse(totalCount, items) return GetNewContentAllResponse(totalCount, items)
} }
@Cacheable(cacheNames = ["default"], key = "'newContentUploadCreatorList:' + #memberId + ':' + #isAdult")
fun getNewContentUploadCreatorList(memberId: Long, isAdult: Boolean): List<GetNewContentUploadCreator> { fun getNewContentUploadCreatorList(memberId: Long, isAdult: Boolean): List<GetNewContentUploadCreator> {
return repository.getNewContentUploadCreatorList( return repository.getNewContentUploadCreatorList(
cloudfrontHost = imageHost, cloudfrontHost = imageHost,
@ -126,6 +129,7 @@ class AudioContentMainService(
.toList() .toList()
} }
@Cacheable(cacheNames = ["default"], key = "'contentMainBannerList:' + #memberId + ':' + #isAdult")
fun getAudioContentMainBannerList(memberId: Long, isAdult: Boolean) = fun getAudioContentMainBannerList(memberId: Long, isAdult: Boolean) =
repository.getAudioContentMainBannerList(isAdult = isAdult) repository.getAudioContentMainBannerList(isAdult = isAdult)
.asSequence() .asSequence()
@ -174,6 +178,7 @@ class AudioContentMainService(
} }
.toList() .toList()
@Cacheable(cacheNames = ["default"], key = "'contentCurationList:' + #memberId + ':' + #isAdult")
fun getAudioContentCurationList(memberId: Long, isAdult: Boolean) = fun getAudioContentCurationList(memberId: Long, isAdult: Boolean) =
repository.getAudioContentCurations(isAdult = isAdult) repository.getAudioContentCurations(isAdult = isAdult)
.asSequence() .asSequence()

View File

@ -92,11 +92,11 @@ class OrderService(
) )
} }
fun getAudioContentMainOrderList(memberId: Long, limit: Int): List<GetAudioContentMainItem> { fun getAudioContentMainOrderList(member: Member, limit: Int): List<GetAudioContentMainItem> {
return repository.getAudioContentMainOrderList( return repository.getAudioContentMainOrderList(
dateTime = LocalDateTime.now(), dateTime = LocalDateTime.now(),
coverImageHost = audioContentCoverImageHost, coverImageHost = audioContentCoverImageHost,
memberId = memberId, memberId = member.id!!,
offset = 0, offset = 0,
limit = 20 limit = 20
) )