Merge branch 'trunk' into feat/8679-replace-rest-api-feature-flag-with-ab-test

Author: selanthiraiyan

Networking/Networking.xcodeproj/project.pbxproj

@@ -22,7 +22,12 @@ struct NewShipmentTrackingMapper: Mapper {
             .siteID: siteID,
             .orderID: orderID
         ]
-        return try decoder.decode(NewShipmentTrackingMapperEnvelope.self, from: response).shipmentTracking
+
+        do {
+            return try decoder.decode(NewShipmentTrackingMapperEnvelope.self, from: response).shipmentTracking
+        } catch {
+            return try decoder.decode(ShipmentTracking.self, from: response)
+        }
     }
 }
 

Networking/Networking/Mapper/NewShipmentTrackingMapper.swift

@@ -17,7 +17,11 @@ struct ProductShippingClassListMapper: Mapper {
             .siteID: siteID
         ]
 
-        return try decoder.decode(ProductShippingClassListEnvelope.self, from: response).data
+        do {
+            return try decoder.decode(ProductShippingClassListEnvelope.self, from: response).data
+        } catch {
+            return try decoder.decode([ProductShippingClass].self, from: response)
+        }
     }
 }
 

Networking/Networking/Mapper/ProductShippingClassListMapper.swift

@@ -17,7 +17,11 @@ struct ProductShippingClassMapper: Mapper {
             .siteID: siteID
         ]
 
-        return try decoder.decode(ProductShippingClassEnvelope.self, from: response).productShippingClass
+        do {
+            return try decoder.decode(ProductShippingClassEnvelope.self, from: response).productShippingClass
+        } catch {
+            return try decoder.decode(ProductShippingClass.self, from: response)
+        }
     }
 }
 

Networking/Networking/Mapper/ProductShippingClassMapper.swift

@@ -21,7 +21,11 @@ struct ProductTagListMapper: Mapper {
 
         switch responseType {
           case .load:
-            return try decoder.decode(ProductTagListEnvelope.self, from: response).tags
+            do {
+                return try decoder.decode(ProductTagListEnvelope.self, from: response).tags
+            } catch {
+                return try decoder.decode([ProductTag].self, from: response)
+            }
           case .create:
             return try decoder.decode(ProductTagListBatchCreateEnvelope.self, from: response).tags
           case .delete:
@@ -59,10 +63,16 @@ private struct ProductTagListBatchCreateEnvelope: Decodable {
 
     init(from decoder: Decoder) throws {
         let container = try? decoder.container(keyedBy: CodingKeys.self)
-        let nestedContainer = try? container?.nestedContainer(keyedBy: CodingKeys.self, forKey: .data)
 
-        let productTagsCreated: [ProductTagFromBatchCreation]? = nestedContainer?.failsafeDecodeIfPresent(Array<ProductTagFromBatchCreation>.self,
-                                                                                                          forKey: .create)
+        let productTagsCreated: [ProductTagFromBatchCreation]?
+        do {
+            let nestedContainer = try container?.nestedContainer(keyedBy: CodingKeys.self, forKey: .data)
+            productTagsCreated = nestedContainer?.failsafeDecodeIfPresent(Array<ProductTagFromBatchCreation>.self,
+                                                                          forKey: .create)
+        } catch {
+            productTagsCreated = container?.failsafeDecodeIfPresent(Array<ProductTagFromBatchCreation>.self,
+                                                                    forKey: .create)
+        }
         tags = productTagsCreated?
             .filter { $0.error == nil }
             .compactMap { (tagCreated) -> ProductTag? in
@@ -88,9 +98,12 @@ private struct ProductTagListBatchDeleteEnvelope: Decodable {
 
     init(from decoder: Decoder) throws {
         let container = try? decoder.container(keyedBy: CodingKeys.self)
-        let nestedContainer = try? container?.nestedContainer(keyedBy: CodingKeys.self, forKey: .data)
-
-        tags = nestedContainer?.failsafeDecodeIfPresent(Array<ProductTag>.self, forKey: .delete) ?? []
+        do {
+            let nestedContainer = try container?.nestedContainer(keyedBy: CodingKeys.self, forKey: .data)
+            tags = nestedContainer?.failsafeDecodeIfPresent(Array<ProductTag>.self, forKey: .delete) ?? []
+        } catch {
+            tags = container?.failsafeDecodeIfPresent(Array<ProductTag>.self, forKey: .delete) ?? []
+        }
     }
 
     private enum CodingKeys: String, CodingKey {

Networking/Networking/Mapper/ProductTagListMapper.swift

@@ -27,7 +27,11 @@ struct ShipmentTrackingListMapper: Mapper {
             .orderID: orderID
         ]
 
-        return try decoder.decode(ShipmentTrackingListEnvelope.self, from: response).shipmentTrackings
+        do {
+            return try decoder.decode(ShipmentTrackingListEnvelope.self, from: response).shipmentTrackings
+        } catch {
+            return try decoder.decode([ShipmentTracking].self, from: response)
+        }
     }
 }
 

Networking/Networking/Mapper/ShipmentTrackingListMapper.swift

@@ -11,8 +11,13 @@ struct ShipmentTrackingProviderListMapper: Mapper {
 
     func map(response: Data) throws -> [ShipmentTrackingProviderGroup] {
         let decoder = JSONDecoder()
-        let rawDictionary = try? decoder.decode(ShipmentTrackingProviderListEnvelope.self, from: response).rawData
-        return rawDictionary?.map({ ShipmentTrackingProviderGroup(name: $0.key, siteID: siteID, dictionary: $0.value) }) ?? []
+        let rawDictionary: ShipmentTrackingProviderListEnvelope.RawData
+        do {
+            rawDictionary = try decoder.decode(ShipmentTrackingProviderListEnvelope.self, from: response).rawData
+        } catch {
+            rawDictionary = try decoder.decode(ShipmentTrackingProviderListEnvelope.RawData.self, from: response)
+        }
+        return rawDictionary.map({ ShipmentTrackingProviderGroup(name: $0.key, siteID: siteID, dictionary: $0.value) })
     }
 }
 
@@ -21,7 +26,9 @@ struct ShipmentTrackingProviderListMapper: Mapper {
 /// the providers within a `data` key.
 ///
 private struct ShipmentTrackingProviderListEnvelope: Decodable {
-    let rawData: [String: [String: String]]
+    typealias RawData = [String: [String: String]]
+
+    let rawData: RawData
 
     private enum CodingKeys: String, CodingKey {
         case rawData = "data"

Networking/Networking/Mapper/ShipmentTrackingProviderListMapper.swift

@@ -18,7 +18,11 @@ struct TaxClassListMapper: Mapper {
             .siteID: siteID
         ]
 
-        return try decoder.decode(TaxClassListEnvelope.self, from: response).taxClasses
+        do {
+            return try decoder.decode(TaxClassListEnvelope.self, from: response).taxClasses
+        } catch {
+            return try decoder.decode([TaxClass].self, from: response)
+        }
     }
 }
 

Networking/Networking/Mapper/TaxClassListMapper.swift

@@ -26,7 +26,12 @@ public class ProductShippingClassRemote: Remote {
         ]
 
         let path = "\(Path.models)"
-        let request = JetpackRequest(wooApiVersion: .mark3, method: .get, siteID: siteID, path: path, parameters: parameters)
+        let request = JetpackRequest(wooApiVersion: .mark3,
+                                     method: .get,
+                                     siteID: siteID,
+                                     path: path,
+                                     parameters: parameters,
+                                     availableAsRESTRequest: true)
         let mapper = ProductShippingClassListMapper(siteID: siteID)
         enqueue(request, mapper: mapper, completion: completion)
     }
@@ -41,7 +46,12 @@ public class ProductShippingClassRemote: Remote {
     ///
     public func loadOne(for siteID: Int64, remoteID: Int64, completion: @escaping (ProductShippingClass?, Error?) -> Void) {
         let path = "\(Path.models)/\(remoteID)"
-        let request = JetpackRequest(wooApiVersion: .mark3, method: .get, siteID: siteID, path: path, parameters: nil)
+        let request = JetpackRequest(wooApiVersion: .mark3,
+                                     method: .get,
+                                     siteID: siteID,
+                                     path: path,
+                                     parameters: nil,
+                                     availableAsRESTRequest: true)
         let mapper = ProductShippingClassMapper(siteID: siteID)
 
         enqueue(request, mapper: mapper, completion: completion)

Networking/Networking/Remote/ProductShippingClassRemote.swift

@@ -25,7 +25,12 @@ public final class ProductTagsRemote: Remote {
         ]
 
         let path = Path.tags
-        let request = JetpackRequest(wooApiVersion: .mark3, method: .get, siteID: siteID, path: path, parameters: parameters)
+        let request = JetpackRequest(wooApiVersion: .mark3,
+                                     method: .get,
+                                     siteID: siteID,
+                                     path: path,
+                                     parameters: parameters,
+                                     availableAsRESTRequest: true)
         let mapper = ProductTagListMapper(siteID: siteID, responseType: .load)
 
         enqueue(request, mapper: mapper, completion: completion)
@@ -47,7 +52,12 @@ public final class ProductTagsRemote: Remote {
         ]
 
         let path = Path.tagsBatch
-        let request = JetpackRequest(wooApiVersion: .mark3, method: .post, siteID: siteID, path: path, parameters: parameters)
+        let request = JetpackRequest(wooApiVersion: .mark3,
+                                     method: .post,
+                                     siteID: siteID,
+                                     path: path,
+                                     parameters: parameters,
+                                     availableAsRESTRequest: true)
         let mapper = ProductTagListMapper(siteID: siteID, responseType: .create)
 
         enqueue(request, mapper: mapper, completion: completion)
@@ -69,7 +79,12 @@ public final class ProductTagsRemote: Remote {
         ]
 
         let path = Path.tagsBatch
-        let request = JetpackRequest(wooApiVersion: .mark3, method: .post, siteID: siteID, path: path, parameters: parameters)
+        let request = JetpackRequest(wooApiVersion: .mark3,
+                                     method: .post,
+                                     siteID: siteID,
+                                     path: path,
+                                     parameters: parameters,
+                                     availableAsRESTRequest: true)
         let mapper = ProductTagListMapper(siteID: siteID, responseType: .delete)
 
         enqueue(request, mapper: mapper, completion: completion)