From 5c228af14bfa4ecc6f4aed8c2b4ef4284085c3b5 Mon Sep 17 00:00:00 2001 From: Klaus Date: Mon, 6 Nov 2023 18:04:08 +0900 Subject: [PATCH 1/3] =?UTF-8?q?=EC=BD=98=ED=85=90=EC=B8=A0=20=EB=A9=94?= =?UTF-8?q?=EC=9D=B8=20=EC=BA=90=EC=8B=B1=EC=A0=84=EB=9E=B5=20=EC=88=98?= =?UTF-8?q?=EC=A0=95=20AS=20IS=20-=20=EA=B0=81=20=EC=84=B9=EC=85=98?= =?UTF-8?q?=EB=B3=84=EB=A1=9C=20=EC=BA=90=EC=8B=B1=20TO=20BE=20-=20getMain?= =?UTF-8?q?=20=ED=95=A8=EC=88=98=20=EC=A0=84=EC=B2=B4=20=EC=BA=90=EC=8B=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../content/main/GetAudioContentMainItem.kt | 15 ++++++++------- .../content/main/GetAudioContentMainResponse.kt | 17 +++++++++-------- .../banner/GetAudioContentBannerResponse.kt | 11 ++++++----- .../curation/GetAudioContentCurationResponse.kt | 9 +++++---- 4 files changed, 28 insertions(+), 24 deletions(-) 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 1ab49eb..64e0712 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 @@ -1,13 +1,14 @@ package kr.co.vividnext.sodalive.content.main +import com.fasterxml.jackson.annotation.JsonProperty import com.querydsl.core.annotations.QueryProjection data class GetAudioContentMainItem @QueryProjection constructor( - val contentId: Long, - val coverImageUrl: String, - val title: String, - val isAdult: Boolean, - val creatorId: Long, - val creatorProfileImageUrl: String, - val creatorNickname: String + @JsonProperty("contentId") val contentId: Long, + @JsonProperty("coverImageUrl") val coverImageUrl: String, + @JsonProperty("title") val title: String, + @JsonProperty("isAdult") val isAdult: Boolean, + @JsonProperty("creatorId") val creatorId: Long, + @JsonProperty("creatorProfileImageUrl") val creatorProfileImageUrl: String, + @JsonProperty("creatorNickname") val creatorNickname: 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 index 1cd184c..656e54e 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/content/main/GetAudioContentMainResponse.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/content/main/GetAudioContentMainResponse.kt @@ -1,15 +1,16 @@ 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( - val newContentUploadCreatorList: List, - val bannerList: List, - val orderList: List, - val themeList: List, - val newContentList: List, - val curationList: List, - val contentRankingSortTypeList: List, - val contentRanking: GetAudioContentRanking + @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/banner/GetAudioContentBannerResponse.kt b/src/main/kotlin/kr/co/vividnext/sodalive/content/main/banner/GetAudioContentBannerResponse.kt index 31cc797..14210e9 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/content/main/banner/GetAudioContentBannerResponse.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/content/main/banner/GetAudioContentBannerResponse.kt @@ -1,11 +1,12 @@ package kr.co.vividnext.sodalive.content.main.banner +import com.fasterxml.jackson.annotation.JsonProperty import kr.co.vividnext.sodalive.event.EventItem data class GetAudioContentBannerResponse( - val type: AudioContentBannerType, - val thumbnailImageUrl: String, - val eventItem: EventItem?, - val creatorId: Long?, - val link: String? + @JsonProperty("type") val type: AudioContentBannerType, + @JsonProperty("thumbnailImageUrl") val thumbnailImageUrl: String, + @JsonProperty("eventItem") val eventItem: EventItem?, + @JsonProperty("creatorId") val creatorId: Long?, + @JsonProperty("link") val link: String? ) 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 6a57546..7a35cd4 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 @@ -1,10 +1,11 @@ package kr.co.vividnext.sodalive.content.main.curation +import com.fasterxml.jackson.annotation.JsonProperty import kr.co.vividnext.sodalive.content.main.GetAudioContentMainItem data class GetAudioContentCurationResponse( - val curationId: Long, - val title: String, - val description: String, - val contents: List + @JsonProperty("curationId") val curationId: Long, + @JsonProperty("title") val title: String, + @JsonProperty("description") val description: String, + @JsonProperty("contents") val contents: List ) -- 2.40.1 From 5b218169c7053ca780bee95c8241f370f377c69b Mon Sep 17 00:00:00 2001 From: Klaus Date: Mon, 6 Nov 2023 18:12:27 +0900 Subject: [PATCH 2/3] =?UTF-8?q?=EC=BD=98=ED=85=90=EC=B8=A0=20=EB=A9=94?= =?UTF-8?q?=EC=9D=B8=20=ED=95=AD=EB=AA=A9=20-=20=EC=82=AC=EC=9A=A9?= =?UTF-8?q?=ED=95=98=EC=A7=80=20=EC=95=8A=EB=8A=94=20isAdult=20=EC=A0=9C?= =?UTF-8?q?=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vividnext/sodalive/content/main/GetAudioContentMainItem.kt | 1 - 1 file changed, 1 deletion(-) 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 64e0712..93e884d 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 @@ -7,7 +7,6 @@ data class GetAudioContentMainItem @QueryProjection constructor( @JsonProperty("contentId") val contentId: Long, @JsonProperty("coverImageUrl") val coverImageUrl: String, @JsonProperty("title") val title: String, - @JsonProperty("isAdult") val isAdult: Boolean, @JsonProperty("creatorId") val creatorId: Long, @JsonProperty("creatorProfileImageUrl") val creatorProfileImageUrl: String, @JsonProperty("creatorNickname") val creatorNickname: String -- 2.40.1 From 0e786f46cb0c09bd30ac37dec4239dc355acebbf Mon Sep 17 00:00:00 2001 From: Klaus Date: Mon, 6 Nov 2023 18:21:32 +0900 Subject: [PATCH 3/3] =?UTF-8?q?=EC=BD=98=ED=85=90=EC=B8=A0=20=EB=A9=94?= =?UTF-8?q?=EC=9D=B8=20=ED=95=AD=EB=AA=A9=20-=20=EC=82=AC=EC=9A=A9?= =?UTF-8?q?=ED=95=98=EC=A7=80=20=EC=95=8A=EB=8A=94=20isAdult=20=EC=A0=9C?= =?UTF-8?q?=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kr/co/vividnext/sodalive/content/AudioContentRepository.kt | 3 --- .../main/curation/AudioContentCurationQueryRepository.kt | 1 - .../kr/co/vividnext/sodalive/content/order/OrderRepository.kt | 1 - 3 files changed, 5 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 95b4aec..94c9ffc 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/content/AudioContentRepository.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/content/AudioContentRepository.kt @@ -261,7 +261,6 @@ class AudioContentQueryRepositoryImpl(private val queryFactory: JPAQueryFactory) audioContent.id, audioContent.coverImage.prepend("/").prepend(cloudfrontHost), audioContent.title, - audioContent.isAdult, member.id, member.profileImage.prepend("/").prepend(cloudfrontHost), member.nickname @@ -323,7 +322,6 @@ class AudioContentQueryRepositoryImpl(private val queryFactory: JPAQueryFactory) audioContent.id, audioContent.coverImage.prepend("/").prepend(cloudfrontHost), audioContent.title, - audioContent.isAdult, member.id, member.profileImage.prepend("/").prepend(cloudfrontHost), member.nickname @@ -425,7 +423,6 @@ class AudioContentQueryRepositoryImpl(private val queryFactory: JPAQueryFactory) audioContent.id, audioContent.coverImage.prepend("/").prepend(cloudfrontHost), audioContent.title, - audioContent.isAdult, member.id, member.profileImage .prepend("/") 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 7ec2739..878bf58 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 @@ -57,7 +57,6 @@ class AudioContentCurationQueryRepository(private val queryFactory: JPAQueryFact audioContent.id, audioContent.coverImage.prepend("/").prepend(cloudfrontHost), audioContent.title, - audioContent.isAdult, member.id, member.profileImage.prepend("/").prepend(cloudfrontHost), member.nickname 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 8e11038..db52c6f 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 @@ -187,7 +187,6 @@ class OrderQueryRepositoryImpl(private val queryFactory: JPAQueryFactory) : Orde audioContent.id, audioContent.coverImage.prepend("/").prepend(coverImageHost), audioContent.title, - audioContent.isAdult, member.id, member.profileImage .prepend("/") -- 2.40.1