From bb64adc6843e9fc1139e5b91196a9323a0ad1e55 Mon Sep 17 00:00:00 2001 From: Yu Sung Date: Wed, 28 Feb 2024 03:06:00 +0900 Subject: [PATCH] =?UTF-8?q?=EB=A3=B0=EB=A0=9B=20=EC=84=A4=EC=A0=95=20?= =?UTF-8?q?=EB=AC=B8=EA=B5=AC=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Config/RouletteSettingsViewModel.swift | 26 ++++++++++++++----- 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/SodaLive/Sources/Live/Room/Routlette/Config/RouletteSettingsViewModel.swift b/SodaLive/Sources/Live/Room/Routlette/Config/RouletteSettingsViewModel.swift index 277f661..80424ef 100644 --- a/SodaLive/Sources/Live/Room/Routlette/Config/RouletteSettingsViewModel.swift +++ b/SodaLive/Sources/Live/Room/Routlette/Config/RouletteSettingsViewModel.swift @@ -188,9 +188,9 @@ final class RouletteSettingsViewModel: ObservableObject { } if isActive { - successMessage = "\(selectedRouletteTitle)을 활성화 했습니다." + successMessage = "\(selectedRouletteTitle)로 설정하였습니다." } else { - successMessage = "\(selectedRouletteTitle)을 비활성화 했습니다." + successMessage = "\(selectedRouletteTitle)을 설정했습니다." } let request = CreateRouletteRequest(can: can, isActive: isActive, items: items) @@ -259,10 +259,24 @@ final class RouletteSettingsViewModel: ObservableObject { selectedRouletteTitle = "룰렛 1" } + var isAllActive = false + + rouletteList + .filter { + $0.id != selectedRoulette.id + } + .forEach { + if $0.isActive { + isAllActive = true + } + } + if isActive { - successMessage = "\(selectedRouletteTitle)을 활성화 했습니다." + successMessage = "\(selectedRouletteTitle)로 설정하였습니다." + } else if !isAllActive { + successMessage = "\(selectedRouletteTitle)이 비활성화 되었습니다." } else { - successMessage = "\(selectedRouletteTitle)을 비활성화 했습니다." + successMessage = "\(selectedRouletteTitle)을 설정했습니다." } let request = UpdateRouletteRequest(id: rouletteId, can: can, isActive: isActive, items: items) @@ -298,13 +312,13 @@ final class RouletteSettingsViewModel: ObservableObject { func selectRoulette(selectedRoulette: SelectedRoulette) { if rouletteList.isEmpty && (selectedRoulette == .ROULETTE_2 || selectedRoulette == .ROULETTE_3) { - errorMessage = "룰렛 1만 선택 가능" + errorMessage = "룰렛 1을 먼저 설정하세요" isShowErrorPopup = true return } if rouletteList.count == 1 && selectedRoulette == .ROULETTE_3 { - errorMessage = "룰렛 1, 룰렛2만 선택 가능" + errorMessage = "룰렛 1과 룰렛 2를 먼저 설정하세요" isShowErrorPopup = true return }