From bf6dac173a4a30bc79f0d917028d5677e822f612 Mon Sep 17 00:00:00 2001 From: Klaus Date: Fri, 6 Mar 2026 12:00:30 +0900 Subject: [PATCH] =?UTF-8?q?fix(admin-calculate):=20=EA=B4=80=EB=A6=AC?= =?UTF-8?q?=EC=9E=90=20=EC=A0=95=EC=82=B0=20=EC=A1=B0=ED=9A=8C=20=EC=BA=90?= =?UTF-8?q?=EC=8B=9C=EB=A5=BC=20=EC=A0=9C=EA=B1=B0=ED=95=98=EA=B3=A0=20?= =?UTF-8?q?=EC=9D=91=EB=8B=B5=20=EC=A7=81=EB=A0=AC=ED=99=94=EB=A5=BC=20?= =?UTF-8?q?=EB=AA=85=EC=8B=9C=ED=95=9C=EB=8B=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/calculate/AdminCalculateService.kt | 19 +++---------------- ...GetCalculateContentDonationListResponse.kt | 6 ++++-- .../GetCalculateContentListResponse.kt | 6 ++++-- .../calculate/GetCalculateLiveListResponse.kt | 6 ++++-- 4 files changed, 15 insertions(+), 22 deletions(-) diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/admin/calculate/AdminCalculateService.kt b/src/main/kotlin/kr/co/vividnext/sodalive/admin/calculate/AdminCalculateService.kt index f2f33f15..eb96883c 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/admin/calculate/AdminCalculateService.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/admin/calculate/AdminCalculateService.kt @@ -13,10 +13,6 @@ import java.time.LocalDateTime @Service class AdminCalculateService(private val repository: AdminCalculateQueryRepository) { @Transactional(readOnly = true) - @Cacheable( - cacheNames = ["cache_ttl_3_hours"], - key = "'calculateLive:' + " + "#startDateStr + ':' + #endDateStr + ':' + #offset + ':' + #limit" - ) fun getCalculateLive( startDateStr: String, endDateStr: String, @@ -34,10 +30,6 @@ class AdminCalculateService(private val repository: AdminCalculateQueryRepositor } @Transactional(readOnly = true) - @Cacheable( - cacheNames = ["cache_ttl_3_hours"], - key = "'calculateContent:' + " + "#startDateStr + ':' + #endDateStr + ':' + #offset + ':' + #limit" - ) fun getCalculateContentList( startDateStr: String, endDateStr: String, @@ -69,10 +61,6 @@ class AdminCalculateService(private val repository: AdminCalculateQueryRepositor } @Transactional(readOnly = true) - @Cacheable( - cacheNames = ["cache_ttl_3_hours"], - key = "'calculateContentDonationList2:' + " + "#startDateStr + ':' + #endDateStr + ':' + #offset + ':' + #limit" - ) fun getCalculateContentDonationList( startDateStr: String, endDateStr: String, @@ -90,10 +78,6 @@ class AdminCalculateService(private val repository: AdminCalculateQueryRepositor } @Transactional(readOnly = true) - @Cacheable( - cacheNames = ["cache_ttl_3_hours"], - key = "'calculateCommunityPost:' + " + "#startDateStr + ':' + #endDateStr + ':' + #offset" - ) fun getCalculateCommunityPost( startDateStr: String, endDateStr: String, @@ -111,6 +95,7 @@ class AdminCalculateService(private val repository: AdminCalculateQueryRepositor return GetCreatorCalculateCommunityPostResponse(totalCount, items) } + @Transactional(readOnly = true) fun getCalculateLiveByCreator( startDateStr: String, endDateStr: String, @@ -128,6 +113,7 @@ class AdminCalculateService(private val repository: AdminCalculateQueryRepositor GetCalculateByCreatorResponse(totalCount, items) } + @Transactional(readOnly = true) fun getCalculateContentByCreator( startDateStr: String, endDateStr: String, @@ -145,6 +131,7 @@ class AdminCalculateService(private val repository: AdminCalculateQueryRepositor GetCalculateByCreatorResponse(totalCount, items) } + @Transactional(readOnly = true) fun getCalculateCommunityByCreator( startDateStr: String, endDateStr: String, diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/admin/calculate/GetCalculateContentDonationListResponse.kt b/src/main/kotlin/kr/co/vividnext/sodalive/admin/calculate/GetCalculateContentDonationListResponse.kt index 5346f2b4..51823384 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/admin/calculate/GetCalculateContentDonationListResponse.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/admin/calculate/GetCalculateContentDonationListResponse.kt @@ -1,6 +1,8 @@ package kr.co.vividnext.sodalive.admin.calculate +import com.fasterxml.jackson.annotation.JsonProperty + data class GetCalculateContentDonationListResponse( - val totalCount: Int, - val items: List + @JsonProperty("totalCount") val totalCount: Int, + @JsonProperty("items") val items: List ) diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/admin/calculate/GetCalculateContentListResponse.kt b/src/main/kotlin/kr/co/vividnext/sodalive/admin/calculate/GetCalculateContentListResponse.kt index 70006a12..cfd51378 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/admin/calculate/GetCalculateContentListResponse.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/admin/calculate/GetCalculateContentListResponse.kt @@ -1,6 +1,8 @@ package kr.co.vividnext.sodalive.admin.calculate +import com.fasterxml.jackson.annotation.JsonProperty + data class GetCalculateContentListResponse( - val totalCount: Int, - val items: List + @JsonProperty("totalCount") val totalCount: Int, + @JsonProperty("items") val items: List ) diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/admin/calculate/GetCalculateLiveListResponse.kt b/src/main/kotlin/kr/co/vividnext/sodalive/admin/calculate/GetCalculateLiveListResponse.kt index c0be5284..52d1965b 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/admin/calculate/GetCalculateLiveListResponse.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/admin/calculate/GetCalculateLiveListResponse.kt @@ -1,6 +1,8 @@ package kr.co.vividnext.sodalive.admin.calculate +import com.fasterxml.jackson.annotation.JsonProperty + data class GetCalculateLiveListResponse( - val totalCount: Int, - val items: List + @JsonProperty("totalCount") val totalCount: Int, + @JsonProperty("items") val items: List )