Merge pull request 'test' (#41) from test into main

Reviewed-on: #41

src/main/kotlin/kr/co/vividnext/sodalive/explorer/ExplorerQueryRepository.kt

@@ -628,4 +628,12 @@ class ExplorerQueryRepository(
             )
             .fetchFirst()
     }
+
+    fun getVisibleDonationRank(creatorId: Long): Boolean {
+        return queryFactory
+            .select(member.isVisibleDonationRank)
+            .from(member)
+            .where(member.id.eq(creatorId))
+            .fetchFirst()
+    }
 }

src/main/kotlin/kr/co/vividnext/sodalive/explorer/ExplorerService.kt

@@ -178,11 +178,15 @@ class ExplorerService(
         val notificationRecipientCount = notificationUserIds.size
 
         // 후원랭킹
-        val memberDonationRanking = queryRepository.getMemberDonationRanking(
+        val memberDonationRanking = if (creatorId == member.id!! || creatorAccount.isVisibleDonationRank) {
-            creatorId,
+            queryRepository.getMemberDonationRanking(
-            10,
+                creatorId,
-            withDonationCan = creatorId == member.id!!
+                10,
-        )
+                withDonationCan = creatorId == member.id!!
+            )
+        } else {
+            listOf()
+        }
 
         // 추천 크리에이터
         val similarCreatorList = queryRepository.getSimilarCreatorList(creatorId)
@@ -290,6 +294,11 @@ class ExplorerService(
             } else {
                 0
             },
+            isVisibleDonationRank = if (creatorId == member.id!!) {
+                queryRepository.getVisibleDonationRank(creatorId)
+            } else {
+                false
+            },
             totalCount = queryRepository.getMemberDonationRankingTotal(creatorId),
             userDonationRanking = queryRepository.getMemberDonationRanking(
                 creatorId,

src/main/kotlin/kr/co/vividnext/sodalive/explorer/MemberDonationRankingResponse.kt

@@ -4,6 +4,7 @@ data class GetDonationAllResponse(
     val accumulatedCansToday: Int,
     val accumulatedCansLastWeek: Int,
     val accumulatedCansThisMonth: Int,
+    val isVisibleDonationRank: Boolean,
     val totalCount: Int,
     val userDonationRanking: List<MemberDonationRankingResponse>
 )

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

@@ -653,15 +653,19 @@ class LiveRoomService(
             .getNotificationUserIds(room.member!!.id!!)
             .contains(member.id)
 
-        val donationRankingTop3UserIds = explorerQueryRepository
+        val donationRankingTop3UserIds = if (room.member!!.isVisibleDonationRank) {
-            .getMemberDonationRanking(
+            explorerQueryRepository
-                room.member!!.id!!,
+                .getMemberDonationRanking(
-                3,
+                    room.member!!.id!!,
-                withDonationCan = false
+                    3,
-            )
+                    withDonationCan = false
-            .asSequence()
+                )
-            .map { it.userId }
+                .asSequence()
-            .toList()
+                .map { it.userId }
+                .toList()
+        } else {
+            listOf()
+        }
 
         return GetRoomInfoResponse(
             roomId = roomId,

src/main/kotlin/kr/co/vividnext/sodalive/member/Member.kt

@@ -28,6 +28,8 @@ data class Member(
     @Enumerated(value = EnumType.STRING)
     var role: MemberRole = MemberRole.USER,
 
+    var isVisibleDonationRank: Boolean = true,
+
     var isActive: Boolean = true,
 
     var container: String = "web"

src/main/kotlin/kr/co/vividnext/sodalive/member/MemberService.kt

@@ -547,6 +547,10 @@ class MemberService(
             member.blogUrl = profileUpdateRequest.blogUrl
         }
 
+        if (profileUpdateRequest.isVisibleDonationRank != null) {
+            member.isVisibleDonationRank = profileUpdateRequest.isVisibleDonationRank
+        }
+
         return ProfileResponse(member, cloudFrontHost, profileUpdateRequest.container)
     }
 

src/main/kotlin/kr/co/vividnext/sodalive/member/ProfileUpdateRequest.kt

@@ -13,5 +13,6 @@ data class ProfileUpdateRequest(
     val instagramUrl: String? = null,
     val websiteUrl: String? = null,
     val blogUrl: String? = null,
+    val isVisibleDonationRank: Boolean? = null,
     val container: String
 )