Compare commits
2 Commits
5e093a5555
...
41be05093d
Author | SHA1 | Date |
---|---|---|
|
41be05093d | |
|
40f4a12f9b |
|
@ -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,31 +122,6 @@ 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