feat: support add global attribute when using Objc api

awslabs · Apr 11, 2024 · 2340cd9 · 2340cd9
1 parent 6242310
commit 2340cd9
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -226,7 +226,7 @@ ClickstreamAnalytics.recordEvent(ClickstreamAnalytics.EventName.SCREEN_VIEW, [
 import Clickstream
 
 let globalAttribute: ClickstreamAttribute = [
-    "channel": "apple",
+    ClickstreamAnalytics.Attr.APP_INSTALL_CHANNEL: "apple",
     "class": 6,
     "level": 5.1,
     "isOpenNotification": true,

diff --git a/Sources/Clickstream/ClickstreamObjc.swift b/Sources/Clickstream/ClickstreamObjc.swift
@@ -103,7 +103,7 @@ import Foundation
         ClickstreamAnalytics.enable()
     }
 
-    private static func getAttributes(_ attributes: NSDictionary) -> ClickstreamAttribute {
+    static func getAttributes(_ attributes: NSDictionary) -> ClickstreamAttribute {
         var result: ClickstreamAttribute = [:]
         for case let (key as String, value) in attributes {
             if value is String {

diff --git a/Sources/Clickstream/Dependency/Clickstream/ClickstreamContext.swift b/Sources/Clickstream/Dependency/Clickstream/ClickstreamContext.swift
@@ -124,6 +124,11 @@ extension UserDefaults: UserDefaultsBehaviour {
         self.globalAttributes = globalAttributes
         return self
     }
+
+    public func withInitialGlobalAttributesObjc(_ globalAttributes: NSDictionary) -> ClickstreamConfiguration {
+        self.globalAttributes = ClickstreamObjc.getAttributes(globalAttributes)
+        return self
+    }
 }
 
 struct ClickstreamContextStorage {

diff --git a/Tests/ClickstreamTests/SDKInitialTest.swift b/Tests/ClickstreamTests/SDKInitialTest.swift
@@ -44,14 +44,28 @@ class SDKInitialTest: XCTestCase {
             .withTrackUserEngagementEvents(false)
             .withAuthCookie("testAuthCookie")
             .withInitialGlobalAttributes([
-                "channel": "AppStore",
+                ClickstreamAnalytics.Attr.APP_INSTALL_CHANNEL: "AppStore",
                 "level": 5.1,
                 "class": 5,
                 "isOpenNotification": true
             ])
         try ClickstreamAnalytics.initSDK(configure)
     }
 
+    func testInitSDKWithGlobalAttributeForObjc() throws {
+        let globalAttribute: NSDictionary = [
+            ClickstreamAnalytics.Attr.APP_INSTALL_CHANNEL: "SMS",
+            "Successful": true,
+            "Score": 90.1,
+            "level": 5
+        ]
+        let configure = ClickstreamConfiguration()
+            .withAppId("testAppId")
+            .withEndpoint("https://example.com/collect")
+            .withInitialGlobalAttributesObjc(globalAttribute)
+        try ClickstreamAnalytics.initSDK(configure)
+    }
+
     func testInitSDKOverrideAllAmplifyConfiguration() throws {
         let configure = ClickstreamConfiguration()
             .withAppId("testAppId1")