Merge pull request #156 from EAT-SSU/refactor/#61

[#61] enum 값을 통한 식당 관리 및 방학여부 확인하여 isVacation 적용
EAT-SSU · Nov 9, 2024 · 64ef13c · 64ef13c
2 parents 1e6b25a + dffb1c4
commit 64ef13c
Show file tree

Hide file tree

Showing 4 changed files with 74 additions and 15 deletions.
diff --git a/EATSSU_MVC/EATSSU_MVC/Sources/Data/Firebase/FirebaseRemoteConfig.swift b/EATSSU_MVC/EATSSU_MVC/Sources/Data/Firebase/FirebaseRemoteConfig.swift
@@ -12,6 +12,7 @@ import Firebase
 class FirebaseRemoteConfig {
     static let shared = FirebaseRemoteConfig()
     var remoteConfig: RemoteConfig
+    var isVacationPeriod = false
 
     private init() {
         remoteConfig = RemoteConfig.remoteConfig()
@@ -59,7 +60,7 @@ class FirebaseRemoteConfig {
 
     func fetchRestaurantInfo() {
         // 1. fetch
-        remoteConfig.fetch() { (status, error) -> Void in
+        remoteConfig.fetch(withExpirationDuration: 0) { (status, error) -> Void in
             if status == .success {
                 // 2. activate: 컨피그 값 가져옴
                 self.remoteConfig.activate()
@@ -83,4 +84,17 @@ class FirebaseRemoteConfig {
             }
         }
     }
+
+    func fetchIsVacationPeriod() {
+        remoteConfig.fetch(withExpirationDuration: 0) { (status, error) -> Void in
+            if status == .success {
+                self.remoteConfig.activate()
+
+                self.isVacationPeriod = self.remoteConfig["isVacationPeriod"].boolValue
+                print("Is vacation period: \(self.isVacationPeriod)")
+            } else {
+                print("Error: \(error?.localizedDescription ?? "Unknown error")")
+            }
+        }
+    }
 }
diff --git a/EATSSU_MVC/EATSSU_MVC/Sources/Presentation/Auth/ViewController/LoginViewController.swift b/EATSSU_MVC/EATSSU_MVC/Sources/Presentation/Auth/ViewController/LoginViewController.swift
@@ -20,6 +20,7 @@ final class LoginViewController: BaseViewController {
     // MARK: - Properties
 
     var loginAfterlooking = true
+    static public let isVacationPeriod = false
 
     // MARK: - UI Components
 
@@ -66,6 +67,8 @@ final class LoginViewController: BaseViewController {
     }
 
     private func setFirebaseTask() {
+        FirebaseRemoteConfig.shared.fetchIsVacationPeriod()
+
 #if DEBUG
 #else
         Analytics.logEvent("LoginViewControllerLoad", parameters: nil)

diff --git a/EATSSU_MVC/EATSSU_MVC/Sources/Presentation/Home/Enum/RestaurantType.swift b/EATSSU_MVC/EATSSU_MVC/Sources/Presentation/Home/Enum/RestaurantType.swift
@@ -0,0 +1,42 @@
+//
+//  RestaurantType.swift
+//  EATSSU
+//
+//  Created by 최지우 on 11/8/24.
+//
+
+import Foundation
+
+enum RestaurantType {
+    case change
+    case fix
+}
+
+enum Restaurant {
+    case dodamRestaurant
+    case dormitoryRestaurant
+    case studentRestaurant
+    case snackCorner
+
+    var type: RestaurantType {
+        switch self {
+        case .dodamRestaurant, .dormitoryRestaurant, .studentRestaurant:
+            return .change
+        case .snackCorner:
+            return .fix
+        }
+    }
+
+    var identifier: String {
+        switch self {
+        case .dodamRestaurant:
+            return "DODAM"
+        case .dormitoryRestaurant:
+            return "DORMITORY"
+        case .studentRestaurant:
+            return "HAKSIK"
+        case .snackCorner:
+            return "SNACK_CORNER"
+        }
+    }
+}
diff --git a/...VC/EATSSU_MVC/Sources/Presentation/Home/ViewController/HomeRestaurantViewController.swift b/...VC/EATSSU_MVC/Sources/Presentation/Home/ViewController/HomeRestaurantViewController.swift
@@ -107,37 +107,37 @@ final class HomeRestaurantViewController: BaseViewController {
     }
 
     func getSectionIndex(for restaurant: String) -> Int? {
-        let restaurantRawValue = [TextLiteral.dormitoryRawValue,
-                                  TextLiteral.dodamRawValue,
-                                  TextLiteral.studentRestaurantRawValue,
-                                  TextLiteral.snackCornerRawValue]
+        let restaurantRawValue = [Restaurant.dormitoryRestaurant.identifier,
+                                  Restaurant.dodamRestaurant.identifier,
+                                  Restaurant.studentRestaurant.identifier,
+                                  Restaurant.snackCorner.identifier]
         return restaurantRawValue.firstIndex(of: restaurant)
     }
 
     func getSectionKey(for section: Int) -> String {
-        let restaurantRawValue = [TextLiteral.dormitoryRawValue,
-                                  TextLiteral.dodamRawValue,
-                                  TextLiteral.studentRestaurantRawValue,
-                                  TextLiteral.snackCornerRawValue]
+        let restaurantRawValue = [Restaurant.dormitoryRestaurant.identifier,
+                                  Restaurant.dodamRestaurant.identifier,
+                                  Restaurant.studentRestaurant.identifier,
+                                  Restaurant.snackCorner.identifier]
         return restaurantRawValue[section]
     }
 
     func fetchData(date: Date, time: String) {
         let formatDate = changeDateFormat(date: date)
-        getChageMenuData(date: formatDate, restaurant: TextLiteral.dormitoryRawValue, time: time) {}
-        getChageMenuData(date: formatDate, restaurant: TextLiteral.dodamRawValue, time: time) {}
-        getChageMenuData(date: formatDate, restaurant: TextLiteral.studentRestaurantRawValue, time: time) {}
+        getChageMenuData(date: formatDate, restaurant: Restaurant.dormitoryRestaurant.identifier, time: time) {}
+        getChageMenuData(date: formatDate, restaurant: Restaurant.dodamRestaurant.identifier, time: time) {}
+        getChageMenuData(date: formatDate, restaurant: Restaurant.studentRestaurant.identifier, time: time) {}
 
         let weekday = Weekday.from(date: date)
         isWeekend = weekday.isWeekend
 
         if time == TextLiteral.lunchRawValue {
 
-            if !weekday.isWeekend {
+            if !FirebaseRemoteConfig.shared.isVacationPeriod && !weekday.isWeekend {
                 getFixMenuData(restaurant: TextLiteral.snackCornerRawValue) {}
             } else {
-                currentRestaurant = TextLiteral.snackCornerRawValue
-                self.fixMenuTableViewData[TextLiteral.snackCornerRawValue] = [MenuInformation(menuId: 0, name: "", mainRating: nil, price: nil)]
+                currentRestaurant = Restaurant.snackCorner.identifier
+                self.fixMenuTableViewData[Restaurant.snackCorner.identifier] = [MenuInformation(menuId: 0, name: "", mainRating: nil, price: nil)]
             }
         }
     }