📈 (Analytics): Improve log event caregiver select with previous, new

leka · Nov 25, 2024 · c9e4c78 · c9e4c78
1 parent 9eb365c
commit c9e4c78
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/Apps/LekaApp/Sources/Views/Users/Caregiver/CaregiverPicker.swift b/Apps/LekaApp/Sources/Views/Users/Caregiver/CaregiverPicker.swift
@@ -56,8 +56,6 @@ struct CaregiverPicker: View {
 
                     self.caregiverManager.setCurrentCaregiver(to: selectedCaregiver)
 
-                    AnalyticsManager.logEventCaregiverSelect(id: selectedCaregiver.id)
-
                     self.dismiss()
                 } label: {
                     Text(l10n.CaregiverPicker.selectButtonLabel)

diff --git a/Modules/AccountKit/Sources/Managers/Caregivers/CaregiverManager.swift b/Modules/AccountKit/Sources/Managers/Caregivers/CaregiverManager.swift
@@ -93,8 +93,16 @@ public class CaregiverManager {
     }
 
     public func setCurrentCaregiver(to caregiver: Caregiver) {
+        let previousCaregiverID: String? = self.currentCaregiver.value?.id
         self.currentCaregiver.send(caregiver)
-        AnalyticsManager.setDefaultEventParameterCaregiverUid(caregiver.id)
+
+        guard let caregiverID = caregiver.id else {
+            log.error("Caregiver ID is nil")
+            return
+        }
+
+        AnalyticsManager.logEventCaregiverSelect(from: previousCaregiverID, to: caregiverID)
+        AnalyticsManager.setDefaultEventParameterCaregiverUid(caregiverID)
         AnalyticsManager.setUserPropertyCaregiverProfessions(values: caregiver.professions)
     }
 

diff --git a/Modules/AnalyticsKit/Sources/Manager/AnalyticsManager+Users.swift b/Modules/AnalyticsKit/Sources/Manager/AnalyticsManager+Users.swift
@@ -6,9 +6,10 @@ import FirebaseAnalytics
 import Foundation
 
 public extension AnalyticsManager {
-    static func logEventCaregiverSelect(id: String?, parameters: [String: Any] = [:]) {
+    static func logEventCaregiverSelect(from previous: String?, to new: String, parameters: [String: Any] = [:]) {
         let params: [String: Any] = [
-            "lk_caregiver_id": id ?? "(lk_not_set)",
+            "lk_caregiver_id_previous": previous ?? NSNull(),
+            "lk_caregiver_id_new": new,
         ].merging(parameters) { _, new in new }
 
         logEvent(.caregiverSelect, parameters: params)