Merge pull request #339 from EAT-SSU/fix/#335

[#335] 지도 마커 클러스터링 도입

Author: Hrepay

EATSSU/App/Sources/Data/Network/Foundation/AuthenticationManager.swift

@@ -0,0 +1,49 @@
+//
+//  AuthenticationManager.swift
+//  EATSSU
+//
+//  Created by 황상환 on 10/12/25.
+//
+
+import Foundation
+import RealmSwift
+
+enum AuthResult {
+    case authenticated
+    case notAuthenticated
+    case sessionExpired
+    
+    var errorMessage: String? {
+        if case .sessionExpired = self {
+            return "세션이 만료되었습니다. 다시 로그인해주세요."
+        }
+        return nil
+    }
+}
+
+final class AuthenticationManager {
+    static let shared = AuthenticationManager()
+    private init() {}
+    
+    /// 저장된 토큰을 확인하고 필요시 갱신하여 인증 상태를 반환합니다.
+    func checkAuthentication() async -> AuthResult {
+        // 1. 토큰이 없으면 미인증 상태
+        guard hasStoredToken() else {
+            return .notAuthenticated
+        }
+        
+        // 2. 토큰이 있으면 갱신 시도
+        do {
+            try await TokenManager.shared.refreshIfNeededWithThrow()
+            return .authenticated
+        } catch {
+            // 3. 갱신 실패하면 토큰 삭제 후 세션 만료 처리
+            RealmService.shared.deleteAll(Token.self)
+            return .sessionExpired
+        }
+    }
+    
+    private func hasStoredToken() -> Bool {
+        !RealmService.shared.getToken().isEmpty
+    }
+}

EATSSU/App/Sources/Data/Network/Foundation/TokenManager.swift

@@ -55,6 +55,13 @@ final class TokenManager {
         guard let data = Data(base64Encoded: base64) else { return nil }
         return try? JSONDecoder().decode(TokenPayload.self, from: data)
     }
+    
+    /// 에러를 상위로 전파하는 버전
+    func refreshIfNeededWithThrow() async throws {
+        if isTokenExpiringSoon() {
+            try await TokenRefresher.shared.refreshIfNeeded()
+        }
+    }
 }
 
 extension TokenManager {

EATSSU/App/Sources/Presentation/Auth/ViewController/LoginViewController.swift

@@ -30,7 +30,6 @@ final class LoginViewController: BaseViewController {
 
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
-        handleAutoLogin()
     }
 
     override func viewDidLoad() {
@@ -79,15 +78,6 @@ final class LoginViewController: BaseViewController {
         FirebaseRemoteConfig.shared.fetchIsVacationPeriod()
     }
 
-    /// Realm에 저장된 토큰이 있는지 확인 후, 있으면 홈 화면으로 이동한다.
-    private func handleAutoLogin() {
-        guard hasStoredToken() else { return }
-        #if DEBUG
-            print("저장된 AccessToken: ", RealmService.shared.getToken())
-        #endif
-        changeIntoHomeViewController()
-    }
-
     private func hasStoredToken() -> Bool {
         !RealmService.shared.getToken().isEmpty
     }

EATSSU/App/Sources/Presentation/Home/ViewController/HomeRestaurantViewController.swift

@@ -75,29 +75,24 @@ final class HomeRestaurantViewController: BaseViewController {
     // 변경 메뉴 데이터 (식당명: 메뉴 배열)
     var changeMenuTableViewData: [String: [ChangeMenuTableResponse]] = [:] {
         didSet {
-            // 메뉴 이름이 빈 값이 아닌 데이터만 필터링
-            changeMenuTableViewData = changeMenuTableViewData.mapValues { menuTableResponses in
-                menuTableResponses.filter { response in
-                    !(response.briefMenus.first?.name.isEmpty ?? true)
-                }
-            }
-
-            // 현재 섹션만 reload
-            if let sectionIndex = getSectionIndex(for: currentRestaurant) {
-                restaurantView.restaurantTableView.reloadSections([sectionIndex], with: .automatic)
+            DispatchQueue.main.async { [weak self] in
+                guard let self = self,
+                      let sectionIndex = self.getSectionIndex(for: self.currentRestaurant) else { return }
+                self.restaurantView.restaurantTableView.reloadSections([sectionIndex], with: .automatic)
             }
         }
     }
 
     // 고정 메뉴 데이터 (간식코너)
     var fixMenuTableViewData: [String: [Menus]] = [:] {
         didSet {
-            if let sectionIndex = getSectionIndex(for: currentRestaurant) {
-                restaurantView.restaurantTableView.reloadSections([sectionIndex], with: .automatic)
+            DispatchQueue.main.async { [weak self] in
+                guard let self = self,
+                      let sectionIndex = self.getSectionIndex(for: self.currentRestaurant) else { return }
+                self.restaurantView.restaurantTableView.reloadSections([sectionIndex], with: .automatic)
             }
         }
     }
-
     // 메뉴 API 요청을 위한 Moya Provider
     let menuProvider = MoyaProvider<HomeRouter>(plugins: [ESMoyaLoggingPlugin()])
 
@@ -377,7 +372,13 @@ extension HomeRestaurantViewController {
                 do {
                     self.currentRestaurant = restaurant
                     let responseDetailDto = try responseData.map(BaseResponse<[ChangeMenuTableResponse]>.self)
-                    self.changeMenuTableViewData[restaurant] = responseDetailDto.result
+                    
+                    let filteredMenus = responseDetailDto.result?.filter {
+                        !($0.briefMenus.first?.name.isEmpty ?? true)
+                    }
+                    
+                    self.changeMenuTableViewData[restaurant] = filteredMenus
+
                 } catch let err {
                     print(err.localizedDescription)
                 }

EATSSU/App/Sources/Presentation/Map/ViewController/MainMapViewController+Location.swift

@@ -0,0 +1,119 @@
+//
+//  MainMapViewController+Location.swift
+//  EATSSU
+//
+//  Created by 황상환 on 10/4/25.
+//
+
+import UIKit
+import CoreLocation
+
+// MARK: - Location Management
+
+extension MainMapViewController: CLLocationManagerDelegate {
+    
+    func setupLocationButtonObserver() {
+        DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) { [weak self] in
+            guard let self = self else { return }
+            
+            if let locationButton = self.findLocationButton(in: self.root.mapView) {
+                let tapGesture = UITapGestureRecognizer(target: self, action: #selector(self.locationButtonTapped))
+                tapGesture.delegate = self
+                locationButton.addGestureRecognizer(tapGesture)
+            }
+        }
+    }
+    
+    @objc func locationButtonTapped() {
+        let status = locationManager.authorizationStatus
+        
+        switch status {
+        case .notDetermined:
+            hasRequestedLocationPermission = true
+            locationManager.requestWhenInUseAuthorization()
+            
+        case .denied, .restricted:
+            showLocationPermissionAlert()
+            
+        case .authorizedWhenInUse, .authorizedAlways:
+            break
+            
+        @unknown default:
+            break
+        }
+    }
+    
+    func findLocationButton(in view: UIView) -> UIView? {
+        for subview in view.subviews {
+            if String(describing: type(of: subview)).contains("LocationButton") {
+                return subview
+            }
+            if let found = findLocationButton(in: subview) {
+                return found
+            }
+        }
+        return nil
+    }
+    
+    func locationManagerDidChangeAuthorization(_ manager: CLLocationManager) {
+        switch manager.authorizationStatus {
+        case .authorizedWhenInUse, .authorizedAlways:
+            root.mapView.mapView.positionMode = .direction
+            
+        case .denied, .restricted:
+            if hasRequestedLocationPermission {
+                showLocationPermissionAlert()
+                hasRequestedLocationPermission = false
+            }
+            
+        case .notDetermined:
+            break
+            
+        @unknown default:
+            break
+        }
+    }
+    
+    func showLocationPermissionAlert() {
+        let alert = UIAlertController(
+            title: "위치 권한 필요",
+            message: "지도에서 내 위치를 바로 확인하고, 현재 위치 주변의 제휴점들을 손쉽게 찾아볼 수 있도록 위치 권한을 허용해 주세요.",
+            preferredStyle: .alert
+        )
+        
+        let settingsAction = UIAlertAction(title: "설정으로 이동", style: .default) { _ in
+            if let settingsURL = URL(string: UIApplication.openSettingsURLString) {
+                UIApplication.shared.open(settingsURL)
+            }
+        }
+        
+        let cancelAction = UIAlertAction(title: "취소", style: .cancel)
+        
+        alert.addAction(settingsAction)
+        alert.addAction(cancelAction)
+        
+        present(alert, animated: true)
+    }
+    
+    func locationManager(_ manager: CLLocationManager, didFailWithError error: Error) {
+        if let clError = error as? CLError {
+            switch clError.code {
+            case .denied:
+                if hasRequestedLocationPermission {
+                    showLocationPermissionAlert()
+                    hasRequestedLocationPermission = false
+                }
+            default:
+                break
+            }
+        }
+    }
+}
+
+// MARK: - UIGestureRecognizerDelegate
+
+extension MainMapViewController: UIGestureRecognizerDelegate {
+    func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldRecognizeSimultaneouslyWith otherGestureRecognizer: UIGestureRecognizer) -> Bool {
+        return true
+    }
+}