refactor(original-series-calculate): 소지 유저 응답 식별자를 creatorId로 변경한다
This commit is contained in:
@@ -37,7 +37,7 @@ class AdminOriginalSeriesCalculateQueryRepository(
|
|||||||
fun getSettlementDetailTotalCount(
|
fun getSettlementDetailTotalCount(
|
||||||
startDate: LocalDateTime,
|
startDate: LocalDateTime,
|
||||||
endDate: LocalDateTime,
|
endDate: LocalDateTime,
|
||||||
memberId: Long
|
creatorId: Long
|
||||||
): Int {
|
): Int {
|
||||||
return queryFactory
|
return queryFactory
|
||||||
.select(audioContent.id)
|
.select(audioContent.id)
|
||||||
@@ -46,7 +46,7 @@ class AdminOriginalSeriesCalculateQueryRepository(
|
|||||||
.innerJoin(seriesContent).on(seriesContent.content.id.eq(audioContent.id))
|
.innerJoin(seriesContent).on(seriesContent.content.id.eq(audioContent.id))
|
||||||
.innerJoin(seriesContent.series, series)
|
.innerJoin(seriesContent.series, series)
|
||||||
.innerJoin(series.member, member)
|
.innerJoin(series.member, member)
|
||||||
.where(baseWhereCondition(startDate, endDate, memberId))
|
.where(baseWhereCondition(startDate, endDate, creatorId))
|
||||||
.groupBy(
|
.groupBy(
|
||||||
series.id,
|
series.id,
|
||||||
series.title,
|
series.title,
|
||||||
@@ -62,7 +62,7 @@ class AdminOriginalSeriesCalculateQueryRepository(
|
|||||||
fun getSettlementDetails(
|
fun getSettlementDetails(
|
||||||
startDate: LocalDateTime,
|
startDate: LocalDateTime,
|
||||||
endDate: LocalDateTime,
|
endDate: LocalDateTime,
|
||||||
memberId: Long,
|
creatorId: Long,
|
||||||
offset: Long,
|
offset: Long,
|
||||||
limit: Long
|
limit: Long
|
||||||
): List<GetAdminOriginalSeriesSettlementDetailQueryData> {
|
): List<GetAdminOriginalSeriesSettlementDetailQueryData> {
|
||||||
@@ -83,7 +83,7 @@ class AdminOriginalSeriesCalculateQueryRepository(
|
|||||||
.innerJoin(seriesContent).on(seriesContent.content.id.eq(audioContent.id))
|
.innerJoin(seriesContent).on(seriesContent.content.id.eq(audioContent.id))
|
||||||
.innerJoin(seriesContent.series, series)
|
.innerJoin(seriesContent.series, series)
|
||||||
.innerJoin(series.member, member)
|
.innerJoin(series.member, member)
|
||||||
.where(baseWhereCondition(startDate, endDate, memberId))
|
.where(baseWhereCondition(startDate, endDate, creatorId))
|
||||||
.groupBy(
|
.groupBy(
|
||||||
series.id,
|
series.id,
|
||||||
series.title,
|
series.title,
|
||||||
@@ -101,12 +101,12 @@ class AdminOriginalSeriesCalculateQueryRepository(
|
|||||||
private fun baseWhereCondition(
|
private fun baseWhereCondition(
|
||||||
startDate: LocalDateTime,
|
startDate: LocalDateTime,
|
||||||
endDate: LocalDateTime,
|
endDate: LocalDateTime,
|
||||||
memberId: Long
|
creatorId: Long
|
||||||
): BooleanExpression {
|
): BooleanExpression {
|
||||||
return series.isOriginal.isTrue
|
return series.isOriginal.isTrue
|
||||||
.and(series.isActive.isTrue)
|
.and(series.isActive.isTrue)
|
||||||
.and(member.isActive.isTrue)
|
.and(member.isActive.isTrue)
|
||||||
.and(member.id.eq(memberId))
|
.and(member.id.eq(creatorId))
|
||||||
.and(order.isActive.isTrue)
|
.and(order.isActive.isTrue)
|
||||||
.and(order.createdAt.goe(startDate))
|
.and(order.createdAt.goe(startDate))
|
||||||
.and(order.createdAt.loe(endDate))
|
.and(order.createdAt.loe(endDate))
|
||||||
|
|||||||
@@ -4,6 +4,6 @@ import com.fasterxml.jackson.annotation.JsonProperty
|
|||||||
import com.querydsl.core.annotations.QueryProjection
|
import com.querydsl.core.annotations.QueryProjection
|
||||||
|
|
||||||
data class GetAdminOriginalSeriesOwnerResponse @QueryProjection constructor(
|
data class GetAdminOriginalSeriesOwnerResponse @QueryProjection constructor(
|
||||||
@JsonProperty("memberId") val memberId: Long,
|
@JsonProperty("creatorId") val creatorId: Long,
|
||||||
@JsonProperty("nickname") val nickname: String
|
@JsonProperty("nickname") val nickname: String
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -54,8 +54,8 @@ class AdminOriginalSeriesCalculateQueryRepositoryTest @Autowired constructor(
|
|||||||
val result = repository.getOriginalSeriesOwners()
|
val result = repository.getOriginalSeriesOwners()
|
||||||
|
|
||||||
assertEquals(2, result.size)
|
assertEquals(2, result.size)
|
||||||
assertEquals(ownerA.id, result[0].memberId)
|
assertEquals(ownerA.id, result[0].creatorId)
|
||||||
assertEquals(ownerB.id, result[1].memberId)
|
assertEquals(ownerB.id, result[1].creatorId)
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
|
|||||||
Reference in New Issue
Block a user