Merge pull request #489 from Iterable/MOB-725-updatecart-part3

roninopf · web-flow · commit 190df2b6c990 · 2021-07-27T14:00:08.000-07:00
[MOB-725] remove top level dataFields
diff --git a/swift-sdk/Internal/ApiClient.swift b/swift-sdk/Internal/ApiClient.swift
@@ -124,9 +124,8 @@ extension ApiClient: ApiClientProtocol {
         return send(iterableRequestResult: result)
     }
     
-    func updateCart(items: [CommerceItem], dataFields: [AnyHashable: Any]?) -> Future<SendRequestValue, SendRequestError> {
-        let result = createRequestCreator().flatMap { $0.createUpdateCartRequest(items: items,
-                                                                                 dataFields: dataFields) }
+    func updateCart(items: [CommerceItem]) -> Future<SendRequestValue, SendRequestError> {
+        let result = createRequestCreator().flatMap { $0.createUpdateCartRequest(items: items) }
         
         return send(iterableRequestResult: result)
     }
diff --git a/swift-sdk/Internal/ApiClientProtocol.swift b/swift-sdk/Internal/ApiClientProtocol.swift
@@ -11,7 +11,7 @@ protocol ApiClientProtocol: AnyObject {
     
     func updateEmail(newEmail: String) -> Future<SendRequestValue, SendRequestError>
     
-    func updateCart(items: [CommerceItem], dataFields: [AnyHashable: Any]?) -> Future<SendRequestValue, SendRequestError>
+    func updateCart(items: [CommerceItem]) -> Future<SendRequestValue, SendRequestError>
     
     func track(purchase total: NSNumber, items: [CommerceItem], dataFields: [AnyHashable: Any]?) -> Future<SendRequestValue, SendRequestError>
     
diff --git a/swift-sdk/Internal/InternalIterableAPI.swift b/swift-sdk/Internal/InternalIterableAPI.swift
@@ -208,10 +208,9 @@ final class InternalIterableAPI: NSObject, PushTrackerProtocol, AuthProvider {
     
     @discardableResult
     func updateCart(items: [CommerceItem],
-                    dataFields: [AnyHashable: Any]? = nil,
                     onSuccess: OnSuccessHandler? = nil,
                     onFailure: OnFailureHandler? = nil) -> Future<SendRequestValue, SendRequestError> {
-        requestHandler.updateCart(items: items, dataFields: dataFields, onSuccess: onSuccess, onFailure: onFailure)
+        requestHandler.updateCart(items: items, onSuccess: onSuccess, onFailure: onFailure)
     }
     
     @discardableResult
diff --git a/swift-sdk/Internal/LegacyRequestHandler.swift b/swift-sdk/Internal/LegacyRequestHandler.swift
@@ -80,10 +80,9 @@ class LegacyRequestHandler: RequestHandlerProtocol {
     
     @discardableResult
     func updateCart(items: [CommerceItem],
-                    dataFields: [AnyHashable: Any]?,
                     onSuccess: OnSuccessHandler?,
                     onFailure: OnFailureHandler?) -> Future<SendRequestValue, SendRequestError> {
-        applyCallbacks(successHandler: onSuccess, andFailureHandler: onFailure, withIdentifier: "updateCart", forResult: apiClient.updateCart(items: items, dataFields: dataFields))
+        applyCallbacks(successHandler: onSuccess, andFailureHandler: onFailure, withIdentifier: "updateCart", forResult: apiClient.updateCart(items: items))
     }
     
     @discardableResult
diff --git a/swift-sdk/Internal/OfflineRequestProcessor.swift b/swift-sdk/Internal/OfflineRequestProcessor.swift
@@ -38,11 +38,10 @@ struct OfflineRequestProcessor: RequestProcessorProtocol {
     
     @discardableResult
     func updateCart(items: [CommerceItem],
-                    dataFields: [AnyHashable: Any]?,
                     onSuccess: OnSuccessHandler?,
                     onFailure: OnFailureHandler?) -> Future<SendRequestValue, SendRequestError> {
         let requestGenerator = { (requestCreator: RequestCreator) in
-            requestCreator.createUpdateCartRequest(items: items, dataFields: dataFields)
+            requestCreator.createUpdateCartRequest(items: items)
         }
         
         return sendIterableRequest(requestGenerator: requestGenerator,
diff --git a/swift-sdk/Internal/OnlineRequestProcessor.swift b/swift-sdk/Internal/OnlineRequestProcessor.swift
@@ -70,13 +70,12 @@ struct OnlineRequestProcessor: RequestProcessorProtocol {
     
     @discardableResult
     func updateCart(items: [CommerceItem],
-                    dataFields: [AnyHashable: Any]? = nil,
                     onSuccess: OnSuccessHandler? = nil,
                     onFailure: OnFailureHandler? = nil) -> Future<SendRequestValue, SendRequestError> {
         applyCallbacks(successHandler: onSuccess,
                        andFailureHandler: onFailure,
                        withIdentifier: "updateCart",
-                       forResult: apiClient.updateCart(items: items, dataFields: dataFields))
+                       forResult: apiClient.updateCart(items: items))
     }
     
     @discardableResult
diff --git a/swift-sdk/Internal/RequestCreator.swift b/swift-sdk/Internal/RequestCreator.swift
@@ -90,7 +90,7 @@ struct RequestCreator {
         return .success(.post(createPostRequest(path: Const.Path.updateUser, body: body)))
     }
     
-    func createUpdateCartRequest(items: [CommerceItem], dataFields: [AnyHashable: Any]?) -> Result<IterableRequest, IterableError> {
+    func createUpdateCartRequest(items: [CommerceItem]) -> Result<IterableRequest, IterableError> {
         if case .none = auth.emailOrUserId {
             ITBError(Self.authMissingMessage)
             return .failure(IterableError.general(description: Self.authMissingMessage))
@@ -102,13 +102,9 @@ struct RequestCreator {
         
         let itemsToSerialize = items.map { $0.toDictionary() }
         
-        var body: [String: Any] = [JsonKey.Commerce.user: apiUserDict,
+        let body: [String: Any] = [JsonKey.Commerce.user: apiUserDict,
                                    JsonKey.Commerce.items: itemsToSerialize]
         
-        if let dataFields = dataFields {
-            body[JsonKey.dataFields] = dataFields
-        }
-        
         return .success(.post(createPostRequest(path: Const.Path.updateCart, body: body)))
     }
     
diff --git a/swift-sdk/Internal/RequestHandler.swift b/swift-sdk/Internal/RequestHandler.swift
@@ -89,11 +89,9 @@ class RequestHandler: RequestHandlerProtocol {
     
     @discardableResult
     func updateCart(items: [CommerceItem],
-                    dataFields: [AnyHashable: Any]?,
                     onSuccess: OnSuccessHandler?,
                     onFailure: OnFailureHandler?) -> Future<SendRequestValue, SendRequestError> {
         chooseRequestProcessor().updateCart(items: items,
-                                            dataFields: dataFields,
                                             onSuccess: onSuccess,
                                             onFailure: onFailure)
     }
diff --git a/swift-sdk/Internal/RequestHandlerProtocol.swift b/swift-sdk/Internal/RequestHandlerProtocol.swift
@@ -41,7 +41,6 @@ protocol RequestHandlerProtocol: AnyObject {
     
     @discardableResult
     func updateCart(items: [CommerceItem],
-                    dataFields: [AnyHashable: Any]?,
                     onSuccess: OnSuccessHandler?,
                     onFailure: OnFailureHandler?) -> Future<SendRequestValue, SendRequestError>
     
diff --git a/swift-sdk/Internal/RequestProcessorProtocol.swift b/swift-sdk/Internal/RequestProcessorProtocol.swift
@@ -27,7 +27,6 @@ struct UpdateSubscriptionsInfo {
 protocol RequestProcessorProtocol {
     @discardableResult
     func updateCart(items: [CommerceItem],
-                    dataFields: [AnyHashable: Any]?,
                     onSuccess: OnSuccessHandler?,
                     onFailure: OnFailureHandler?) -> Future<SendRequestValue, SendRequestError>
     
diff --git a/swift-sdk/IterableAPI.swift b/swift-sdk/IterableAPI.swift
@@ -329,18 +329,6 @@ public final class IterableAPI: NSObject {
         internalImplementation?.updateCart(items: items)
     }
     
-    /// Tracks what's in the shopping cart (or equivalent) at this point in time
-    ///
-    /// - Parameters:
-    ///     - items: The list of items in the shopping cart to track
-    ///     - dataFields: A `Dictionary` containing any additional information to save along with the event
-    ///
-    /// - SeeAlso: CommerceItem
-    @objc(updateCart:dataFields:)
-    public static func updateCart(items: [CommerceItem], dataFields: [AnyHashable: Any]?) {
-        internalImplementation?.updateCart(items: items, dataFields: dataFields)
-    }
-    
     /// Tracks what's in the shopping cart (or equivalent) at this point in time
     ///
     /// - Parameters:
@@ -350,12 +338,11 @@ public final class IterableAPI: NSObject {
     ///     - onFailure: `OnFailureHandler` to invoke if cart updating fails
     ///
     /// - SeeAlso: CommerceItem
-    @objc(updateCart:dataFields:onSucess:onFailure:)
+    @objc(updateCart:onSuccess:onFailure:)
     public static func updateCart(items: [CommerceItem],
-                                  dataFields: [AnyHashable: Any]?,
-                                  onSucess: OnSuccessHandler,
-                                  onFailure: OnFailureHandler) {
-        internalImplementation?.updateCart(items: items, dataFields: dataFields)
+                                  onSuccess: OnSuccessHandler?,
+                                  onFailure: OnFailureHandler?) {
+        internalImplementation?.updateCart(items: items, onSuccess: onSuccess, onFailure: onFailure)
     }
     
     /// Tracks a purchase
diff --git a/tests/unit-tests/InAppHelperTests.swift b/tests/unit-tests/InAppHelperTests.swift
@@ -107,7 +107,7 @@ class InAppHelperTests: XCTestCase {
             fatalError()
         }
         
-        func updateCart(items: [CommerceItem], dataFields: [AnyHashable : Any]?) -> Future<SendRequestValue, SendRequestError> {
+        func updateCart(items: [CommerceItem]) -> Future<SendRequestValue, SendRequestError> {
             fatalError()
         }
         

Original file line number	Diff line number	Diff line change
`@@ -124,9 +124,8 @@ extension ApiClient: ApiClientProtocol {`
`124`	`124`	`return send(iterableRequestResult: result)`
`125`	`125`	`}`
`126`	`126`
`127`		`- func updateCart(items: [CommerceItem], dataFields: [AnyHashable: Any]?) -> Future<SendRequestValue, SendRequestError> {`
`128`		`- let result = createRequestCreator().flatMap { $0.createUpdateCartRequest(items: items,`
`129`		`- dataFields: dataFields) }`
	`127`	`+ func updateCart(items: [CommerceItem]) -> Future<SendRequestValue, SendRequestError> {`
	`128`	`+ let result = createRequestCreator().flatMap { $0.createUpdateCartRequest(items: items) }`
`130`	`129`
`131`	`130`	`return send(iterableRequestResult: result)`
`132`	`131`	`}`