EditorServiceRemote: Handle bulk response as [String: String]

SiteID is a String instead of a number in the response object.

Author: etoledom

WordPressKit/EditorServiceRemote.swift

@@ -29,13 +29,18 @@ public class EditorServiceRemote: ServiceRemoteWordPressComREST {
         ] as [String: AnyObject]
 
         wordPressComRestApi.POST(path, parameters: parameters, success: { (responseObject, httpResponse) in
-            guard let response = responseObject as? [Int: String] else {
+            guard let response = responseObject as? [String: String] else {
                 if let boolResponse = responseObject as? Bool, boolResponse == false {
                     return failure(EditorSettings.Error.badRequest)
                 }
                 return failure(EditorSettings.Error.badResponse)
             }
-            let mappedResponse = response.compactMapValues(EditorSettings.Mobile.init)
+
+            let mappedResponse = response.reduce(into: [Int: EditorSettings.Mobile](), { (result, response) in
+                if let id = Int(response.key), let editor = EditorSettings.Mobile(rawValue: response.value) {
+                    result[id] = editor
+                }
+            })
             success(mappedResponse)
         }) { (error, httpError) in
             failure(error)

WordPressKitTests/EditorServiceRemoteTests.swift

@@ -184,10 +184,9 @@ class EditorServiceRemoteTests: XCTestCase {
         let expec = expectation(description: "success")
         let editor = EditorSettings.Mobile.gutenberg
 
-        //TODO: Response not yet clear
-        let response: [Int: String] = [
-            1: editor.rawValue,
-            2: editor.rawValue,
+        let response: [String: String] = [
+            "1": editor.rawValue,
+            "2": editor.rawValue,
         ]
 
         let expected: [Int: EditorSettings.Mobile] = [
@@ -199,7 +198,7 @@ class EditorServiceRemoteTests: XCTestCase {
             XCTAssertEqual($0, expected)
             expec.fulfill()
         }) { (error) in
-            XCTFail("This call should error")
+            XCTFail("This call should NOT error")
             expec.fulfill()
         }
 
@@ -213,10 +212,9 @@ class EditorServiceRemoteTests: XCTestCase {
         let expec = expectation(description: "success")
         let editor = EditorSettings.Mobile.aztec
 
-        //TODO: Response not yet clear
-        let response: [Int: String] = [
-            1: editor.rawValue,
-            2: editor.rawValue,
+        let response: [String: String] = [
+            "1": editor.rawValue,
+            "2": editor.rawValue,
         ]
 
         let expected: [Int: EditorSettings.Mobile] = [
@@ -228,7 +226,7 @@ class EditorServiceRemoteTests: XCTestCase {
             XCTAssertEqual($0, expected)
             expec.fulfill()
         }) { (error) in
-            XCTFail("This call should error")
+            XCTFail("This call should NOT error")
             expec.fulfill()
         }