Compare commits
No commits in common. "41be05093dfe5c95e0e4a5b09e6a479ca90a929c" and "5e093a5555102867088a8cb9198229f1463217f0" have entirely different histories.
41be05093d
...
5e093a5555
|
@ -440,7 +440,7 @@ class AudioContentService(
|
||||||
|
|
||||||
val releaseDate = if (
|
val releaseDate = if (
|
||||||
audioContent.releaseDate != null &&
|
audioContent.releaseDate != null &&
|
||||||
audioContent.releaseDate!! >= LocalDateTime.now() &&
|
audioContent.releaseDate!! < LocalDateTime.now() &&
|
||||||
creatorId != member.id!!
|
creatorId != member.id!!
|
||||||
) {
|
) {
|
||||||
audioContent.releaseDate!!
|
audioContent.releaseDate!!
|
||||||
|
@ -453,9 +453,9 @@ class AudioContentService(
|
||||||
}
|
}
|
||||||
|
|
||||||
val audioContentUrl = if (
|
val audioContentUrl = if (
|
||||||
audioContent.releaseDate == null ||
|
audioContent.releaseDate != null &&
|
||||||
audioContent.releaseDate!! <= LocalDateTime.now() ||
|
audioContent.releaseDate!! < LocalDateTime.now() &&
|
||||||
creatorId == member.id!!
|
creatorId != member.id!!
|
||||||
) {
|
) {
|
||||||
audioContentCloudFront.generateSignedURL(
|
audioContentCloudFront.generateSignedURL(
|
||||||
resourcePath = if (
|
resourcePath = if (
|
||||||
|
|
|
@ -122,6 +122,31 @@ class AudioContentMainService(
|
||||||
}
|
}
|
||||||
.toList()
|
.toList()
|
||||||
|
|
||||||
|
@Transactional(readOnly = true)
|
||||||
|
@Cacheable(cacheNames = ["default"], key = "'contentCurationList:' + #memberId + ':' + #isAdult")
|
||||||
|
fun getAudioContentCurationList(memberId: Long, isAdult: Boolean) =
|
||||||
|
repository.getAudioContentCurations(isAdult = isAdult)
|
||||||
|
.asSequence()
|
||||||
|
.map {
|
||||||
|
GetAudioContentCurationResponse(
|
||||||
|
curationId = it.id!!,
|
||||||
|
title = it.title,
|
||||||
|
description = it.description,
|
||||||
|
contents = repository.findAudioContentByCurationId(
|
||||||
|
curationId = it.id!!,
|
||||||
|
cloudfrontHost = imageHost,
|
||||||
|
isAdult = isAdult
|
||||||
|
)
|
||||||
|
.asSequence()
|
||||||
|
.filter { content ->
|
||||||
|
!blockMemberRepository.isBlocked(blockedMemberId = memberId, memberId = content.creatorId)
|
||||||
|
}
|
||||||
|
.toList()
|
||||||
|
)
|
||||||
|
}
|
||||||
|
.filter { it.contents.isNotEmpty() }
|
||||||
|
.toList()
|
||||||
|
|
||||||
@Transactional(readOnly = true)
|
@Transactional(readOnly = true)
|
||||||
@Cacheable(
|
@Cacheable(
|
||||||
cacheNames = ["default"],
|
cacheNames = ["default"],
|
||||||
|
|
Loading…
Reference in New Issue