From 5e093a5555102867088a8cb9198229f1463217f0 Mon Sep 17 00:00:00 2001 From: Klaus Date: Tue, 9 Jan 2024 23:02:41 +0900 Subject: [PATCH] =?UTF-8?q?=EC=82=AC=EC=9A=A9=ED=95=98=EC=A7=80=20?= =?UTF-8?q?=EC=95=8A=EB=8A=94=20API=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/AudioContentMainController.kt | 13 +-- .../main/AudioContentMainManageService.kt | 94 ------------------- 2 files changed, 1 insertion(+), 106 deletions(-) delete mode 100644 src/main/kotlin/kr/co/vividnext/sodalive/content/main/AudioContentMainManageService.kt 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 4a6ea13..058ccf3 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 @@ -15,19 +15,8 @@ import org.springframework.web.bind.annotation.RestController @RequestMapping("/audio-content/main") class AudioContentMainController( private val service: AudioContentMainService, - private val orderService: OrderService, - private val manageService: AudioContentMainManageService + private val orderService: OrderService ) { - - @GetMapping - fun getMain( - @AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member? - ) = run { - if (member == null) throw SodaException("로그인 정보를 확인해주세요.") - - ApiResponse.ok(manageService.getMain(member)) - } - @GetMapping("/new-content-upload-creator") fun newContentUploadCreatorList( @AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member? diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/content/main/AudioContentMainManageService.kt b/src/main/kotlin/kr/co/vividnext/sodalive/content/main/AudioContentMainManageService.kt deleted file mode 100644 index 4ec97e1..0000000 --- a/src/main/kotlin/kr/co/vividnext/sodalive/content/main/AudioContentMainManageService.kt +++ /dev/null @@ -1,94 +0,0 @@ -package kr.co.vividnext.sodalive.content.main - -import kr.co.vividnext.sodalive.content.AudioContentRepository -import kr.co.vividnext.sodalive.content.AudioContentService -import kr.co.vividnext.sodalive.content.order.OrderService -import kr.co.vividnext.sodalive.content.theme.AudioContentThemeQueryRepository -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.stereotype.Service -import org.springframework.transaction.annotation.Transactional -import java.time.DayOfWeek -import java.time.LocalDateTime -import java.time.temporal.TemporalAdjusters - -@Service -class AudioContentMainManageService( - private val service: AudioContentMainService, - private val orderService: OrderService, - private val audioContentService: AudioContentService, - - private val repository: AudioContentRepository, - private val blockMemberRepository: BlockMemberRepository, - private val audioContentThemeRepository: AudioContentThemeQueryRepository, - - @Value("\${cloud.aws.cloud-front.host}") - private val imageHost: String -) { - @Transactional(readOnly = true) - fun getMain(member: Member): GetAudioContentMainResponse { - val memberId = member.id!! - val isAdult = member.auth != null - - val newContentUploadCreatorList = service.getNewContentUploadCreatorList( - memberId = memberId, - isAdult = isAdult - ) - - val bannerList = service.getAudioContentMainBannerList(memberId = memberId, isAdult = isAdult) - - val orderList = orderService.getAudioContentMainOrderList( - memberId = memberId, - limit = 20 - ) - - // 콘텐츠 테마 - val themeList = audioContentThemeRepository.getActiveThemeOfContent(isAdult = isAdult) - - // 새 콘텐츠 20개 - 시간 내림차순 정렬 - val newContentList = repository.findByTheme( - cloudfrontHost = imageHost, - isAdult = isAdult - ) - .asSequence() - .filter { - !blockMemberRepository.isBlocked( - blockedMemberId = memberId, - memberId = it.creatorId - ) - } - .toList() - - val curationList = service.getAudioContentCurationList(memberId = memberId, isAdult = isAdult) - - val currentDateTime = LocalDateTime.now() - val startDate = currentDateTime - .minusWeeks(1) - .with(TemporalAdjusters.previousOrSame(DayOfWeek.MONDAY)) - .withHour(15) - .withMinute(0) - .withSecond(0) - val endDate = startDate.plusDays(7) - - val contentRankingSortTypeList = audioContentService.getContentRankingSortTypeList() - val contentRanking = audioContentService.getAudioContentRanking( - isAdult = isAdult, - startDate = startDate, - endDate = endDate, - offset = 0, - limit = 12 - ) - - return GetAudioContentMainResponse( - newContentUploadCreatorList = newContentUploadCreatorList, - bannerList = bannerList, - orderList = orderList, - themeList = themeList, - newContentList = newContentList, - curationList = curationList, - contentRankingSortTypeList = contentRankingSortTypeList, - contentRanking = contentRanking - ) - } -}