Update analytics

Author: SubvertDev

Packages/Package.swift

@@ -162,6 +162,7 @@ let package = Package(
         .target(
             name: "AnalyticsClient",
             dependencies: [
+                "Models",
                 "PersistenceKeys",
                 .product(name: "ComposableArchitecture", package: "swift-composable-architecture"),
                 .product(name: "Mixpanel", package: "mixpanel-swift"),

Packages/Sources/AnalyticsClient/AnalyticsClient.swift

@@ -8,14 +8,15 @@
 import Foundation
 import ComposableArchitecture
 import PersistenceKeys
+import Models
 import Mixpanel
 import Sentry
 import OSLog
 
 @DependencyClient
 public struct AnalyticsClient: Sendable {
     public var configure: @Sendable () -> Void
-    public var identify: @Sendable (_ distinctId: String) -> Void
+    public var identify: @Sendable (_ id: String) -> Void
     public var logout: @Sendable () -> Void
     public var log: @Sendable (any Event) -> Void
     public var capture: @Sendable (any Error) -> Void
@@ -83,6 +84,26 @@ extension AnalyticsClient {
             trackAutomaticEvents: true, // FIXME: LEGACY, REMOVE. https://docs.mixpanel.com/docs/tracking-methods/sdks/swift#legacy-automatically-tracked-events
             optOutTrackingByDefault: isDebug
         )
+        
+        @Dependency(\.analyticsClient) var analytics
+        @Shared(.userSession) var userSession
+        
+        if let mixpanelUserId = Mixpanel.mainInstance().userId {
+            if let userId = userSession?.userId {
+                if String(userId) != mixpanelUserId {
+                    logger.warning("Mixpanel user ID mismatch, changing to \(userId)")
+                    analytics.identify(id: String(userId))
+                } else {
+                    logger.info("Analytics configured successfully")
+                }
+            } else {
+                logger.warning("Mixpanel user ID found without user session, logging out")
+                analytics.logout()
+            }
+        } else {
+            logger.info("Mixpanel user ID not found, defaulting to \(id)")
+            Mixpanel.mainInstance().distinctId = id
+        }
     }
 
     private static func configureSentry(id: String) {

Packages/Sources/AnalyticsClient/Events/ProfileEvent.swift

@@ -10,6 +10,7 @@ import Foundation
 public enum ProfileEvent: Event {
     case logoutTapped
     case userLoaded(Int)
+    case userLoadingFailed
 
     public var name: String {
         return "Profile " + eventName(for: self).inProperCase

Packages/Sources/MenuFeature/Analytics/MenuFeature+Analytics.swift

@@ -20,12 +20,9 @@ extension MenuFeature {
         var body: some ReducerOf<Self> {
             Reduce { state, action in
                 switch action {
-                case .onTask, .alert, .notImplementedFeatureTapped, ._subscribeToUpdates, ._loadUserResult:
+                case .onTask, .alert, .notImplementedFeatureTapped, ._subscribeToUpdates, ._loadUserResult, .profileTapped:
                     break
 
-                case .profileTapped:
-                    analyticsClient.log(MenuEvent.profileTapped)
-                    
                 case .settingsTapped:
                     analyticsClient.log(MenuEvent.settingsTapped)
 

Packages/Sources/ProfileFeature/Analytics/ProfileFeature+Analytics.swift

@@ -20,7 +20,7 @@ extension ProfileFeature {
         var body: some ReducerOf<Self> {
             Reduce { state, action in
                 switch action {
-                case .onTask, .alert, ._userResponse(.failure):
+                case .onTask, .alert:
                     break
 
                 case .logoutButtonTapped:
@@ -29,6 +29,9 @@ extension ProfileFeature {
 
                 case let ._userResponse(.success(user)):
                     analyticsClient.log(ProfileEvent.userLoaded(user.id))
+                    
+                case ._userResponse(.failure):
+                    analyticsClient.log(ProfileEvent.userLoadingFailed)
                 }
                 return .none
             }

Packages/Sources/ProfileFeature/ProfileFeature.swift

@@ -75,7 +75,7 @@ public struct ProfileFeature: Sendable {
             case .onTask:
                 return .run { [userId = state.userId] send in
                     do {
-                        for try await user in try await apiClient.getUser(userId: userId) {
+                        for try await user in try await apiClient.getUser(userId) {
                             await send(._userResponse(.success(user)))
                         }
                     } catch {