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

@@ -56,7 +56,6 @@ interface LiveRoomQueryRepository {
     fun getRoomActiveAndChannelNameIsNotNull(memberId: Long): List<LiveRoom>
     fun getActiveRoomIdList(memberId: Long): Int
     fun getTotalHeartCount(roomId: Long): Int?
-    fun getLiveRoomCreatorId(roomId: Long): Long?
 }
 
 class LiveRoomQueryRepositoryImpl(
@@ -335,15 +334,4 @@ class LiveRoomQueryRepositoryImpl(
             .where(where)
             .fetchOne()
     }
-
-    override fun getLiveRoomCreatorId(roomId: Long): Long? {
-        return queryFactory
-            .select(liveRoom.member.id)
-            .from(liveRoom)
-            .where(
-                liveRoom.isActive.isTrue
-                    .and(liveRoom.id.eq(roomId))
-            )
-            .fetchFirst()
-    }
 }

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

@@ -885,18 +885,10 @@ class LiveRoomService(
     }
 
     fun getDonationMessageList(roomId: Long, member: Member): List<LiveRoomDonationMessage> {
-        val liveRoomCreatorId = repository.getLiveRoomCreatorId(roomId)
-            ?: throw SodaException("해당하는 라이브의 정보가 없습니다.")
-
         val roomInfo = roomInfoRepository.findByIdOrNull(roomId)
             ?: throw SodaException("해당하는 라이브의 정보가 없습니다.")
 
-        return if (liveRoomCreatorId != member.id!!) {
+        return roomInfo.donationMessageList
-            roomInfo.donationMessageList
-                .filter { !it.isSecret || it.memberId == member.id!! }
-        } else {
-            roomInfo.donationMessageList
-        }
     }
 
     fun deleteDonationMessage(request: DeleteLiveRoomDonationMessage, member: Member) {
@@ -1076,16 +1068,14 @@ class LiveRoomService(
             container = request.container
         )
 
-        if (request.message.isNotBlank()) {
+        if (!request.isSecret && request.message.isNotBlank()) {
             val lock = getOrCreateLock(memberId = member.id!!)
             lock.write {
                 val roomInfo = roomInfoRepository.findByIdOrNull(room.id!!)
                     ?: throw SodaException("해당하는 라이브의 정보가 없습니다.")
 
                 roomInfo.addDonationMessage(
-                    memberId = member.id!!,
                     nickname = member.nickname,
-                    isSecret = request.isSecret,
                     can = request.can,
                     donationMessage = request.message
                 )
@@ -1122,16 +1112,14 @@ class LiveRoomService(
             container = request.container
         )
 
-        if (request.message.isNotBlank()) {
+        if (!request.isSecret && request.message.isNotBlank()) {
             val lock = getOrCreateLock(memberId = member.id!!)
             lock.write {
                 val roomInfo = roomInfoRepository.findByIdOrNull(room.id!!)
                     ?: throw SodaException("해당하는 라이브의 정보가 없습니다.")
 
                 roomInfo.addDonationMessage(
-                    memberId = member.id!!,
                     nickname = member.nickname,
-                    isSecret = request.isSecret,
                     can = request.can,
                     donationMessage = request.message
                 )

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

@@ -4,9 +4,7 @@ import java.util.UUID
 
 data class LiveRoomDonationMessage(
     val uuid: String = UUID.randomUUID().toString(),
-    val memberId: Long,
     val nickname: String,
-    val isSecret: Boolean,
     val canMessage: String,
     val donationMessage: String
 )

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

@@ -83,13 +83,11 @@ data class LiveRoomInfo(
         managerCount = managerList.size
     }
 
-    fun addDonationMessage(memberId: Long, nickname: String, isSecret: Boolean, can: Int, donationMessage: String) {
+    fun addDonationMessage(nickname: String, can: Int, donationMessage: String) {
         val donationMessageSet = donationMessageList.toMutableSet()
         donationMessageSet.add(
             LiveRoomDonationMessage(
-                memberId = memberId,
                 nickname = nickname,
-                isSecret = isSecret,
                 canMessage = "${can}캔을 후원하셨습니다.",
                 donationMessage = donationMessage
             )
@@ -97,13 +95,11 @@ data class LiveRoomInfo(
         donationMessageList = donationMessageSet.toList()
     }
 
-    fun addRouletteMessage(memberId: Long, nickname: String, donationMessage: String) {
+    fun addRouletteMessage(nickname: String, donationMessage: String) {
         val donationMessageSet = donationMessageList.toMutableSet()
         donationMessageSet.add(
             LiveRoomDonationMessage(
-                memberId = memberId,
                 nickname = nickname,
-                isSecret = false,
                 canMessage = "",
                 donationMessage = donationMessage
             )

src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/v2/RouletteService.kt

@@ -162,7 +162,6 @@ class RouletteService(
                 ?: throw SodaException("해당하는 라이브의 정보가 없습니다.")
 
             roomInfo.addRouletteMessage(
-                memberId = member.id!!,
                 nickname = member.nickname,
                 donationMessage = "[$result] 당첨!"
             )