From be8f0d66b9b91f63aaaaf7f80d0dcbe456e24506 Mon Sep 17 00:00:00 2001 From: Klaus Date: Fri, 26 Jan 2024 01:57:20 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=EC=BD=98=ED=85=90=EC=B8=A0=20=EC=97=85?= =?UTF-8?q?=EB=A1=9C=EB=93=9C=20AS-IS=20:=20=ED=95=AD=EC=83=81=20=EB=AF=B8?= =?UTF-8?q?=EB=A6=AC=EB=93=A3=EA=B8=B0=20=ED=8C=8C=EC=9D=BC=20=EC=83=9D?= =?UTF-8?q?=EC=84=B1=20TO-BE=20:=20=EB=AF=B8=EB=A6=AC=EB=93=A3=EA=B8=B0=20?= =?UTF-8?q?=ED=8C=8C=EC=9D=BC=20=EC=83=9D=EC=84=B1=20=EC=97=AC=EB=B6=80=20?= =?UTF-8?q?=EC=84=A0=ED=83=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kr/co/vividnext/sodalive/content/AudioContentService.kt | 2 +- 1 file changed, 1 insertion(+), 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 11ae487..8df6b01 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/content/AudioContentService.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/content/AudioContentService.kt @@ -246,7 +246,7 @@ class AudioContentService( // 콘텐츠 파일 업로드 metadata = ObjectMetadata() metadata.contentLength = contentFile.size - metadata.addUserMetadata("generate_preview", "true") + metadata.addUserMetadata("generate_preview", request.isGeneratePreview.toString()) if (request.previewStartTime != null && request.previewEndTime != null) { metadata.addUserMetadata("preview_start_time", request.previewStartTime) From 3ea6b5824bea1c8c853cc8fba89bf3a8bb33902f Mon Sep 17 00:00:00 2001 From: Klaus Date: Fri, 26 Jan 2024 03:39:09 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=EC=BD=98=ED=85=90=EC=B8=A0=20=EC=83=81?= =?UTF-8?q?=EC=84=B8=20-=20=EB=AF=B8=EB=A6=AC=EB=93=A3=EA=B8=B0=20?= =?UTF-8?q?=EC=97=AC=EB=B6=80=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kr/co/vividnext/sodalive/content/AudioContentService.kt | 3 ++- .../sodalive/content/GetAudioContentDetailResponse.kt | 1 + 2 files changed, 3 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 8df6b01..09a65f1 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/content/AudioContentService.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/content/AudioContentService.kt @@ -358,7 +358,7 @@ class AudioContentService( ) ) - if (audioContent.releaseDate == null) { + if (audioContent.releaseDate == null || audioContent.releaseDate!! <= audioContent.createdAt) { audioContent.isActive = true applicationEventPublisher.publishEvent( @@ -562,6 +562,7 @@ class AudioContentService( price = audioContent.price, duration = audioContent.duration ?: "", releaseDate = releaseDate, + isActivePreview = audioContent.isGeneratePreview, isAdult = audioContent.isAdult, isMosaic = audioContent.isAdult && member.auth == null, isOnlyRental = audioContent.isOnlyRental, diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/content/GetAudioContentDetailResponse.kt b/src/main/kotlin/kr/co/vividnext/sodalive/content/GetAudioContentDetailResponse.kt index c91248f..ed377b6 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/content/GetAudioContentDetailResponse.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/content/GetAudioContentDetailResponse.kt @@ -15,6 +15,7 @@ data class GetAudioContentDetailResponse( val price: Int, val duration: String, val releaseDate: String?, + val isActivePreview: Boolean, val isAdult: Boolean, val isMosaic: Boolean, val isOnlyRental: Boolean,