전체 콘텐츠 리스트

- 카테고리를 지정하지 않을 때 조회되지 않는 버그 수정

src/main/kotlin/kr/co/vividnext/sodalive/admin/calculate/AdminCalculateQueryRepository.kt

@@ -65,6 +65,7 @@ class AdminCalculateQueryRepository(private val queryFactory: JPAQueryFactory) {
             .where(
                 order.createdAt.goe(startDate)
                     .and(order.createdAt.loe(endDate))
+                    .and(order.isActive.isTrue)
             )
             .groupBy(audioContent.id, order.type, orderFormattedDate, order.can)
             .orderBy(member.id.desc(), orderFormattedDate.desc(), audioContent.id.asc())

src/main/kotlin/kr/co/vividnext/sodalive/content/AudioContentController.kt

@@ -105,7 +105,7 @@ class AudioContentController(private val service: AudioContentService) {
     fun getAudioContentList(
         @RequestParam("creator-id") creatorId: Long,
         @RequestParam("sort-type", required = false) sortType: SortType = SortType.NEWEST,
-        @RequestParam("category-id", required = false) categoryId: Long = 0,
+        @RequestParam("category-id", required = false) categoryId: Long? = 0,
         @AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member?,
         pageable: Pageable
     ) = run {
@@ -115,7 +115,7 @@ class AudioContentController(private val service: AudioContentService) {
             service.getAudioContentList(
                 creatorId = creatorId,
                 sortType = sortType,
-                categoryId = categoryId,
+                categoryId = categoryId ?: 0,
                 member = member,
                 offset = pageable.offset,
                 limit = pageable.pageSize.toLong()

src/main/kotlin/kr/co/vividnext/sodalive/creator/admin/calculate/CreatorAdminCalculateQueryRepository.kt

@@ -116,16 +116,14 @@ class CreatorAdminCalculateQueryRepository(private val queryFactory: JPAQueryFac
                     order.can.sum()
                 )
             )
-            .from(useCanCalculate)
-            .innerJoin(useCanCalculate.useCan, useCan)
-            .innerJoin(useCan.order, order)
+            .from(order)
             .innerJoin(order.audioContent, audioContent)
             .innerJoin(audioContent.member, member)
             .where(
-                useCanCalculate.status.eq(UseCanCalculateStatus.RECEIVED)
-                    .and(useCanCalculate.recipientCreatorId.eq(memberId))
-                    .and(order.createdAt.goe(startDate))
+                order.createdAt.goe(startDate)
                     .and(order.createdAt.loe(endDate))
+                    .and(order.isActive.isTrue)
+                    .and(order.creator.id.eq(memberId))
             )
             .groupBy(audioContent.id, order.type, orderFormattedDate, order.can)
             .offset(offset)