From 1d904c5cde7a5858a3703713301f980b7003a3ae Mon Sep 17 00:00:00 2001 From: Klaus Date: Tue, 13 Feb 2024 03:17:34 +0900 Subject: [PATCH] =?UTF-8?q?=EC=BD=98=ED=85=90=EC=B8=A0=20=EB=A6=AC?= =?UTF-8?q?=EC=8A=A4=ED=8A=B8=20-=20=EA=B0=80=EA=B2=A9=EA=B3=BC=20?= =?UTF-8?q?=EC=8B=9C=EA=B0=84=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sodalive/content/AudioContentRepository.kt | 12 +++++++++--- .../content/main/GetAudioContentMainItem.kt | 4 +++- .../content/main/GetAudioContentMainResponse.kt | 16 ---------------- .../AudioContentCurationQueryRepository.kt | 4 +++- .../sodalive/content/order/OrderRepository.kt | 4 +++- 5 files changed, 18 insertions(+), 22 deletions(-) delete mode 100644 src/main/kotlin/kr/co/vividnext/sodalive/content/main/GetAudioContentMainResponse.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 c484bd9..a90a503 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/content/AudioContentRepository.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/content/AudioContentRepository.kt @@ -344,7 +344,9 @@ class AudioContentQueryRepositoryImpl(private val queryFactory: JPAQueryFactory) audioContent.title, member.id, member.profileImage.prepend("/").prepend(cloudfrontHost), - member.nickname + member.nickname, + audioContent.price, + audioContent.duration ) ) .from(audioContent) @@ -416,7 +418,9 @@ class AudioContentQueryRepositoryImpl(private val queryFactory: JPAQueryFactory) audioContent.title, member.id, member.profileImage.prepend("/").prepend(cloudfrontHost), - member.nickname + member.nickname, + audioContent.price, + audioContent.duration ) ) .from(audioContent) @@ -519,7 +523,9 @@ class AudioContentQueryRepositoryImpl(private val queryFactory: JPAQueryFactory) member.profileImage .prepend("/") .prepend(cloudfrontHost), - member.nickname + member.nickname, + audioContent.price, + audioContent.duration ) ) .from(audioContent) diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/content/main/GetAudioContentMainItem.kt b/src/main/kotlin/kr/co/vividnext/sodalive/content/main/GetAudioContentMainItem.kt index 93e884d..a329cd4 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/content/main/GetAudioContentMainItem.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/content/main/GetAudioContentMainItem.kt @@ -9,5 +9,7 @@ data class GetAudioContentMainItem @QueryProjection constructor( @JsonProperty("title") val title: String, @JsonProperty("creatorId") val creatorId: Long, @JsonProperty("creatorProfileImageUrl") val creatorProfileImageUrl: String, - @JsonProperty("creatorNickname") val creatorNickname: String + @JsonProperty("creatorNickname") val creatorNickname: String, + @JsonProperty("price") val price: Int, + @JsonProperty("duration") val duration: String ) diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/content/main/GetAudioContentMainResponse.kt b/src/main/kotlin/kr/co/vividnext/sodalive/content/main/GetAudioContentMainResponse.kt deleted file mode 100644 index 656e54e..0000000 --- a/src/main/kotlin/kr/co/vividnext/sodalive/content/main/GetAudioContentMainResponse.kt +++ /dev/null @@ -1,16 +0,0 @@ -package kr.co.vividnext.sodalive.content.main - -import com.fasterxml.jackson.annotation.JsonProperty -import kr.co.vividnext.sodalive.content.main.banner.GetAudioContentBannerResponse -import kr.co.vividnext.sodalive.content.main.curation.GetAudioContentCurationResponse - -data class GetAudioContentMainResponse( - @JsonProperty("newContentUploadCreatorList") val newContentUploadCreatorList: List, - @JsonProperty("bannerList") val bannerList: List, - @JsonProperty("orderList") val orderList: List, - @JsonProperty("themeList") val themeList: List, - @JsonProperty("newContentList") val newContentList: List, - @JsonProperty("curationList") val curationList: List, - @JsonProperty("contentRankingSortTypeList") val contentRankingSortTypeList: List, - @JsonProperty("contentRanking") val contentRanking: GetAudioContentRanking -) 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 878bf58..91994c6 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 @@ -59,7 +59,9 @@ class AudioContentCurationQueryRepository(private val queryFactory: JPAQueryFact audioContent.title, member.id, member.profileImage.prepend("/").prepend(cloudfrontHost), - member.nickname + member.nickname, + audioContent.price, + audioContent.duration ) ) .from(audioContent) diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/content/order/OrderRepository.kt b/src/main/kotlin/kr/co/vividnext/sodalive/content/order/OrderRepository.kt index feb941d..bcdce03 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/content/order/OrderRepository.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/content/order/OrderRepository.kt @@ -192,7 +192,9 @@ class OrderQueryRepositoryImpl(private val queryFactory: JPAQueryFactory) : Orde member.profileImage .prepend("/") .prepend(coverImageHost), - member.nickname + member.nickname, + audioContent.price, + audioContent.duration ) ) .from(order)