From 5970a9a5b6de894355cb43ad0d3aba0efb7c57fd Mon Sep 17 00:00:00 2001 From: Klaus Date: Fri, 22 Sep 2023 17:00:50 +0900 Subject: [PATCH 1/6] =?UTF-8?q?=EC=98=A4=EB=94=94=EC=98=A4=20=EC=BD=98?= =?UTF-8?q?=ED=85=90=EC=B8=A0=20=EC=97=85=EB=A1=9C=EB=93=9C=20-=20?= =?UTF-8?q?=EB=AF=B8=EB=A6=AC=EB=93=A3=EA=B8=B0=20=EC=8B=9C=EA=B0=84=20?= =?UTF-8?q?=EC=84=A4=EC=A0=95=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sodalive/content/AudioContentService.kt | 68 +++++++++++++++++++ .../content/CreateAudioContentRequest.kt | 4 +- 2 files changed, 71 insertions(+), 1 deletion(-) diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/content/AudioContentService.kt b/src/main/kotlin/kr/co/vividnext/sodalive/content/AudioContentService.kt index a48239e..fbeb3ee 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/content/AudioContentService.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/content/AudioContentService.kt @@ -28,9 +28,11 @@ import org.springframework.data.repository.findByIdOrNull import org.springframework.stereotype.Service import org.springframework.transaction.annotation.Transactional import org.springframework.web.multipart.MultipartFile +import java.text.SimpleDateFormat import java.time.LocalDateTime import java.time.ZoneId import java.time.format.DateTimeFormatter +import java.util.Locale @Service @Transactional(readOnly = true) @@ -137,6 +139,9 @@ class AudioContentService( // request 내용 파싱 val request = objectMapper.readValue(requestString, CreateAudioContentRequest::class.java) + // 미리듣기 시간 체크 + validatePreviewTime(request.previewStartTime, request.previewEndTime) + // contentFile 체크 if (contentFile == null && request.type == AudioContentType.INDIVIDUAL) { throw SodaException("콘텐츠를 선택해 주세요.") @@ -228,6 +233,11 @@ class AudioContentService( metadata.contentLength = contentFile.size metadata.addUserMetadata("generate_preview", "true") + if (request.previewStartTime != null && request.previewEndTime != null) { + metadata.addUserMetadata("preview_start_time", request.previewStartTime) + metadata.addUserMetadata("preview_end_time", request.previewEndTime) + } + val contentPath = s3Uploader.upload( inputStream = contentFile.inputStream, bucket = audioContentBucket, @@ -253,6 +263,64 @@ class AudioContentService( return CreateAudioContentResponse(contentId = audioContent.id!!) } + private fun validatePreviewTime(previewStartTime: String?, previewEndTime: String?) { + if (previewStartTime != null && previewEndTime != null) { + val startTimeArray = previewStartTime.split(":") + if (startTimeArray.size != 3) { + throw SodaException("미리 듣기 시간 형식은 00:30:00 과 같아야 합니다") + } + + for (time in startTimeArray) { + if (time.length != 2) { + throw SodaException("미리 듣기 시간 형식은 00:30:00 과 같아야 합니다") + } + } + + val endTimeArray = previewEndTime.split(":") + if (endTimeArray.size != 3) { + throw SodaException("미리 듣기 시간 형식은 00:30:00 과 같아야 합니다") + } + + for (time in endTimeArray) { + if (time.length != 2) { + throw SodaException("미리 듣기 시간 형식은 00:30:00 과 같아야 합니다") + } + } + + val timeDifference = timeDifference(previewStartTime, previewEndTime) + + if (timeDifference < 30000) { + throw SodaException("미리 듣기의 최소 시간은 30초 입니다.") + } + } else { + if (previewStartTime != null || previewEndTime != null) { + throw SodaException("미리 듣기 시작 시간과 종료 시간 둘 다 입력을 하거나 둘 다 입력 하지 않아야 합니다.") + } + } + } + + private fun timeDifference(startTime: String, endTime: String): Long { + try { + // Define a date format for parsing the times + val dateFormat = SimpleDateFormat("HH:mm:ss", Locale.KOREAN) + + // Parse the input times into Date objects + val date1 = dateFormat.parse(startTime) + val date2 = dateFormat.parse(endTime) + + // Check if either date is null + if (date1 == null || date2 == null) { + return 0 + } + + // Check if the time difference is greater than 30 seconds (30000 milliseconds) + return date2.time - date1.time + } catch (e: Exception) { + // Handle invalid time formats or parsing errors + return 0 + } + } + @Transactional fun uploadComplete(contentId: Long, content: String, duration: String) { val keyFileName = content.split("/").last() diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/content/CreateAudioContentRequest.kt b/src/main/kotlin/kr/co/vividnext/sodalive/content/CreateAudioContentRequest.kt index 8952c84..cab17ae 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/content/CreateAudioContentRequest.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/content/CreateAudioContentRequest.kt @@ -10,5 +10,7 @@ data class CreateAudioContentRequest( val isGeneratePreview: Boolean = true, val isCommentAvailable: Boolean = false, val type: AudioContentType = AudioContentType.INDIVIDUAL, - val childIds: List? = null + val childIds: List? = null, + val previewStartTime: String? = null, + val previewEndTime: String? = null ) -- 2.40.1 From 22a79c0be41ba34900609032bd02410efa119d4d Mon Sep 17 00:00:00 2001 From: Klaus Date: Tue, 26 Sep 2023 11:54:51 +0900 Subject: [PATCH 2/6] =?UTF-8?q?=EC=BD=98=ED=85=90=EC=B8=A0=20=ED=81=90?= =?UTF-8?q?=EB=A0=88=EC=9D=B4=EC=85=98=20=EC=A0=84=EC=B2=B4=EB=B3=B4?= =?UTF-8?q?=EA=B8=B0=20API=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../content/main/AudioContentMainService.kt | 1 + .../AudioContentCurationController.kt | 26 ++++++++++ .../AudioContentCurationQueryRepository.kt | 52 +++++++++++++++++++ .../curation/AudioContentCurationService.kt | 30 +++++++++++ .../GetAudioContentCurationResponse.kt | 1 + 5 files changed, 110 insertions(+) create mode 100644 src/main/kotlin/kr/co/vividnext/sodalive/content/main/curation/AudioContentCurationController.kt create mode 100644 src/main/kotlin/kr/co/vividnext/sodalive/content/main/curation/AudioContentCurationQueryRepository.kt create mode 100644 src/main/kotlin/kr/co/vividnext/sodalive/content/main/curation/AudioContentCurationService.kt diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/content/main/AudioContentMainService.kt b/src/main/kotlin/kr/co/vividnext/sodalive/content/main/AudioContentMainService.kt index 8c01c2a..0dc954e 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/content/main/AudioContentMainService.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/content/main/AudioContentMainService.kt @@ -104,6 +104,7 @@ class AudioContentMainService( .asSequence() .map { GetAudioContentCurationResponse( + curationId = it.id!!, title = it.title, description = it.description, contents = repository.findAudioContentByCurationId( diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/content/main/curation/AudioContentCurationController.kt b/src/main/kotlin/kr/co/vividnext/sodalive/content/main/curation/AudioContentCurationController.kt new file mode 100644 index 0000000..3906fe8 --- /dev/null +++ b/src/main/kotlin/kr/co/vividnext/sodalive/content/main/curation/AudioContentCurationController.kt @@ -0,0 +1,26 @@ +package kr.co.vividnext.sodalive.content.main.curation + +import kr.co.vividnext.sodalive.common.ApiResponse +import kr.co.vividnext.sodalive.common.SodaException +import kr.co.vividnext.sodalive.member.Member +import org.springframework.data.domain.Pageable +import org.springframework.security.core.annotation.AuthenticationPrincipal +import org.springframework.web.bind.annotation.GetMapping +import org.springframework.web.bind.annotation.PathVariable +import org.springframework.web.bind.annotation.RequestMapping +import org.springframework.web.bind.annotation.RestController + +@RestController +@RequestMapping("/audio-content/curation") +class AudioContentCurationController(private val service: AudioContentCurationService) { + @GetMapping("/{id}") + fun getCurationContent( + @PathVariable id: Long, + @AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member?, + pageable: Pageable + ) = run { + if (member == null) throw SodaException("로그인 정보를 확인해주세요.") + + ApiResponse.ok(service.getCurationContent(id, member, pageable)) + } +} diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/content/main/curation/AudioContentCurationQueryRepository.kt b/src/main/kotlin/kr/co/vividnext/sodalive/content/main/curation/AudioContentCurationQueryRepository.kt new file mode 100644 index 0000000..67c8cbf --- /dev/null +++ b/src/main/kotlin/kr/co/vividnext/sodalive/content/main/curation/AudioContentCurationQueryRepository.kt @@ -0,0 +1,52 @@ +package kr.co.vividnext.sodalive.content.main.curation + +import com.querydsl.jpa.impl.JPAQueryFactory +import kr.co.vividnext.sodalive.content.QAudioContent.audioContent +import kr.co.vividnext.sodalive.content.main.GetAudioContentMainItem +import kr.co.vividnext.sodalive.content.main.QGetAudioContentMainItem +import kr.co.vividnext.sodalive.member.QMember.member +import org.springframework.beans.factory.annotation.Value +import org.springframework.stereotype.Repository + +@Repository +class AudioContentCurationQueryRepository( + private val queryFactory: JPAQueryFactory, + + @Value("\${cloud.aws.cloud-front.host}") + private val cloudFrontHost: String +) { + fun findByCurationId(curationId: Long, offset: Long, limit: Long, isAdult: Boolean): List { + var where = audioContent.isActive.isTrue + .and(audioContent.member.isNotNull) + .and(audioContent.duration.isNotNull) + .and(audioContent.member.isActive.isTrue) + .and(audioContent.curation.id.eq(curationId)) + + if (!isAdult) { + where = where.and(audioContent.isAdult.isFalse) + } + + return queryFactory + .select( + QGetAudioContentMainItem( + audioContent.id, + audioContent.coverImage.prepend("/").prepend(cloudFrontHost), + audioContent.title, + audioContent.isAdult, + member.id, + member.profileImage + .prepend("/") + .prepend(cloudFrontHost), + member.nickname + ) + ) + .from(audioContent) + .innerJoin(audioContent.member, member) + .leftJoin(audioContent.curation, QAudioContentCuration.audioContentCuration) + .where(where) + .offset(offset) + .limit(limit) + .orderBy(audioContent.id.desc()) + .fetch() + } +} diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/content/main/curation/AudioContentCurationService.kt b/src/main/kotlin/kr/co/vividnext/sodalive/content/main/curation/AudioContentCurationService.kt new file mode 100644 index 0000000..0b6dffd --- /dev/null +++ b/src/main/kotlin/kr/co/vividnext/sodalive/content/main/curation/AudioContentCurationService.kt @@ -0,0 +1,30 @@ +package kr.co.vividnext.sodalive.content.main.curation + +import kr.co.vividnext.sodalive.content.main.GetAudioContentMainItem +import kr.co.vividnext.sodalive.member.Member +import kr.co.vividnext.sodalive.member.block.BlockMemberRepository +import org.springframework.data.domain.Pageable +import org.springframework.stereotype.Service + +@Service +class AudioContentCurationService( + private val repository: AudioContentCurationQueryRepository, + private val blockMemberRepository: BlockMemberRepository +) { + fun getCurationContent(curationId: Long, member: Member, pageable: Pageable): List { + return repository.findByCurationId( + curationId = curationId, + offset = pageable.offset, + limit = pageable.pageSize.toLong(), + isAdult = member.auth != null + ) + .asSequence() + .filter { content -> + !blockMemberRepository.isBlocked( + blockedMemberId = member.id!!, + memberId = content.creatorId + ) + } + .toList() + } +} diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/content/main/curation/GetAudioContentCurationResponse.kt b/src/main/kotlin/kr/co/vividnext/sodalive/content/main/curation/GetAudioContentCurationResponse.kt index 802e9e4..6a57546 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/content/main/curation/GetAudioContentCurationResponse.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/content/main/curation/GetAudioContentCurationResponse.kt @@ -3,6 +3,7 @@ package kr.co.vividnext.sodalive.content.main.curation import kr.co.vividnext.sodalive.content.main.GetAudioContentMainItem data class GetAudioContentCurationResponse( + val curationId: Long, val title: String, val description: String, val contents: List -- 2.40.1 From 151cc10caf2163b01df02910ecdbd0f09403b922 Mon Sep 17 00:00:00 2001 From: Klaus Date: Tue, 26 Sep 2023 15:59:44 +0900 Subject: [PATCH 3/6] =?UTF-8?q?=EC=83=88=EB=A1=9C=EC=9A=B4=20=EC=BD=98?= =?UTF-8?q?=ED=85=90=EC=B8=A0=20-=20=ED=8E=98=EC=9D=B4=EC=A7=95=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vividnext/sodalive/content/AudioContentRepository.kt | 3 +++ .../sodalive/content/main/AudioContentMainController.kt | 6 ++++-- .../sodalive/content/main/AudioContentMainService.kt | 7 +++++-- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/content/AudioContentRepository.kt b/src/main/kotlin/kr/co/vividnext/sodalive/content/AudioContentRepository.kt index af5c5ef..a486b2f 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/content/AudioContentRepository.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/content/AudioContentRepository.kt @@ -52,6 +52,7 @@ interface AudioContentQueryRepository { cloudfrontHost: String, theme: String = "", isAdult: Boolean = false, + offset: Long = 0, limit: Long = 20 ): List @@ -215,6 +216,7 @@ class AudioContentQueryRepositoryImpl(private val queryFactory: JPAQueryFactory) cloudfrontHost: String, theme: String, isAdult: Boolean, + offset: Long, limit: Long ): List { var where = audioContent.isActive.isTrue @@ -243,6 +245,7 @@ class AudioContentQueryRepositoryImpl(private val queryFactory: JPAQueryFactory) .innerJoin(audioContent.member, member) .innerJoin(audioContent.theme, audioContentTheme) .where(where) + .offset(offset) .limit(limit) .orderBy(audioContent.createdAt.desc()) .fetch() diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/content/main/AudioContentMainController.kt b/src/main/kotlin/kr/co/vividnext/sodalive/content/main/AudioContentMainController.kt index d021553..6e3e1a0 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/content/main/AudioContentMainController.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/content/main/AudioContentMainController.kt @@ -3,6 +3,7 @@ package kr.co.vividnext.sodalive.content.main import kr.co.vividnext.sodalive.common.ApiResponse import kr.co.vividnext.sodalive.common.SodaException import kr.co.vividnext.sodalive.member.Member +import org.springframework.data.domain.Pageable import org.springframework.security.core.annotation.AuthenticationPrincipal import org.springframework.web.bind.annotation.GetMapping import org.springframework.web.bind.annotation.RequestMapping @@ -25,10 +26,11 @@ class AudioContentMainController(private val service: AudioContentMainService) { @GetMapping("/new") fun getNewContentByTheme( @RequestParam("theme") theme: String, - @AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member? + @AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member?, + pageable: Pageable ) = run { if (member == null) throw SodaException("로그인 정보를 확인해주세요.") - ApiResponse.ok(service.getNewContentByTheme(theme, member)) + ApiResponse.ok(service.getNewContentByTheme(theme, member, pageable)) } } diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/content/main/AudioContentMainService.kt b/src/main/kotlin/kr/co/vividnext/sodalive/content/main/AudioContentMainService.kt index 0dc954e..fc5f8c1 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/content/main/AudioContentMainService.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/content/main/AudioContentMainService.kt @@ -10,6 +10,7 @@ import kr.co.vividnext.sodalive.event.EventItem import kr.co.vividnext.sodalive.member.Member import kr.co.vividnext.sodalive.member.block.BlockMemberRepository import org.springframework.beans.factory.annotation.Value +import org.springframework.data.domain.Pageable import org.springframework.stereotype.Service @Service @@ -135,11 +136,13 @@ class AudioContentMainService( ) } - fun getNewContentByTheme(theme: String, member: Member): List { + fun getNewContentByTheme(theme: String, member: Member, pageable: Pageable): List { return repository.findByTheme( cloudfrontHost = imageHost, theme = theme, - isAdult = member.auth != null + isAdult = member.auth != null, + offset = pageable.offset, + limit = pageable.pageSize.toLong() ) .asSequence() .filter { !blockMemberRepository.isBlocked(blockedMemberId = member.id!!, memberId = it.creatorId) } -- 2.40.1 From 468add08191580b449fe2c09dce62b16101bd67d Mon Sep 17 00:00:00 2001 From: Klaus Date: Tue, 26 Sep 2023 19:15:42 +0900 Subject: [PATCH 4/6] =?UTF-8?q?=ED=81=90=EB=A0=88=EC=9D=B4=EC=85=98=20?= =?UTF-8?q?=EC=A0=84=EC=B2=B4=EB=B3=B4=EA=B8=B0=20-=20=EC=B4=9D=20?= =?UTF-8?q?=EA=B0=9C=EC=88=98,=20=EC=A0=95=EB=A0=AC=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AudioContentCurationController.kt | 5 +- .../AudioContentCurationQueryRepository.kt | 60 ++++++++++--------- .../curation/AudioContentCurationService.kt | 57 +++++++++++++++--- .../curation/GetCurationContentResponse.kt | 8 +++ 4 files changed, 95 insertions(+), 35 deletions(-) create mode 100644 src/main/kotlin/kr/co/vividnext/sodalive/content/main/curation/GetCurationContentResponse.kt diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/content/main/curation/AudioContentCurationController.kt b/src/main/kotlin/kr/co/vividnext/sodalive/content/main/curation/AudioContentCurationController.kt index 3906fe8..b3bae41 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/content/main/curation/AudioContentCurationController.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/content/main/curation/AudioContentCurationController.kt @@ -2,12 +2,14 @@ package kr.co.vividnext.sodalive.content.main.curation import kr.co.vividnext.sodalive.common.ApiResponse import kr.co.vividnext.sodalive.common.SodaException +import kr.co.vividnext.sodalive.content.SortType import kr.co.vividnext.sodalive.member.Member import org.springframework.data.domain.Pageable import org.springframework.security.core.annotation.AuthenticationPrincipal import org.springframework.web.bind.annotation.GetMapping import org.springframework.web.bind.annotation.PathVariable import org.springframework.web.bind.annotation.RequestMapping +import org.springframework.web.bind.annotation.RequestParam import org.springframework.web.bind.annotation.RestController @RestController @@ -16,11 +18,12 @@ class AudioContentCurationController(private val service: AudioContentCurationSe @GetMapping("/{id}") fun getCurationContent( @PathVariable id: Long, + @RequestParam("sort-type", required = false) sortType: SortType = SortType.NEWEST, @AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member?, pageable: Pageable ) = run { if (member == null) throw SodaException("로그인 정보를 확인해주세요.") - ApiResponse.ok(service.getCurationContent(id, member, pageable)) + ApiResponse.ok(service.getCurationContent(id, sortType, member, pageable)) } } diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/content/main/curation/AudioContentCurationQueryRepository.kt b/src/main/kotlin/kr/co/vividnext/sodalive/content/main/curation/AudioContentCurationQueryRepository.kt index 67c8cbf..fb82df9 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/content/main/curation/AudioContentCurationQueryRepository.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/content/main/curation/AudioContentCurationQueryRepository.kt @@ -1,21 +1,42 @@ package kr.co.vividnext.sodalive.content.main.curation import com.querydsl.jpa.impl.JPAQueryFactory +import kr.co.vividnext.sodalive.content.AudioContent import kr.co.vividnext.sodalive.content.QAudioContent.audioContent -import kr.co.vividnext.sodalive.content.main.GetAudioContentMainItem -import kr.co.vividnext.sodalive.content.main.QGetAudioContentMainItem -import kr.co.vividnext.sodalive.member.QMember.member -import org.springframework.beans.factory.annotation.Value +import kr.co.vividnext.sodalive.content.SortType import org.springframework.stereotype.Repository @Repository -class AudioContentCurationQueryRepository( - private val queryFactory: JPAQueryFactory, +class AudioContentCurationQueryRepository(private val queryFactory: JPAQueryFactory) { + fun findTotalCountByCurationId(curationId: Long, isAdult: Boolean = false): Int { + var where = audioContent.isActive.isTrue + .and(audioContent.curation.id.eq(curationId)) + + if (!isAdult) { + where = where.and(audioContent.isAdult.isFalse) + } + + return queryFactory + .select(audioContent.id) + .from(audioContent) + .where(where) + .fetch() + .size + } + + fun findByCurationId( + curationId: Long, + isAdult: Boolean = false, + sortType: SortType = SortType.NEWEST, + offset: Long = 0, + limit: Long = 10 + ): List { + val orderBy = when (sortType) { + SortType.NEWEST -> audioContent.createdAt.desc() + SortType.PRICE_HIGH -> audioContent.price.desc() + SortType.PRICE_LOW -> audioContent.price.asc() + } - @Value("\${cloud.aws.cloud-front.host}") - private val cloudFrontHost: String -) { - fun findByCurationId(curationId: Long, offset: Long, limit: Long, isAdult: Boolean): List { var where = audioContent.isActive.isTrue .and(audioContent.member.isNotNull) .and(audioContent.duration.isNotNull) @@ -27,26 +48,11 @@ class AudioContentCurationQueryRepository( } return queryFactory - .select( - QGetAudioContentMainItem( - audioContent.id, - audioContent.coverImage.prepend("/").prepend(cloudFrontHost), - audioContent.title, - audioContent.isAdult, - member.id, - member.profileImage - .prepend("/") - .prepend(cloudFrontHost), - member.nickname - ) - ) - .from(audioContent) - .innerJoin(audioContent.member, member) - .leftJoin(audioContent.curation, QAudioContentCuration.audioContentCuration) + .selectFrom(audioContent) .where(where) .offset(offset) .limit(limit) - .orderBy(audioContent.id.desc()) + .orderBy(orderBy) .fetch() } } diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/content/main/curation/AudioContentCurationService.kt b/src/main/kotlin/kr/co/vividnext/sodalive/content/main/curation/AudioContentCurationService.kt index 0b6dffd..a8511a9 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/content/main/curation/AudioContentCurationService.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/content/main/curation/AudioContentCurationService.kt @@ -1,30 +1,73 @@ package kr.co.vividnext.sodalive.content.main.curation -import kr.co.vividnext.sodalive.content.main.GetAudioContentMainItem +import kr.co.vividnext.sodalive.content.GetAudioContentListItem +import kr.co.vividnext.sodalive.content.SortType +import kr.co.vividnext.sodalive.content.comment.AudioContentCommentRepository +import kr.co.vividnext.sodalive.content.like.AudioContentLikeRepository import kr.co.vividnext.sodalive.member.Member import kr.co.vividnext.sodalive.member.block.BlockMemberRepository +import org.springframework.beans.factory.annotation.Value import org.springframework.data.domain.Pageable import org.springframework.stereotype.Service @Service class AudioContentCurationService( private val repository: AudioContentCurationQueryRepository, - private val blockMemberRepository: BlockMemberRepository + private val blockMemberRepository: BlockMemberRepository, + private val commentRepository: AudioContentCommentRepository, + private val audioContentLikeRepository: AudioContentLikeRepository, + + @Value("\${cloud.aws.cloud-front.host}") + private val cloudFrontHost: String ) { - fun getCurationContent(curationId: Long, member: Member, pageable: Pageable): List { - return repository.findByCurationId( + fun getCurationContent( + curationId: Long, + sortType: SortType, + member: Member, + pageable: Pageable + ): GetCurationContentResponse { + val totalCount = repository.findTotalCountByCurationId(curationId, member.auth != null) + + val audioContentList = repository.findByCurationId( curationId = curationId, + isAdult = member.auth != null, + sortType = sortType, offset = pageable.offset, - limit = pageable.pageSize.toLong(), - isAdult = member.auth != null + limit = pageable.pageSize.toLong() ) + + val items = audioContentList .asSequence() .filter { content -> !blockMemberRepository.isBlocked( blockedMemberId = member.id!!, - memberId = content.creatorId + memberId = content.member!!.id!! + ) + } + .map { + val commentCount = commentRepository + .totalCountCommentByContentId(it.id!!) + + val likeCount = audioContentLikeRepository + .totalCountAudioContentLike(it.id!!) + + GetAudioContentListItem( + contentId = it.id!!, + coverImageUrl = "$cloudFrontHost/${it.coverImage!!}", + title = it.title, + price = it.price, + themeStr = it.theme!!.theme, + duration = it.duration, + likeCount = likeCount, + commentCount = commentCount, + isAdult = it.isAdult ) } .toList() + + return GetCurationContentResponse( + totalCount = totalCount, + items = items + ) } } diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/content/main/curation/GetCurationContentResponse.kt b/src/main/kotlin/kr/co/vividnext/sodalive/content/main/curation/GetCurationContentResponse.kt new file mode 100644 index 0000000..3cad629 --- /dev/null +++ b/src/main/kotlin/kr/co/vividnext/sodalive/content/main/curation/GetCurationContentResponse.kt @@ -0,0 +1,8 @@ +package kr.co.vividnext.sodalive.content.main.curation + +import kr.co.vividnext.sodalive.content.GetAudioContentListItem + +data class GetCurationContentResponse( + val totalCount: Int, + val items: List +) -- 2.40.1 From fd460f2d3ef88200c80c356e759e9dc879de36c0 Mon Sep 17 00:00:00 2001 From: Klaus Date: Wed, 27 Sep 2023 00:02:05 +0900 Subject: [PATCH 5/6] =?UTF-8?q?=EC=83=88=EB=A1=9C=EC=9A=B4=20=EC=BD=98?= =?UTF-8?q?=ED=85=90=EC=B8=A0=20=EC=A0=84=EC=B2=B4=EB=B3=B4=EA=B8=B0=20API?= =?UTF-8?q?=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../content/AudioContentRepository.kt | 72 +++++++++++++++++++ .../main/AudioContentMainController.kt | 11 +++ .../content/main/AudioContentMainService.kt | 13 ++++ .../content/main/GetNewContentAllResponse.kt | 6 ++ 4 files changed, 102 insertions(+) create mode 100644 src/main/kotlin/kr/co/vividnext/sodalive/content/main/GetNewContentAllResponse.kt diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/content/AudioContentRepository.kt b/src/main/kotlin/kr/co/vividnext/sodalive/content/AudioContentRepository.kt index a486b2f..d059af1 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/content/AudioContentRepository.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/content/AudioContentRepository.kt @@ -56,6 +56,16 @@ interface AudioContentQueryRepository { limit: Long = 20 ): List + fun findByThemeFor2Weeks( + cloudfrontHost: String, + theme: String = "", + isAdult: Boolean = false, + offset: Long = 0, + limit: Long = 20 + ): List + + fun totalCountNewContentFor2Weeks(theme: String, isAdult: Boolean): Int + fun getNewContentUploadCreatorList( cloudfrontHost: String, isAdult: Boolean = false @@ -251,6 +261,68 @@ class AudioContentQueryRepositoryImpl(private val queryFactory: JPAQueryFactory) .fetch() } + override fun totalCountNewContentFor2Weeks(theme: String, isAdult: Boolean): Int { + var where = audioContent.isActive.isTrue + .and(audioContent.createdAt.loe(LocalDateTime.now())) + + if (!isAdult) { + where = where.and(audioContent.isAdult.isFalse) + } + + if (theme.isNotBlank()) { + where = where.and(audioContentTheme.theme.eq(theme)) + } + + return queryFactory + .select(audioContent.id) + .from(audioContent) + .innerJoin(audioContent.member, member) + .innerJoin(audioContent.theme, audioContentTheme) + .where(where) + .fetch() + .size + } + + override fun findByThemeFor2Weeks( + cloudfrontHost: String, + theme: String, + isAdult: Boolean, + offset: Long, + limit: Long + ): List { + var where = audioContent.isActive.isTrue + .and(audioContent.createdAt.loe(LocalDateTime.now())) + + if (!isAdult) { + where = where.and(audioContent.isAdult.isFalse) + } + + if (theme.isNotBlank()) { + where = where.and(audioContentTheme.theme.eq(theme)) + } + + return queryFactory + .select( + QGetAudioContentMainItem( + audioContent.id, + audioContent.coverImage.prepend("/").prepend(cloudfrontHost), + audioContent.title, + audioContent.isAdult, + member.id, + member.profileImage.prepend("/").prepend(cloudfrontHost), + member.nickname + ) + ) + .from(audioContent) + .innerJoin(audioContent.member, member) + .innerJoin(audioContent.theme, audioContentTheme) + .where(where) + .offset(offset) + .limit(limit) + .orderBy(audioContent.createdAt.desc()) + .fetch() + } + override fun getNewContentUploadCreatorList( cloudfrontHost: String, isAdult: Boolean diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/content/main/AudioContentMainController.kt b/src/main/kotlin/kr/co/vividnext/sodalive/content/main/AudioContentMainController.kt index 6e3e1a0..6720551 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/content/main/AudioContentMainController.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/content/main/AudioContentMainController.kt @@ -33,4 +33,15 @@ class AudioContentMainController(private val service: AudioContentMainService) { ApiResponse.ok(service.getNewContentByTheme(theme, member, pageable)) } + + @GetMapping("/new/all") + fun getNewContentAllByTheme( + @RequestParam("theme") theme: String, + @AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member?, + pageable: Pageable + ) = run { + if (member == null) throw SodaException("로그인 정보를 확인해주세요.") + + ApiResponse.ok(service.getNewContentFor2WeeksByTheme(theme, member, pageable)) + } } diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/content/main/AudioContentMainService.kt b/src/main/kotlin/kr/co/vividnext/sodalive/content/main/AudioContentMainService.kt index fc5f8c1..4e6ca70 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/content/main/AudioContentMainService.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/content/main/AudioContentMainService.kt @@ -148,4 +148,17 @@ class AudioContentMainService( .filter { !blockMemberRepository.isBlocked(blockedMemberId = member.id!!, memberId = it.creatorId) } .toList() } + + fun getNewContentFor2WeeksByTheme(theme: String, member: Member, pageable: Pageable): GetNewContentAllResponse { + val totalCount = repository.totalCountNewContentFor2Weeks(theme, isAdult = member.auth != null) + val items = repository.findByThemeFor2Weeks( + cloudfrontHost = imageHost, + theme = theme, + isAdult = member.auth != null, + offset = pageable.offset, + limit = pageable.pageSize.toLong() + ) + + return GetNewContentAllResponse(totalCount, items) + } } diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/content/main/GetNewContentAllResponse.kt b/src/main/kotlin/kr/co/vividnext/sodalive/content/main/GetNewContentAllResponse.kt new file mode 100644 index 0000000..e28ed53 --- /dev/null +++ b/src/main/kotlin/kr/co/vividnext/sodalive/content/main/GetNewContentAllResponse.kt @@ -0,0 +1,6 @@ +package kr.co.vividnext.sodalive.content.main + +data class GetNewContentAllResponse( + val totalCount: Int, + val items: List +) -- 2.40.1 From f161d9a4368300375b744725eba65b6edeb2d3b2 Mon Sep 17 00:00:00 2001 From: Klaus Date: Wed, 27 Sep 2023 00:05:58 +0900 Subject: [PATCH 6/6] =?UTF-8?q?=EC=BD=98=ED=85=90=EC=B8=A0=20=ED=85=8C?= =?UTF-8?q?=EB=A7=88=20API=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sodalive/content/main/AudioContentMainController.kt | 9 +++++++++ .../sodalive/content/main/AudioContentMainService.kt | 4 ++++ 2 files changed, 13 insertions(+) diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/content/main/AudioContentMainController.kt b/src/main/kotlin/kr/co/vividnext/sodalive/content/main/AudioContentMainController.kt index 6720551..41cee69 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/content/main/AudioContentMainController.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/content/main/AudioContentMainController.kt @@ -34,6 +34,15 @@ class AudioContentMainController(private val service: AudioContentMainService) { ApiResponse.ok(service.getNewContentByTheme(theme, member, pageable)) } + @GetMapping("/theme") + fun getThemeList( + @AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member? + ) = run { + if (member == null) throw SodaException("로그인 정보를 확인해주세요.") + + ApiResponse.ok(service.getThemeList(member)) + } + @GetMapping("/new/all") fun getNewContentAllByTheme( @RequestParam("theme") theme: String, diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/content/main/AudioContentMainService.kt b/src/main/kotlin/kr/co/vividnext/sodalive/content/main/AudioContentMainService.kt index 4e6ca70..6e3a544 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/content/main/AudioContentMainService.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/content/main/AudioContentMainService.kt @@ -136,6 +136,10 @@ class AudioContentMainService( ) } + fun getThemeList(member: Member): List { + return audioContentThemeRepository.getActiveThemeOfContent(isAdult = member.auth != null) + } + fun getNewContentByTheme(theme: String, member: Member, pageable: Pageable): List { return repository.findByTheme( cloudfrontHost = imageHost, -- 2.40.1