fix: optimize engagement time and previous timestamp attribute in first screen view (#36)

Co-authored-by: xiaoweii <xiaoweii@amazom.com>

Author: zhu-xiaowei

Sources/Clickstream/Dependency/Clickstream/AutoRecord/AutoRecordEventClient.swift

@@ -36,7 +36,9 @@ class AutoRecordEventClient {
 
     func onViewDidAppear(screenName: String, screenPath: String, screenHashValue: String) {
         if !isSameScreen(screenName, screenPath, screenHashValue) {
-            recordUserEngagement()
+            if lastScreenName != nil {
+                recordUserEngagement()
+            }
             recordScreenView(screenName, screenPath, screenHashValue)
         }
     }
@@ -86,11 +88,7 @@ class AutoRecordEventClient {
     }
 
     func getPreviousScreenViewTimestamp() -> Int64 {
-        if lastScreenStartTimestamp > 0 {
-            return lastScreenStartTimestamp
-        } else {
-            return UserDefaultsUtil.getPreviousScreenViewTimestamp(storage: clickstream.storage)
-        }
+        UserDefaultsUtil.getPreviousScreenViewTimestamp(storage: clickstream.storage)
     }
 
     func isSameScreen(_ screenName: String, _ screenPath: String, _ screenUniqueId: String) -> Bool {

Tests/ClickstreamTests/Clickstream/AutoRecordEventClientTest.swift

@@ -13,32 +13,40 @@ class AutoRecordEventClientTest: XCTestCase {
     private var clickstream: ClickstreamContext!
     private var eventRecorder: MockEventRecorder!
     private var autoRecordEventClient: AutoRecordEventClient!
+    private var activityTracker: MockActivityTracker!
+    private var sessionClient: SessionClient!
     let testAppId = "testAppId"
     let testEndpoint = "https://example.com/collect"
 
     override func setUp() async throws {
         UserDefaults.standard.removePersistentDomain(forName: Bundle.main.bundleIdentifier!)
         let mockNetworkMonitor = MockNetworkMonitor()
+        activityTracker = MockActivityTracker()
         let contextConfiguration = ClickstreamContextConfiguration(appId: testAppId,
                                                                    endpoint: testEndpoint,
                                                                    sendEventsInterval: 10_000,
                                                                    isTrackAppExceptionEvents: true,
                                                                    isCompressEvents: false)
         clickstream = try ClickstreamContext(with: contextConfiguration)
         clickstream.networkMonitor = mockNetworkMonitor
+        sessionClient = SessionClient(activityTracker: activityTracker, clickstream: clickstream)
+        clickstream.sessionClient = sessionClient
         eventRecorder = MockEventRecorder()
         let analyticsClient = try AnalyticsClient(
             clickstream: clickstream,
             eventRecorder: eventRecorder,
             sessionProvider: { nil }
         )
         clickstream.analyticsClient = analyticsClient
-        autoRecordEventClient = AutoRecordEventClient(clickstream: clickstream)
-        analyticsClient.autoRecordClient = autoRecordEventClient
+
+        autoRecordEventClient = sessionClient.autoRecordClient
     }
 
     override func tearDown() {
         eventRecorder = nil
+        activityTracker = nil
+        sessionClient = nil
+        activityTracker?.resetCounters()
     }
 
     func testAppVersionUpdate() {
@@ -70,14 +78,15 @@ class AutoRecordEventClientTest: XCTestCase {
     }
 
     func testOneScreenView() {
+        activityTracker.callback?(.runningInForeground)
         autoRecordEventClient.setIsEntrances()
         let viewController = MockViewControllerA()
         let window = UIWindow(frame: UIScreen.main.bounds)
         window.rootViewController = viewController
         window.makeKeyAndVisible()
         XCTAssertTrue(viewController.viewDidAppearCalled)
 
-        XCTAssertTrue(eventRecorder.saveCount == 1)
+        XCTAssertTrue(eventRecorder.saveCount == 4)
         XCTAssertEqual(eventRecorder.lastSavedEvent?.eventType, Event.PresetEvent.SCREEN_VIEW)
         XCTAssertNotNil(eventRecorder.lastSavedEvent!.attributes[Event.ReservedAttribute.SCREEN_ID])
         XCTAssertNotNil(eventRecorder.lastSavedEvent!.attributes[Event.ReservedAttribute.SCREEN_NAME])
@@ -137,7 +146,7 @@ class AutoRecordEventClientTest: XCTestCase {
         let window = UIWindow(frame: UIScreen.main.bounds)
         window.rootViewController = viewControllerA
         window.makeKeyAndVisible()
-        
+
         autoRecordEventClient.updateLastScreenStartTimestamp(Date().millisecondsSince1970 - 1_100)
         Thread.sleep(forTimeInterval: 0.02)
         window.rootViewController = viewControllerB