Reorder signature

Author: roninopf

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

@@ -616,11 +616,11 @@ class IterableAPITests: XCTestCase {
 
     func testUpdateSubscriptions() {
         let expectation1 = expectation(description: "update subscriptions")
-        let campaignId = NSNumber(value: 23)
-        let templateId = NSNumber(value: 10)
         let emailListIds = [NSNumber(value: 382)]
         let unsubscriptedChannelIds = [NSNumber(value: 7845), NSNumber(value: 1048)]
         let unsubscribedMessageTypeIds = [NSNumber(value: 5671), NSNumber(value: 9087)]
+        let campaignId = NSNumber(value: 23)
+        let templateId = NSNumber(value: 10)
 
         let networkSession = MockNetworkSession(statusCode: 200)
         networkSession.callback = {(_,_,_) in
@@ -631,17 +631,22 @@ class IterableAPITests: XCTestCase {
                                queryParams: [])
 
             let body = networkSession.getRequestBody() as! [String : Any]
-            TestUtils.validateMatch(keyPath: KeyPath(AnyHashable.ITBL_KEY_CAMPAIGN_ID), value: campaignId, inDictionary: body)
-            TestUtils.validateMatch(keyPath: KeyPath(AnyHashable.ITBL_KEY_TEMPLATE_ID), value: templateId, inDictionary: body)
             TestUtils.validateMatch(keyPath: KeyPath(AnyHashable.ITBL_KEY_EMAIL_LIST_IDS), value: emailListIds, inDictionary: body)
             TestUtils.validateMatch(keyPath: KeyPath(AnyHashable.ITBL_KEY_UNSUB_CHANNEL), value: unsubscriptedChannelIds, inDictionary: body)
             TestUtils.validateMatch(keyPath: KeyPath(AnyHashable.ITBL_KEY_UNSUB_MESSAGE), value: unsubscribedMessageTypeIds, inDictionary: body)
+            TestUtils.validateMatch(keyPath: KeyPath(AnyHashable.ITBL_KEY_CAMPAIGN_ID), value: campaignId, inDictionary: body)
+            TestUtils.validateMatch(keyPath: KeyPath(AnyHashable.ITBL_KEY_TEMPLATE_ID), value: templateId, inDictionary: body)
             expectation1.fulfill()
         }
         let config = IterableConfig()
         TestUtils.getTestUserDefaults().set("[email protected]", forKey: .ITBL_USER_DEFAULTS_EMAIL_KEY)
         IterableAPI.initializeForTesting(apiKey: IterableAPITests.apiKey, config:config, networkSession: networkSession)
-        IterableAPI.updateSubscriptions(campaignId: campaignId, templateId: templateId, emailListIds: emailListIds, unsubscribedChannelIds: unsubscriptedChannelIds, unsubscribedMessageTypeIds: unsubscribedMessageTypeIds, subscribedMessageTypeIds: nil)
+        IterableAPI.updateSubscriptions(emailListIds,
+                                        unsubscribedChannelIds: unsubscriptedChannelIds,
+                                        unsubscribedMessageTypeIds: unsubscribedMessageTypeIds,
+                                        subscribedMessageTypeIds: nil,
+                                        campaignId: campaignId,
+                                        templateId: templateId)
         wait(for: [expectation1], timeout: testExpectationTimeout)
     }
 

swift-sdk/Internal/IterableAPIInternal.swift

@@ -383,18 +383,15 @@ final class IterableAPIInternal : NSObject, PushTrackerProtocol {
         }
     }
 
-    func updateSubscriptions(campaignId: NSNumber?, templateId: NSNumber?, emailListIds: [NSNumber]?, unsubscribedChannelIds: [NSNumber]?, unsubscribedMessageTypeIds: [NSNumber]?, subscribedMessageTypeIds: [NSNumber]?) {
+    func updateSubscriptions(_ emailListIds: [NSNumber]? = nil,
+                             unsubscribedChannelIds: [NSNumber]? = nil,
+                             unsubscribedMessageTypeIds: [NSNumber]? = nil,
+                             subscribedMessageTypeIds: [NSNumber]? = nil,
+                             campaignId: NSNumber? = nil,
+                             templateId: NSNumber? = nil) {
         var dictionary = [AnyHashable : Any]()
         addEmailOrUserId(args: &dictionary)
 
-        if let campaignId = campaignId?.intValue {
-            dictionary[.ITBL_KEY_CAMPAIGN_ID] = campaignId
-        }
-        
-        if let templateId = templateId?.intValue {
-            dictionary[.ITBL_KEY_TEMPLATE_ID] = templateId
-        }
-        
         if let emailListIds = emailListIds {
             dictionary[.ITBL_KEY_EMAIL_LIST_IDS] = emailListIds
         }
@@ -411,6 +408,14 @@ final class IterableAPIInternal : NSObject, PushTrackerProtocol {
             dictionary[.ITBL_KEY_SUB_MESSAGE] = subscribedMessageTypeIds
         }
 
+        if let campaignId = campaignId?.intValue {
+            dictionary[.ITBL_KEY_CAMPAIGN_ID] = campaignId
+        }
+        
+        if let templateId = templateId?.intValue {
+            dictionary[.ITBL_KEY_TEMPLATE_ID] = templateId
+        }
+        
         if let request = createPostRequest(forPath: .ITBL_PATH_UPDATE_SUBSCRIPTIONS, withBody: dictionary) {
             sendRequest(request, onSuccess: IterableAPIInternal.defaultOnSucess(identifier: "updateSubscriptions"), onFailure: IterableAPIInternal.defaultOnFailure(identifier: "updateSubscriptions"))
         }

swift-sdk/IterableAPI.swift

@@ -353,8 +353,19 @@ public final class IterableAPI : NSObject {
 
      - remark: passing in an empty array will clear subscription list, passing in nil will not modify the list
      */
-    @objc(updateSubscriptions:templateId:emailListIds:unsubscribedChannelIds:unsubscribedMessageTypeIds:subscribedMessageTypeIds:) public static func updateSubscriptions(campaignId: NSNumber?, templateId: NSNumber?, emailListIds: [NSNumber]?, unsubscribedChannelIds: [NSNumber]?, unsubscribedMessageTypeIds: [NSNumber]?, subscribedMessageTypeIds: [NSNumber]?) {
-        internalImplementation?.updateSubscriptions(campaignId: campaignId, templateId: templateId, emailListIds: emailListIds, unsubscribedChannelIds: unsubscribedChannelIds, unsubscribedMessageTypeIds: unsubscribedMessageTypeIds, subscribedMessageTypeIds: subscribedMessageTypeIds)
+    @objc(updateSubscriptions:unsubscribedChannelIds:unsubscribedMessageTypeIds:subscribedMessageTypeIds:campaignIds:templateId:)
+    public static func updateSubscriptions(_ emailListIds: [NSNumber]?,
+                                           unsubscribedChannelIds: [NSNumber]?,
+                                           unsubscribedMessageTypeIds: [NSNumber]?,
+                                           subscribedMessageTypeIds: [NSNumber]?,
+                                           campaignId: NSNumber?,
+                                           templateId: NSNumber?) {
+        internalImplementation?.updateSubscriptions(emailListIds,
+                                                    unsubscribedChannelIds: unsubscribedChannelIds,
+                                                    unsubscribedMessageTypeIds: unsubscribedMessageTypeIds,
+                                                    subscribedMessageTypeIds: subscribedMessageTypeIds,
+                                                    campaignId: campaignId,
+                                                    templateId: templateId)
     }
 
     //MARK: In-App Notifications