Simplify

Author: tapashmajumder

Tests/swift-sdk-swift-tests/IterableNotificationResponseTests.swift

@@ -30,15 +30,17 @@ class IterableNotificationResponseTests: XCTestCase {
         dateProvider.currentDate = Date()
     }
 
-    private func customActionHandler(fromPromise promise: Promise<String, Error>, inContext context:IterableActionContext) -> CustomActionHandler {
+    private static func customActionHandler(fromPromise promise: Promise<String, Error>) -> CustomActionHandler {
         return {(customActionName) in
             promise.resolve(with: customActionName)
             return true
         }
     }
 
-    private func contextToCustomActionHandler(fromPromise promise: Promise<String, Error>) -> (IterableActionContext) -> CustomActionHandler {
-        return IterableUtil.curry(customActionHandler(fromPromise:inContext:))(promise)
+    private static func contextToCustomActionHandler(fromPromise promise: Promise<String, Error>) -> (IterableActionContext) -> CustomActionHandler {
+        return {(context) in
+            customActionHandler(fromPromise: promise)
+        }
     }
 
     func testTrackOpenPushWithCustomAction() {
@@ -61,22 +63,23 @@ class IterableNotificationResponseTests: XCTestCase {
 
         let response = MockNotificationResponse(userInfo: userInfo, actionIdentifier: UNNotificationDefaultActionIdentifier)
         let pushTracker = MockPushTracker()
-        var calledCustomActionName:String?
-        let contextToCustomActionHandler: ((IterableActionContext) -> CustomActionHandler) = {(context) in { (customActionName) in
-                calledCustomActionName = customActionName
-                return true
+        let promise = Promise<String, Error>()
+        promise.observe { (result) in
+            switch (result) {
+            case .error(let error):
+                XCTFail(error.localizedDescription)
+            case .value(let customActionName):
+                XCTAssertEqual(customActionName, "customAction")
             }
         }
-        
+
         let appIntegration = IterableAppIntegrationInternal(tracker: pushTracker,
                                                             versionInfo: MockVersionInfo(version: 10),
                                                             contextToUrlHandler: nil,
-                                                            contextToCustomActionHandler: contextToCustomActionHandler,
+                                                            contextToCustomActionHandler: IterableNotificationResponseTests.contextToCustomActionHandler(fromPromise: promise),
                                                             urlOpener: MockUrlOpener())
         appIntegration.userNotificationCenter(nil, didReceive: response, withCompletionHandler: nil)
 
-        XCTAssertEqual(calledCustomActionName, "customAction");
-        
         XCTAssertEqual(pushTracker.campaignId, 1234)
         XCTAssertEqual(pushTracker.templateId, 4321)
         XCTAssertEqual(pushTracker.messageId, messageId)
@@ -123,7 +126,7 @@ class IterableNotificationResponseTests: XCTestCase {
         let appIntegration = IterableAppIntegrationInternal(tracker: pushTracker,
                                                             versionInfo: MockVersionInfo(version: 10),
                                                             contextToUrlHandler: nil,
-                                                            contextToCustomActionHandler: contextToCustomActionHandler(fromPromise: promise),
+                                                            contextToCustomActionHandler: IterableNotificationResponseTests.contextToCustomActionHandler(fromPromise: promise),
                                                             urlOpener: MockUrlOpener())
         appIntegration.userNotificationCenter(nil, didReceive: response, withCompletionHandler: nil)
 
@@ -163,7 +166,7 @@ class IterableNotificationResponseTests: XCTestCase {
         let appIntegration = IterableAppIntegrationInternal(tracker: pushTracker,
                                                             versionInfo: MockVersionInfo(version: 9),
                                                             contextToUrlHandler: nil,
-                                                            contextToCustomActionHandler: contextToCustomActionHandler(fromPromise: promise),
+                                                            contextToCustomActionHandler: IterableNotificationResponseTests.contextToCustomActionHandler(fromPromise: promise),
                                                             urlOpener: MockUrlOpener())
         appIntegration.application(MockApplicationStateProvider(applicationState: .inactive), didReceiveRemoteNotification: userInfo, fetchCompletionHandler: nil)
 

swift-sdk/IterableActionInterpreter.swift

@@ -107,7 +107,9 @@ struct IterableActionInterpreter {
 
     // it will partially bind urlDelegate and return a mapping from IterableActionContext to UrlHandler
     static func contextToUrlHandler(fromUrlDelegate urlDelegate: IterableURLDelegate?) -> (IterableActionContext) -> UrlHandler {
-        return IterableUtil.curry(urlHandler(fromUrlDelegate: inContext:))(urlDelegate)
+        return {(context) in
+            urlHandler(fromUrlDelegate: urlDelegate, inContext: context)
+        }
     }
 
     // converts from IterableCustomActionDelegate to CustomActionHandler
@@ -124,8 +126,9 @@ struct IterableActionInterpreter {
 
     // it will partially bind customActionDelegate and return a mapping from IterableActionContext to CustomActionHandler
     static func contextToCustomActionHandler(fromCustomActionDelegate customActionDelegate: IterableCustomActionDelegate?) -> (IterableActionContext) -> CustomActionHandler {
-        return IterableUtil.curry(customActionHandler(fromCustomActionDelegate:inContext:))(customActionDelegate)
+        return {(context) in
+            customActionHandler(fromCustomActionDelegate: customActionDelegate, inContext: context)
+        }
     }
-    
 }
 

swift-sdk/IterableUtil.swift

@@ -28,12 +28,6 @@ import os
     static func isNotNullOrEmpty(string: String) -> Bool {
         return !isNullOrEmpty(string: string)
     }
-    
-    // Given a function that maps (x,y) to z,
-    // returns a partial function that maps (y) to z.
-    static func curry<X, Y, Z>(_ f: @escaping (X, Y) -> Z) -> (X) -> ((Y) -> Z) {
-        return { x in { y in f(x, y) } }
-    }
 }
 
 public func ITBError(_ message: String? = nil, file: String = #file, method: String = #function, line: Int = #line) {