diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/admin/chat/character/curation/CharacterCurationAdminDto.kt b/src/main/kotlin/kr/co/vividnext/sodalive/admin/chat/character/curation/CharacterCurationAdminDto.kt index 6266ebd..a5d6a58 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/admin/chat/character/curation/CharacterCurationAdminDto.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/admin/chat/character/curation/CharacterCurationAdminDto.kt @@ -29,7 +29,8 @@ data class CharacterCurationListItemResponse( val id: Long, val title: String, val isAdult: Boolean, - val isActive: Boolean + val isActive: Boolean, + val characterCount: Int ) // 관리자 큐레이션 상세 - 캐릭터 리스트 항목 응답 DTO diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/admin/chat/character/curation/CharacterCurationAdminService.kt b/src/main/kotlin/kr/co/vividnext/sodalive/admin/chat/character/curation/CharacterCurationAdminService.kt index df5e6d0..77da8f6 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/admin/chat/character/curation/CharacterCurationAdminService.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/admin/chat/character/curation/CharacterCurationAdminService.kt @@ -125,8 +125,22 @@ class CharacterCurationAdminService( @Transactional(readOnly = true) fun listAll(): List { - return curationRepository.findAllByOrderBySortOrderAsc() - .map { CharacterCurationListItemResponse(it.id!!, it.title, it.isAdult, it.isActive) } + val curations = curationRepository.findByIsActiveTrueOrderBySortOrderAsc() + if (curations.isEmpty()) return emptyList() + + // DB 집계로 활성 캐릭터 수 카운트 + val counts = mappingRepository.countActiveCharactersByCurations(curations) + val countByCurationId: Map = counts.associate { it.curationId to it.count.toInt() } + + return curations.map { curation -> + CharacterCurationListItemResponse( + id = curation.id!!, + title = curation.title, + isAdult = curation.isAdult, + isActive = curation.isActive, + characterCount = countByCurationId[curation.id!!] ?: 0 + ) + } } @Transactional(readOnly = true) diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/chat/character/curation/repository/CharacterCurationMappingRepository.kt b/src/main/kotlin/kr/co/vividnext/sodalive/chat/character/curation/repository/CharacterCurationMappingRepository.kt index db42281..0f4a027 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/chat/character/curation/repository/CharacterCurationMappingRepository.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/chat/character/curation/repository/CharacterCurationMappingRepository.kt @@ -30,4 +30,19 @@ interface CharacterCurationMappingRepository : JpaRepository + + interface CharacterCountPerCuration { + val curationId: Long + val count: Long + } + + @Query( + "select m.curation.id as curationId, count(m.id) as count " + + "from CharacterCurationMapping m join m.chatCharacter ch " + + "where m.curation in :curations and ch.isActive = true " + + "group by m.curation.id" + ) + fun countActiveCharactersByCurations( + @Param("curations") curations: List + ): List } diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/chat/character/curation/repository/CharacterCurationRepository.kt b/src/main/kotlin/kr/co/vividnext/sodalive/chat/character/curation/repository/CharacterCurationRepository.kt index ed658d1..a8d71f0 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/chat/character/curation/repository/CharacterCurationRepository.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/chat/character/curation/repository/CharacterCurationRepository.kt @@ -8,7 +8,6 @@ import org.springframework.stereotype.Repository @Repository interface CharacterCurationRepository : JpaRepository { fun findByIsActiveTrueOrderBySortOrderAsc(): List - fun findAllByOrderBySortOrderAsc(): List @Query("SELECT MAX(c.sortOrder) FROM CharacterCuration c WHERE c.isActive = true") fun findMaxSortOrder(): Int?