From 72f49f2471fd0a302c041b86117a4ba7381c2484 Mon Sep 17 00:00:00 2001 From: Klaus Date: Tue, 21 Apr 2026 19:16:09 +0900 Subject: [PATCH] =?UTF-8?q?refactor(original-series-calculate):=20?= =?UTF-8?q?=EC=86=8C=EC=A7=80=20=EC=9C=A0=EC=A0=80=20=EC=9D=91=EB=8B=B5=20?= =?UTF-8?q?=EC=8B=9D=EB=B3=84=EC=9E=90=EB=A5=BC=20creatorId=EB=A1=9C=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD=ED=95=9C=EB=8B=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AdminOriginalSeriesCalculateQueryRepository.kt | 12 ++++++------ .../GetAdminOriginalSeriesOwnerResponse.kt | 2 +- ...dminOriginalSeriesCalculateQueryRepositoryTest.kt | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/admin/calculate/originalSeries/AdminOriginalSeriesCalculateQueryRepository.kt b/src/main/kotlin/kr/co/vividnext/sodalive/admin/calculate/originalSeries/AdminOriginalSeriesCalculateQueryRepository.kt index 9dd09739..7fd8b630 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/admin/calculate/originalSeries/AdminOriginalSeriesCalculateQueryRepository.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/admin/calculate/originalSeries/AdminOriginalSeriesCalculateQueryRepository.kt @@ -37,7 +37,7 @@ class AdminOriginalSeriesCalculateQueryRepository( fun getSettlementDetailTotalCount( startDate: LocalDateTime, endDate: LocalDateTime, - memberId: Long + creatorId: Long ): Int { return queryFactory .select(audioContent.id) @@ -46,7 +46,7 @@ class AdminOriginalSeriesCalculateQueryRepository( .innerJoin(seriesContent).on(seriesContent.content.id.eq(audioContent.id)) .innerJoin(seriesContent.series, series) .innerJoin(series.member, member) - .where(baseWhereCondition(startDate, endDate, memberId)) + .where(baseWhereCondition(startDate, endDate, creatorId)) .groupBy( series.id, series.title, @@ -62,7 +62,7 @@ class AdminOriginalSeriesCalculateQueryRepository( fun getSettlementDetails( startDate: LocalDateTime, endDate: LocalDateTime, - memberId: Long, + creatorId: Long, offset: Long, limit: Long ): List { @@ -83,7 +83,7 @@ class AdminOriginalSeriesCalculateQueryRepository( .innerJoin(seriesContent).on(seriesContent.content.id.eq(audioContent.id)) .innerJoin(seriesContent.series, series) .innerJoin(series.member, member) - .where(baseWhereCondition(startDate, endDate, memberId)) + .where(baseWhereCondition(startDate, endDate, creatorId)) .groupBy( series.id, series.title, @@ -101,12 +101,12 @@ class AdminOriginalSeriesCalculateQueryRepository( private fun baseWhereCondition( startDate: LocalDateTime, endDate: LocalDateTime, - memberId: Long + creatorId: Long ): BooleanExpression { return series.isOriginal.isTrue .and(series.isActive.isTrue) .and(member.isActive.isTrue) - .and(member.id.eq(memberId)) + .and(member.id.eq(creatorId)) .and(order.isActive.isTrue) .and(order.createdAt.goe(startDate)) .and(order.createdAt.loe(endDate)) diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/admin/calculate/originalSeries/GetAdminOriginalSeriesOwnerResponse.kt b/src/main/kotlin/kr/co/vividnext/sodalive/admin/calculate/originalSeries/GetAdminOriginalSeriesOwnerResponse.kt index 5d7f2d60..ef90db94 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/admin/calculate/originalSeries/GetAdminOriginalSeriesOwnerResponse.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/admin/calculate/originalSeries/GetAdminOriginalSeriesOwnerResponse.kt @@ -4,6 +4,6 @@ import com.fasterxml.jackson.annotation.JsonProperty import com.querydsl.core.annotations.QueryProjection data class GetAdminOriginalSeriesOwnerResponse @QueryProjection constructor( - @JsonProperty("memberId") val memberId: Long, + @JsonProperty("creatorId") val creatorId: Long, @JsonProperty("nickname") val nickname: String ) diff --git a/src/test/kotlin/kr/co/vividnext/sodalive/admin/calculate/originalSeries/AdminOriginalSeriesCalculateQueryRepositoryTest.kt b/src/test/kotlin/kr/co/vividnext/sodalive/admin/calculate/originalSeries/AdminOriginalSeriesCalculateQueryRepositoryTest.kt index e0aeb12c..8cb015dd 100644 --- a/src/test/kotlin/kr/co/vividnext/sodalive/admin/calculate/originalSeries/AdminOriginalSeriesCalculateQueryRepositoryTest.kt +++ b/src/test/kotlin/kr/co/vividnext/sodalive/admin/calculate/originalSeries/AdminOriginalSeriesCalculateQueryRepositoryTest.kt @@ -54,8 +54,8 @@ class AdminOriginalSeriesCalculateQueryRepositoryTest @Autowired constructor( val result = repository.getOriginalSeriesOwners() assertEquals(2, result.size) - assertEquals(ownerA.id, result[0].memberId) - assertEquals(ownerB.id, result[1].memberId) + assertEquals(ownerA.id, result[0].creatorId) + assertEquals(ownerB.id, result[1].creatorId) } @Test