♻️ (Analytics): Create logEventActivityStart/End methods

leka · Nov 7, 2024 · 05fe4f5 · 05fe4f5
1 parent 173774f
commit 05fe4f5
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 14 deletions.
diff --git a/Modules/AccountKit/Sources/Managers/Analytics/AnalyticsManager.swift b/Modules/AccountKit/Sources/Managers/Analytics/AnalyticsManager.swift
@@ -42,8 +42,6 @@ public class AnalyticsManager {
         self.setDefaultEventParameters(nil)
     }
 
-    // Recommended events methods
-
     public func logEventLogin() {
         Analytics.logEvent(AnalyticsEventLogin, parameters: nil)
     }
@@ -55,4 +53,20 @@ public class AnalyticsManager {
     public func logEventSignUp() {
         Analytics.logEvent(AnalyticsEventSignUp, parameters: nil)
     }
+
+    public func logEventActivityStart(id: String, name: String, carereceiverIDs: String) {
+        Analytics.logEvent("activity_start", parameters: [
+            "activity_id": id,
+            "activity_name": name,
+            "carereceiver_ids": carereceiverIDs,
+        ])
+    }
+
+    public func logEventActivityEnd(id: String, name: String, carereceiverIDs: String) {
+        Analytics.logEvent("activity_end", parameters: [
+            "activity_id": id,
+            "activity_name": name,
+            "carereceiver_ids": carereceiverIDs,
+        ])
+    }
 }
diff --git a/Modules/GameEngineKit/Sources/OldSystem/Views/Activity/ActivityView.swift b/Modules/GameEngineKit/Sources/OldSystem/Views/Activity/ActivityView.swift
@@ -155,7 +155,13 @@ public struct ActivityView: View {
         .onAppear {
             Robot.shared.stop()
             UIApplication.shared.isIdleTimerDisabled = true
-            self.logActivityAnalytics(event: "activity_start")
+
+            AnalyticsManager.shared
+                .logEventActivityStart(
+                    id: self.viewModel.currentActivity.id,
+                    name: self.viewModel.currentActivity.name,
+                    carereceiverIDs: self.carereceiverManager.currentCarereceivers.value.compactMap(\.id).joined(separator: ",")
+                )
         }
         .onDisappear {
             Robot.shared.stop()
@@ -217,7 +223,13 @@ public struct ActivityView: View {
             if self.viewModel.isLastExercise {
                 self.viewModel.scorePanelEnabled ? self.viewModel.moveToActivityEnd() : self.dismiss()
                 self.saveActivityCompletion()
-                self.logActivityAnalytics(event: "activity_end")
+
+                AnalyticsManager.shared
+                    .logEventActivityEnd(
+                        id: self.viewModel.currentActivity.id,
+                        name: self.viewModel.currentActivity.name,
+                        carereceiverIDs: self.carereceiverManager.currentCarereceivers.value.compactMap(\.id).joined(separator: ",")
+                    )
             } else {
                 self.viewModel.moveToNextExercise()
             }
@@ -406,16 +418,6 @@ public struct ActivityView: View {
         let carereceiverIDs = self.carereceiverManagerViewModel.currentCarereceivers.compactMap(\.id)
         self.viewModel.saveActivityCompletion(caregiverID: caregiverID, carereceiverIDs: carereceiverIDs)
     }
-
-    private func logActivityAnalytics(event: String) {
-        let carereceiverIDs = self.carereceiverManager.currentCarereceivers.value.compactMap(\.id)
-        let carereceiverIDsString = carereceiverIDs.joined(separator: ",")
-        AnalyticsManager.shared.logEvent(name: event, parameters: [
-            "activity_id": self.viewModel.currentActivity.id,
-            "activity_name": self.viewModel.currentActivity.name,
-            "carereceiver_ids": carereceiverIDsString,
-        ])
-    }
 }
 
 // swiftlint:enable cyclomatic_complexity void_function_in_ternary function_body_length