Merge pull request #82 from Iterable/bugfix/mob-357-prefer

[MOB-357] - Prefer user id

Author: tapashmajumder

Tests/swift-sdk-swift-tests/IterableAPITests.swift

@@ -101,8 +101,8 @@ class IterableAPITests: XCTestCase {
         wait(for: [expectation], timeout: testExpectationTimeout)
     }
 
-    func testUpdateUser() {
-        let expectation = XCTestExpectation(description: "testUpdateUser")
+    func testUpdateUserWithEmail() {
+        let expectation = XCTestExpectation(description: "testUpdateUserWithEmail")
 
         let networkSession = MockNetworkSession(statusCode: 200)
         IterableAPI.initialize(apiKey: IterableAPITests.apiKey, networkSession: networkSession)
@@ -127,6 +127,34 @@ class IterableAPITests: XCTestCase {
         wait(for: [expectation], timeout: testExpectationTimeout)
     }
 
+    func testUpdateUserWithUserId() {
+        let expectation = XCTestExpectation(description: "testUpdateUserWithUserId")
+        
+        let userId = UUID().uuidString
+        let networkSession = MockNetworkSession(statusCode: 200)
+        IterableAPI.initialize(apiKey: IterableAPITests.apiKey, networkSession: networkSession)
+        IterableAPI.userId = userId
+        let dataFields: Dictionary<String, String> = ["var1" : "val1", "var2" : "val2"]
+        IterableAPI.updateUser(dataFields, mergeNestedObjects: true, onSuccess: {(json) in
+            TestUtils.validate(request: networkSession.request!, requestType: .post, apiEndPoint: .ITBL_ENDPOINT_API, path: .ITBL_PATH_UPDATE_USER, queryParams: [(name: "api_key", IterableAPITests.apiKey)])
+            let body = networkSession.getRequestBody()
+            TestUtils.validateElementPresent(withName: AnyHashable.ITBL_KEY_USER_ID, andValue: userId, inDictionary: body)
+            TestUtils.validateElementPresent(withName: AnyHashable.ITBL_KEY_PREFER_USER_ID, andValue: true, inDictionary: body)
+            TestUtils.validateElementPresent(withName: AnyHashable.ITBL_KEY_MERGE_NESTED, andValue: true, inDictionary: body)
+            TestUtils.validateElementPresent(withName: AnyHashable.ITBL_KEY_DATA_FIELDS, andValue: dataFields, inDictionary: body)
+            expectation.fulfill()
+        }) {(reason, _) in
+            if let reason = reason {
+                XCTFail("encountered error: \(reason)")
+            } else {
+                XCTFail("encountered error")
+            }
+            expectation.fulfill()
+        }
+        
+        wait(for: [expectation], timeout: testExpectationTimeout)
+    }
+
     func testUpdateEmail() {
         let expectation = XCTestExpectation(description: "testUpdateEmail")
 

swift-sdk/Internal/IterableAPIInternal.swift

@@ -198,6 +198,9 @@ final class IterableAPIInternal : NSObject, PushTrackerProtocol {
         args[.ITBL_KEY_DATA_FIELDS] = dataFields
         args[.ITBL_KEY_MERGE_NESTED] = mergeNested
         addEmailOrUserId(args: &args)
+        if email == nil && userId != nil {
+            args[.ITBL_KEY_PREFER_USER_ID] = true
+        }
 
         if let request = createPostRequest(forPath: .ITBL_PATH_UPDATE_USER, withBody: args) {
             sendRequest(request, onSuccess: onSuccess, onFailure: onFailure)