From 1a68746a7c6ef75fa4dede78803562c620d4652a Mon Sep 17 00:00:00 2001 From: Klaus Date: Thu, 7 Dec 2023 10:52:37 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=EB=A3=B0=EB=A0=9B=20=EC=84=A4=EC=A0=95=20?= =?UTF-8?q?=EA=B0=80=EC=A0=B8=EC=98=A4=EA=B8=B0=20API=20-=20=EC=84=A4?= =?UTF-8?q?=EC=A0=95=EB=90=9C=20=EC=A0=81=EC=9D=B4=20=EC=97=86=EC=9D=84=20?= =?UTF-8?q?=EB=95=8C=20=EA=B8=B0=EB=B3=B8=20=EC=BA=94=20=EC=84=A4=EC=A0=95?= =?UTF-8?q?=205=20->=200=EC=9C=BC=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kr/co/vividnext/sodalive/live/roulette/RouletteService.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/RouletteService.kt b/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/RouletteService.kt index f45059a..f967b4e 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/RouletteService.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/RouletteService.kt @@ -71,7 +71,7 @@ class RouletteService( } return GetRouletteResponse( - can = roulette?.can ?: 5, + can = roulette?.can ?: 0, isActive = roulette?.isActive ?: false, items = roulette?.items ?: listOf() ) From 63f690ee2d1e229c49cfa99ebfddea385ff4d4bf Mon Sep 17 00:00:00 2001 From: Klaus Date: Sun, 10 Dec 2023 15:40:44 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=EB=9D=BC=EC=9D=B4=EB=B8=8C=20=EC=A0=95?= =?UTF-8?q?=EC=82=B0=20-=20=EA=B5=AC=EB=B6=84=EC=97=90=20=EB=A3=B0?= =?UTF-8?q?=EB=A0=9B=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/calculate/AdminCalculateService.kt | 16 ++++++++++++---- .../calculate/CreatorAdminCalculateService.kt | 16 ++++++++++++---- 2 files changed, 24 insertions(+), 8 deletions(-) diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/admin/calculate/AdminCalculateService.kt b/src/main/kotlin/kr/co/vividnext/sodalive/admin/calculate/AdminCalculateService.kt index 649575e..8b1bd4c 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/admin/calculate/AdminCalculateService.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/admin/calculate/AdminCalculateService.kt @@ -33,10 +33,18 @@ class AdminCalculateService(private val repository: AdminCalculateQueryRepositor .getCalculateLive(startDate, endDate) .asSequence() .map { - val canUsageStr = if (it.canUsage == CanUsage.LIVE) { - "유료" - } else { - "후원" + val canUsageStr = when (it.canUsage) { + CanUsage.LIVE -> { + "유료" + } + + CanUsage.SPIN_ROULETTE -> { + "룰렛" + } + + else -> { + "후원" + } } val numberOfPeople = if (it.canUsage == CanUsage.LIVE) { diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/creator/admin/calculate/CreatorAdminCalculateService.kt b/src/main/kotlin/kr/co/vividnext/sodalive/creator/admin/calculate/CreatorAdminCalculateService.kt index 62645f1..46901ec 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/creator/admin/calculate/CreatorAdminCalculateService.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/creator/admin/calculate/CreatorAdminCalculateService.kt @@ -39,10 +39,18 @@ class CreatorAdminCalculateService(private val repository: CreatorAdminCalculate .getCalculateLive(startDate, endDate, member.id!!) .asSequence() .map { - val canUsageStr = if (it.canUsage == CanUsage.LIVE) { - "유료" - } else { - "후원" + val canUsageStr = when (it.canUsage) { + CanUsage.LIVE -> { + "유료" + } + + CanUsage.SPIN_ROULETTE -> { + "룰렛" + } + + else -> { + "후원" + } } val numberOfPeople = if (it.canUsage == CanUsage.LIVE) {