Merge pull request #281 from boostcampwm-2021/issue/#279

[리뷰 반영] 백그라운드 리뷰 & MapJSONBBusError operator 리뷰 반영
boostcampwm-2021 · Nov 25, 2021 · 45e5821 · 45e5821
2 parents 7bfeacb + fdba7a1
commit 45e5821
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/BBus/BBus/Background/GetOnAlarm/GetOnAlarmController.swift b/BBus/BBus/Background/GetOnAlarm/GetOnAlarmController.swift
@@ -10,7 +10,7 @@ import UIKit
 import Combine
 import CoreLocation
 
-final class GetOnAlarmController: NSObject {
+final class GetOnAlarmController {
 
     static private let alarmIdentifier: String = "GetOnAlarm"
 
@@ -21,7 +21,7 @@ final class GetOnAlarmController: NSObject {
 
     @Published private(set) var viewModel: GetOnAlarmViewModel?
 
-    private override init() {
+    private init() {
         self.cancellables = []
     }
 
@@ -70,14 +70,14 @@ final class GetOnAlarmController: NSObject {
     }
 
     private func bindMessage() {
-        self.viewModel?.$getApproachStatus
+        self.viewModel?.$busApproachStatus
             .sink(receiveValue: { [weak self] status in
                 guard let status = status,
                       let message = self?.viewModel?.message else { return }
                 if status == .oneStationLeft {
                     self?.stop()
                 }
-                self?.pushGetOnAlarm(title: "승차 알람" ,message: message)
+                self?.pushGetOnAlarm(title: "승차 알람", message: message)
             })
             .store(in: &self.cancellables)
     }

diff --git a/BBus/BBus/Background/GetOnAlarm/ViewModel/GetOnAlarmViewModel.swift b/BBus/BBus/Background/GetOnAlarm/ViewModel/GetOnAlarmViewModel.swift
@@ -13,7 +13,7 @@ final class GetOnAlarmViewModel {
     let usecase: GetOnAlarmUsecase
     private(set) var getOnAlarmStatus: GetOnAlarmStatus
     private var cancellables: Set<AnyCancellable>
-    @Published private(set) var getApproachStatus: BusApproachStatus?
+    @Published private(set) var busApproachStatus: BusApproachStatus?
     private(set) var message: String?
     @Published private(set) var networkErrorMessage: (title: String, body: String)?
 
@@ -23,7 +23,7 @@ final class GetOnAlarmViewModel {
         self.message = nil
         self.networkErrorMessage = nil
         self.cancellables = []
-        self.getApproachStatus = nil
+        self.busApproachStatus = nil
         self.execute()
         self.configureObserver()
     }
@@ -51,7 +51,7 @@ final class GetOnAlarmViewModel {
                                                                   beforeOrd: self.getOnAlarmStatus.currentBusOrd ?? stationOrd,
                                                                   targetOrd: self.getOnAlarmStatus.targetOrd) {
                     self.makeMessage(with: status)
-                    self.getApproachStatus = status
+                    self.busApproachStatus = status
                 }
                 self.getOnAlarmStatus = self.getOnAlarmStatus.withCurrentBusOrd(stationOrd)
             }