From afe529a11692629b190119f36147460d75810f1b Mon Sep 17 00:00:00 2001 From: Klaus Date: Thu, 11 Jan 2024 12:19:09 +0900 Subject: [PATCH] =?UTF-8?q?=EC=98=88=EC=95=BD=20=EC=97=85=EB=A1=9C?= =?UTF-8?q?=EB=93=9C=20=EB=B0=B0=ED=8F=AC=20=EB=A1=9C=EC=A7=81=20=EC=9C=84?= =?UTF-8?q?=EC=B9=98=20=EC=9D=B4=EB=8F=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../content/AudioContentController.kt | 13 +---- .../sodalive/content/AudioContentService.kt | 52 ++++++++++--------- 2 files changed, 30 insertions(+), 35 deletions(-) diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/content/AudioContentController.kt b/src/main/kotlin/kr/co/vividnext/sodalive/content/AudioContentController.kt index ab678be..b8f8873 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/content/AudioContentController.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/content/AudioContentController.kt @@ -25,10 +25,7 @@ import java.time.temporal.TemporalAdjusters @RestController @RequestMapping("/audio-content") -class AudioContentController( - private val service: AudioContentService, - private val repository: AudioContentRepository -) { +class AudioContentController(private val service: AudioContentService) { @PostMapping @PreAuthorize("hasRole('CREATOR')") fun createAudioContent( @@ -197,12 +194,6 @@ class AudioContentController( @PostMapping("/release") @PreAuthorize("hasRole('BOT')") fun releaseContent() = run { - val contentIdList = repository.getNotReleaseContentId() - - for (contentId in contentIdList) { - service.releaseContent(contentId) - } - - ApiResponse.ok(null) + ApiResponse.ok(service.releaseContent()) } } 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 90b0b54..dac8bd9 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/content/AudioContentService.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/content/AudioContentService.kt @@ -387,35 +387,39 @@ class AudioContentService( } @Transactional - fun releaseContent(contentId: Long) { - val audioContent = repository.findByIdOrNull(contentId) - ?: throw SodaException("잘못된 요청입니다.") + fun releaseContent() { + val contentIdList = repository.getNotReleaseContentId() - audioContent.isActive = true + for (contentId in contentIdList) { + val audioContent = repository.findByIdOrNull(contentId) + ?: throw SodaException("잘못된 요청입니다.") - applicationEventPublisher.publishEvent( - FcmEvent( - type = FcmEventType.UPLOAD_CONTENT, - title = audioContent.member!!.nickname, - message = "콘텐츠를 업로드 하였습니다. - ${audioContent.title}", - isAuth = audioContent.isAdult, - contentId = contentId, - creatorId = audioContent.member!!.id, - container = "ios" + audioContent.isActive = true + + applicationEventPublisher.publishEvent( + FcmEvent( + type = FcmEventType.UPLOAD_CONTENT, + title = audioContent.member!!.nickname, + message = "콘텐츠를 업로드 하였습니다. - ${audioContent.title}", + isAuth = audioContent.isAdult, + contentId = contentId, + creatorId = audioContent.member!!.id, + container = "ios" + ) ) - ) - applicationEventPublisher.publishEvent( - FcmEvent( - type = FcmEventType.UPLOAD_CONTENT, - title = audioContent.member!!.nickname, - message = "콘텐츠를 업로드 하였습니다. - ${audioContent.title}", - isAuth = audioContent.isAdult, - contentId = contentId, - creatorId = audioContent.member!!.id, - container = "aos" + applicationEventPublisher.publishEvent( + FcmEvent( + type = FcmEventType.UPLOAD_CONTENT, + title = audioContent.member!!.nickname, + message = "콘텐츠를 업로드 하였습니다. - ${audioContent.title}", + isAuth = audioContent.isAdult, + contentId = contentId, + creatorId = audioContent.member!!.id, + container = "aos" + ) ) - ) + } } fun getDetail(id: Long, member: Member, timezone: String): GetAudioContentDetailResponse {