Merge pull request #223 from YAPP-Github/feat/#221-ga4

[Feat] #221 - Firebase Ananytics 지도, 포즈, 마이페이지 모듈 연동

Author: Remaked-Swain

Neki-iOS/APP/Sources/Application/AppCoordinator.swift

@@ -69,6 +69,7 @@ struct AppCoordinator {
 
     @Dependency(\.authClient) private var authClient
     @Dependency(\.appVersionClient) private var appVersionClient
+    @Dependency(\.analyticsClient) private var analytics
     @Dependency(\.continuousClock) var clock
     @Dependency(\.openURL) private var openURL
     @Dependency(\.date.now) private var now
@@ -155,6 +156,9 @@ struct AppCoordinator {
             case let .splashSequenceCompleted(finalStatus, finalVersionResult):
                 state.$userSessionStatus.withLock { $0 = finalStatus }
 
+                let userID: Int? = extractUserID(from: finalStatus)
+                let configureEffect: Effect<Action> = .run { _ in analytics.configure(userID) }
+                
                 guard finalVersionResult.status != .mustUpdate else {
                     state.versionAlert = .updateNeeded
                     return .none
@@ -166,7 +170,10 @@ struct AppCoordinator {
                     return .none
                 }
 
-                return navigateToNextScreen(state: &state, sessionStatus: finalStatus)
+                return .merge(
+                    configureEffect,
+                    navigateToNextScreen(state: &state, sessionStatus: finalStatus)
+                )
 
             case .executePendingShareExtensionIfNeeded:
                 guard let appGroupID = state.pendingShareAppGroupID else { return .none }
@@ -189,27 +196,29 @@ struct AppCoordinator {
             case let .userSessionStatusChanged(newStatus):
                 if state.userSessionStatus != newStatus { state.$userSessionStatus.withLock { $0 = newStatus } }
 
-                if case .splash = state.route, state.versionAlert != nil { return .none }
+                let userID: Int? = extractUserID(from: newStatus)
+                let configureEffect: Effect<Action> = .run { _ in analytics.configure(userID) }
+                
+                if case .splash = state.route, state.versionAlert != nil { return configureEffect }
 
+                let navigationEffect: Effect<Action>
                 switch newStatus {
-                case let .signedIn(user):
-                    if case .mainTab = state.route { return .none }
-                    state.route = .mainTab(.init())
-                    return .none
-                    
-                case .signedOut:
-                    state.route = .auth(.init())
-                    guard case .expired = newStatus else { return .none }
-                    state.toastItem = .init("다시 로그인 해주세요.")
-                    return .none
+                case .signedIn:
+                    if case .mainTab = state.route {
+                        navigationEffect = .none
+                    } else {
+                        state.route = .mainTab(.init())
+                        navigationEffect = .none
+                    }
 
-                case .expired:
+                case .signedOut, .expired:
                     state.route = .auth(.init())
-                    guard case .expired = newStatus else { return .none }
-                    state.toastItem = .init("다시 로그인 해주세요.")
-                    return .none
+                    if case .expired = newStatus { state.toastItem = .init("다시 로그인 해주세요.") }
+                    navigationEffect = .none
                 }
 
+                return .merge(configureEffect, navigationEffect)
+                
             case .route(.onboarding(.delegate(.didFinishOnboarding))):
                 state.$hasSeenOnboarding.withLock { $0 = true }
                 state.route = .auth(.init())
@@ -218,15 +227,19 @@ struct AppCoordinator {
             case let .route(.auth(.delegate(.moveToMainTab(user)))):
                 state.$userSessionStatus.withLock { $0 = .signedIn(user) }
                 state.route = .mainTab(.init())
-                return .send(.executePendingShareExtensionIfNeeded)
+                let configureEffect: Effect<Action> = .run { _ in analytics.configure(user.id) }
+                return .merge(
+                    configureEffect,
+                    .send(.executePendingShareExtensionIfNeeded)
+                )
 
             case .route(.mainTab(.delegate(.signedOut))), .route(.mainTab(.delegate(.withdraw))):
                 state.$userSessionStatus.withLock { $0 = .signedOut }
                 if case .route(.mainTab(.delegate(.withdraw))) = action {
                     state.initializeUserDefaults()
                 }
                 state.route = .auth(.init())
-                return .none
+                return .run { _ in analytics.configure(nil) }
 
             case .binding(\.isAlertPresented):
                 guard state.isAlertPresented == false else { return .none }
@@ -239,8 +252,13 @@ struct AppCoordinator {
             }
         }
     }
-    
-    private func navigateToNextScreen(state: inout State, sessionStatus: UserSessionStatus) -> Effect<Action> {
+}
+
+
+// MARK: - AppCoordinator + Helpers
+
+private extension AppCoordinator {
+    func navigateToNextScreen(state: inout State, sessionStatus: UserSessionStatus) -> Effect<Action> {
         switch sessionStatus {
         case .signedIn:
             state.route = .mainTab(.init())
@@ -256,6 +274,11 @@ struct AppCoordinator {
             return .none
         }
     }
+    
+    func extractUserID(from status: UserSessionStatus) -> Int? {
+        guard case let .signedIn(user) = status else { return nil }
+        return user.id
+    }
 }
 
 extension AppCoordinator {

Neki-iOS/Core/Sources/Analytics/Sources/Domain/Sources/Entities/AnalyticsEventName.swift

@@ -38,5 +38,9 @@ public enum AnalyticsEventName: String {
     case poseBookmarkFilter = "pose_bookmark_filter"
     case poseBookmark = "pose_bookmark"
 
+    // 마이페이지
+    case logout = "mypage_logout"
+    case withdraw = "mypage_withdraw"
+    
     var value: String { self.rawValue }
 }

Neki-iOS/Core/Sources/ImagePicker/Presentation/Extension/Data+.swift

@@ -51,8 +51,8 @@ extension Data {
             return nil
         }
 
-        var width = properties[kCGImagePropertyPixelWidth] as? Int
-        var height = properties[kCGImagePropertyPixelHeight] as? Int
+        let width = properties[kCGImagePropertyPixelWidth] as? Int
+        let height = properties[kCGImagePropertyPixelHeight] as? Int
 
         if let w = width, let h = height {
             return (w, h)

Neki-iOS/Features/Map/Sources/Domain/Sources/Entities/DirectionAppType.swift

@@ -9,8 +9,10 @@ import Foundation
 import DeveloperToolsSupport
 
 /// 길찾기 기능으로 제공되는 외부 앱
-public enum DirectionAppType: CaseIterable {
-    case googleMap, naverMap, kakaoMap
+public enum DirectionAppType: String, CaseIterable {
+    case googleMap = "google_map"
+    case naverMap = "naver_map"
+    case kakaoMap = "kakao_map"
 
     var imageResources: ImageResource {
         switch self {
@@ -44,7 +46,7 @@ public extension DirectionAppType {
         case .naverMap:
             // 네이버: 모바일 웹 길찾기 페이지 포맷 (도착지 설정)
             // slng, slat(출발지)는 생략 시 현재위치, elng, elat(도착지), etext(도착지명)
-            return URL(string: "https://m.map.naver.com/route.nhn?menu=route&elat=\(coordinate.latitude)&elng=\(coordinate.longitude)&etext=\(nameEncoded)")
+            return URL(string: "https://app.map.naver.com/launchApp?cmd=outlink&req=route&dlat=\(coordinate.latitude)&dlng=\(coordinate.longitude)&dname=\(nameEncoded)")
 
         case .kakaoMap:
             // 카카오: 웹/앱 연동형 링크

Neki-iOS/Features/Map/Sources/Domain/Sources/Entities/MapAnalyticsEvent.swift

@@ -0,0 +1,42 @@
+//
+//  MapAnalyticsEvent.swift
+//  Neki-iOS
+//
+//  Created by SwainYun on 4/19/26.
+//
+
+import Foundation
+
+enum MapAnalyticsEvent {
+    case mapReSearch(hasFilter: Bool, regionChanged: Bool)
+    case mapBrandFilterToggle(action: MapFilterAction, selectedCount: Int, brandName: String)
+    case boothSelect(brandName: String, entryPoint: MapEntryPoint)
+    case mapRouteClick(mapType: DirectionAppType)
+}
+
+
+// MARK: - MapAnalyticsEvent + AnalyticsEvent
+
+extension MapAnalyticsEvent: AnalyticsEvent {
+    var name: AnalyticsEventName {
+        switch self {
+        case .mapReSearch: return .mapReSearch
+        case .mapBrandFilterToggle: return .mapBrandFilterToggle
+        case .boothSelect: return .boothSelect
+        case .mapRouteClick: return .mapRouteClick
+        }
+    }
+    
+    var parameters: [AnalyticsParameterKey : Any]? {
+        switch self {
+        case let .mapReSearch(hasFilter, regionChanged):
+            return [.hasFilter: hasFilter, .regionChanged: regionChanged]
+        case let .mapBrandFilterToggle(action, selectedCount, brandName):
+            return [.action: action.rawValue, .selectedCount: selectedCount, .brandName: brandName]
+        case let .boothSelect(brandName, entryPoint):
+            return [.brandName: brandName, .entryPoint: entryPoint.rawValue]
+        case let .mapRouteClick(mapType):
+            return [.mapType: mapType.rawValue]
+        }
+    }
+}

Neki-iOS/Features/Map/Sources/Domain/Sources/Entities/MapEntryPoint.swift

@@ -0,0 +1,13 @@
+//
+//  MapEntryPoint.swift
+//  Neki-iOS
+//
+//  Created by SwainYun on 4/19/26.
+//
+
+import Foundation
+
+enum MapEntryPoint: String {
+    case map = "map"
+    case bottomSheet = "bottom_sheet"
+}

Neki-iOS/Features/Map/Sources/Domain/Sources/Entities/MapFilterAction.swift

@@ -0,0 +1,13 @@
+//
+//  MapFilterAction.swift
+//  Neki-iOS
+//
+//  Created by SwainYun on 4/19/26.
+//
+
+import Foundation
+
+enum MapFilterAction: String {
+    case select = "select"
+    case deselect = "deselect"
+}

Neki-iOS/Features/Map/Sources/Presentation/Sources/Feature/MapFeature.swift

@@ -14,6 +14,8 @@ import os
 public struct MapFeature {
     enum Constants {
         static let defaultInitialPosition: CLLocation = .init(latitude: 37.498095, longitude: 127.027610)
+        static let cameraTargetDistanceThreshold: CLLocationDistance = 200
+        static let regionChangeDistanceThreshold: CLLocationDistance = 500
     }
 
     enum SheetStage {
@@ -41,6 +43,7 @@ public struct MapFeature {
         // Map State
         var cameraPosition: GeographicCoordinate?
         var currentBounds: GeographicBoundingBox?
+        var lastSearchedLocation: CLLocation?
 
         // User Location
         var locationAuthorizationStatus: CLAuthorizationStatus = .notDetermined
@@ -109,6 +112,7 @@ public struct MapFeature {
         case processNewChunk([PhotoBooth], isFirstBatch: Bool)
         case appendProcessedChunk(map: [PhotoBooth], isFirstBatch: Bool)
         case didFinishBackgroundCalculation(map: IdentifiedArrayOf<PhotoBooth>, list: IdentifiedArrayOf<PhotoBooth>)
+        case didSelectDirectionApp(DirectionAppType)
 
         // Binding & Child
         case binding(BindingAction<State>)
@@ -126,6 +130,7 @@ public struct MapFeature {
 
     @Dependency(\.mapClient) private var mapClient
     @Dependency(\.photoBoothClient) private var photoBoothClient
+    @Dependency(\.analyticsClient) private var analytics
     @Dependency(\.openURL) private var openURL
 
     public var body: some ReducerOf<Self> {
@@ -261,18 +266,14 @@ public struct MapFeature {
 
                 guard state.isFirstLoad else { return .none }
                 guard state.locationAuthorizationStatus != .notDetermined else { return .none }
-                let targetCoordinate: CLLocation
-                if state.isLocationAuthorized {
-                    guard let userLocation = state.userLocation else { return .none }
-                    targetCoordinate = userLocation
-                } else {
-                    targetCoordinate = Constants.defaultInitialPosition
-                }
 
+                let targetCoordinate = state.isLocationAuthorized ? (state.userLocation ?? Constants.defaultInitialPosition) : Constants.defaultInitialPosition
                 let currentCameraLocation = CLLocation(latitude: bounds.center.latitude, longitude: bounds.center.longitude)
-                guard currentCameraLocation.distance(from: targetCoordinate) <= 200 else { return .none }
+                
+                guard currentCameraLocation.distance(from: targetCoordinate) <= Constants.cameraTargetDistanceThreshold else { return .none }
                 state.isFirstLoad = false
                 let nearbyTargetCoordinate = state.userGeographicCoordinate ?? bounds.center
+                state.lastSearchedLocation = currentCameraLocation
                 return .merge(
                     .send(.fetchPhotoBooths(bounds: bounds)),
                     .send(.fetchNearbyPhotoBooths(nearbyTargetCoordinate))
@@ -285,7 +286,13 @@ public struct MapFeature {
             case .didTapSearchHereButton:
                 guard let bounds = state.currentBounds else { return .none }
                 let nearbyTargetCoordinate = state.userGeographicCoordinate ?? bounds.center
+                let currentCenterLocation = CLLocation(latitude: bounds.center.latitude, longitude: bounds.center.longitude)
+                let isRegionChanged = checkIfRegionChanged(from: state.lastSearchedLocation, to: currentCenterLocation)
+                let hasFilter = state.photoBoothListState.filteredBrands.isEmpty == false
+                let event = MapAnalyticsEvent.mapReSearch(hasFilter: hasFilter, regionChanged: isRegionChanged)
+                state.lastSearchedLocation = currentCenterLocation
                 return .merge(
+                    .run { _ in analytics.logEvent(event: event) },
                     .send(.fetchPhotoBooths(bounds: bounds)),
                     .send(.fetchNearbyPhotoBooths(nearbyTargetCoordinate))
                 )
@@ -392,7 +399,8 @@ public struct MapFeature {
             case .didTapBooth(let photoBooth):
                 state.isUserTrackingMode = false
                 selectPhotoBooth(&state, photoBooth: photoBooth)
-                return .none
+                let event = MapAnalyticsEvent.boothSelect(brandName: photoBooth.brand.name, entryPoint: .map)
+                return .run { _ in analytics.logEvent(event: event) }
 
             case .didTapBoothCard:
                 state.isUserTrackingMode = false
@@ -408,6 +416,15 @@ public struct MapFeature {
                 state.directionSheetPhotoBooth = state.selectedBooth
                 return .none
 
+            case let .didSelectDirectionApp(appType):
+                guard let photoBooth = state.directionSheetPhotoBooth else { return .none }
+                guard let url = appType.connectLink(coordinate: photoBooth.coordinate, name: photoBooth.name) else { return .none }
+                state.directionSheetPhotoBooth = nil
+                return .merge(
+                    .run { _ in analytics.logEvent(event: MapAnalyticsEvent.mapRouteClick(mapType: appType)) },
+                    .run { _ in await openURL(url) }
+                )
+                
             case .updateSDKAuthStatus(let isAuthorized):
                 state.isSDKAuthSuccessful = isAuthorized
                 return .none
@@ -416,7 +433,10 @@ public struct MapFeature {
                 return .send(.startBackgroundCalculation)
 
             case let .photoBoothListAction(.didTapBooth(photoBooth)):
-                return .send(.didTapBooth(photoBooth))
+                state.isUserTrackingMode = false
+                selectPhotoBooth(&state, photoBooth: photoBooth)
+                let event = MapAnalyticsEvent.boothSelect(brandName: photoBooth.brand.name, entryPoint: .bottomSheet)
+                return .run { _ in analytics.logEvent(event: event) }
 
             default:
                 return .none
@@ -444,4 +464,9 @@ private extension MapFeature {
     func updateCameraPosition(_ state: inout State, to coordinate: CLLocationCoordinate2D) {
         state.cameraPosition = .init(latitude: coordinate.latitude, longitude: coordinate.longitude)
     }
+    
+    func checkIfRegionChanged(from lastLocation: CLLocation?, to currentLocation: CLLocation) -> Bool {
+        guard let lastLocation else { return false }
+        return currentLocation.distance(from: lastLocation) >= Constants.regionChangeDistanceThreshold
+    }
 }

Neki-iOS/Features/Map/Sources/Presentation/Sources/Feature/PhotoBoothListFeature.swift

@@ -37,14 +37,19 @@ public struct PhotoBoothListFeature {
         case binding(BindingAction<State>)
     }
 
+    @Dependency(\.analyticsClient) private var analytics
+    
     public var body: some ReducerOf<Self> {
         BindingReducer()
 
         Reduce { (state: inout State, action: Action) -> Effect<Action> in
             switch action {
             case let .selectFilterOption(brand):
+                let filterAction: MapFilterAction = state.filteredBrands.contains(brand) ? .deselect : .select
                 toggleFilterOptionSelection(&state, brand: brand)
-                return .none
+                let selectedCount = state.filteredBrands.count
+                let event = MapAnalyticsEvent.mapBrandFilterToggle(action: filterAction, selectedCount: selectedCount, brandName: brand.name)
+                return .run { _ in analytics.logEvent(event: event) }
 
             case .toggleTooltip:
                 state.$isTooltipPresented.withLock { $0.toggle() }