src/main/kotlin/kr/co/vividnext/sodalive/live/room/LiveRoomRepository.kt

@@ -2,7 +2,6 @@ package kr.co.vividnext.sodalive.live.room
 
 import com.querydsl.core.types.Projections
 import com.querydsl.core.types.dsl.CaseBuilder
-import com.querydsl.core.types.dsl.Expressions
 import com.querydsl.jpa.impl.JPAQueryFactory
 import kr.co.vividnext.sodalive.can.use.CanUsage
 import kr.co.vividnext.sodalive.can.use.QUseCan.useCan
@@ -50,7 +49,7 @@ interface LiveRoomQueryRepository {
     fun getLiveRoom(id: Long): LiveRoom?
     fun getLiveRoomAndAccountId(roomId: Long, memberId: Long): LiveRoom?
     fun getRecentRoomInfo(memberId: Long): GetRecentRoomInfoResponse?
-    fun getDonationTotal(roomId: Long): Int?
+    fun getDonationTotal(roomId: Long, isLiveCreator: Boolean): Int?
     fun getDonationList(roomId: Long, isLiveCreator: Boolean): List<GetLiveRoomDonationItem>
     fun getRoomActiveAndChannelNameIsNotNull(memberId: Long): List<LiveRoom>
     fun getActiveRoomIdList(memberId: Long): Int
@@ -228,11 +227,14 @@ class LiveRoomQueryRepositoryImpl(
             .fetchFirst()
     }
 
-    override fun getDonationTotal(roomId: Long): Int? {
-        val where = liveRoom.id.eq(roomId)
+    override fun getDonationTotal(roomId: Long, isLiveCreator: Boolean): Int? {
+        var where = liveRoom.id.eq(roomId)
             .and(useCan.canUsage.eq(CanUsage.DONATION).or(useCan.canUsage.eq(CanUsage.SPIN_ROULETTE)))
             .and(useCan.isRefund.isFalse)
-            .and(useCan.isSecret.isFalse)
+
+        if (!isLiveCreator) {
+            where = where.and(useCan.isSecret.isFalse)
+        }
 
         return queryFactory
             .select(useCanCalculate.can.sum())
@@ -244,10 +246,14 @@ class LiveRoomQueryRepositoryImpl(
     }
 
     override fun getDonationList(roomId: Long, isLiveCreator: Boolean): List<GetLiveRoomDonationItem> {
-        val where = liveRoom.id.eq(roomId)
+        var where = liveRoom.id.eq(roomId)
             .and(useCan.canUsage.eq(CanUsage.DONATION).or(useCan.canUsage.eq(CanUsage.SPIN_ROULETTE)))
             .and(useCan.isRefund.isFalse)
 
+        if (!isLiveCreator) {
+            where = where.and(useCan.isSecret.isFalse)
+        }
+
         return queryFactory
             .select(
                 QGetLiveRoomDonationItem(
@@ -257,31 +263,13 @@ class LiveRoomQueryRepositoryImpl(
                         .prepend(cloudFrontHost),
                     member.nickname,
                     member.id.coalesce(0),
-                    Expressions.asNumber(
-                        CaseBuilder()
-                            .`when`(useCan.isSecret.isFalse)
-                            .then(useCan.can.add(useCan.rewardCan))
-                            .otherwise(0)
-                    ).sum(),
-                    Expressions.asNumber(
-                        CaseBuilder()
-                            .`when`(Expressions.asBoolean(isLiveCreator).isTrue)
-                            .then(
-                                Expressions.asNumber(
-                                    CaseBuilder()
-                                        .`when`(useCan.isSecret.isTrue)
-                                        .then(useCan.can.add(useCan.rewardCan))
-                                        .otherwise(0)
-                                ).sum()
-                            )
-                            .otherwise(0)
-                    )
+                    useCan.can.sum().add(useCan.rewardCan.sum())
                 )
             )
             .from(useCan)
             .innerJoin(useCan.room, liveRoom)
             .join(useCan.member, member)
-            .groupBy(useCan.member.id)
+            .groupBy(useCan.member)
             .where(where)
             .orderBy(useCan.can.sum().add(useCan.rewardCan.sum()).desc())
             .fetch()

src/main/kotlin/kr/co/vividnext/sodalive/live/room/LiveRoomService.kt

@@ -973,8 +973,11 @@ class LiveRoomService(
     }
 
     fun getDonationTotal(roomId: Long, memberId: Long): GetLiveRoomDonationTotalResponse {
+        val room = repository.getLiveRoom(roomId)
+            ?: return GetLiveRoomDonationTotalResponse(0)
+        val isLiveCreator = room.member!!.id == memberId
         return GetLiveRoomDonationTotalResponse(
-            totalDonationCan = repository.getDonationTotal(roomId = roomId) ?: 0
+            totalDonationCan = repository.getDonationTotal(roomId = roomId, isLiveCreator = isLiveCreator) ?: 0
         )
     }
 
@@ -1177,15 +1180,12 @@ class LiveRoomService(
         val room = repository.getLiveRoom(roomId) ?: throw SodaException("잘못된 요청입니다.")
         val isLiveCreator = room.member!!.id == memberId
         val donationList = repository.getDonationList(roomId = room.id!!, isLiveCreator = isLiveCreator)
-            .filter { it.secretCan > 0 || it.can > 0 }
         val totalCan = donationList.sumOf { it.can }
-        val totalSecretCan = donationList.sumOf { it.secretCan }
 
         return GetLiveRoomDonationStatusResponse(
             donationList = donationList,
             totalCount = donationList.size,
-            totalCan = totalCan,
-            totalSecretCan = totalSecretCan
+            totalCan = totalCan
         )
     }
 

src/main/kotlin/kr/co/vividnext/sodalive/live/room/donation/GetLiveRoomDonationStatusResponse.kt

@@ -5,14 +5,12 @@ import com.querydsl.core.annotations.QueryProjection
 data class GetLiveRoomDonationStatusResponse(
     val donationList: List<GetLiveRoomDonationItem>,
     val totalCount: Int,
-    val totalCan: Int,
-    val totalSecretCan: Int
+    val totalCan: Int
 )
 
 data class GetLiveRoomDonationItem @QueryProjection constructor(
     val profileImage: String,
     val nickname: String,
     val userId: Long,
-    val can: Int,
-    val secretCan: Int
+    val can: Int
 )