Merge pull request #8736 from woocommerce/feat/8715-product-attributes-migration

[REST API] Migrate product variations and attributes

Author: selanthiraiyan

Networking/Networking.xcodeproj/project.pbxproj

@@ -17,7 +17,11 @@ struct ProductAttributeListMapper: Mapper {
             .siteID: siteID
         ]
 
-        return try decoder.decode(ProductAttributeListEnvelope.self, from: response).productAttributes
+        do {
+            return try decoder.decode(ProductAttributeListEnvelope.self, from: response).productAttributes
+        } catch {
+            return try decoder.decode([ProductAttribute].self, from: response)
+        }
     }
 }
 

Networking/Networking/Mapper/ProductAttributeListMapper.swift

@@ -20,7 +20,11 @@ struct ProductAttributeMapper: Mapper {
             .siteID: siteID
         ]
 
-        return try decoder.decode(ProductAttributeEnvelope.self, from: response).productAttribute
+        do {
+            return try decoder.decode(ProductAttributeEnvelope.self, from: response).productAttribute
+        } catch {
+            return try decoder.decode(ProductAttribute.self, from: response)
+        }
     }
 }
 

Networking/Networking/Mapper/ProductAttributeMapper.swift

@@ -17,7 +17,11 @@ struct ProductAttributeTermListMapper: Mapper {
             .siteID: siteID
         ]
 
-        return try decoder.decode(ProductAttributeTermListEnvelope.self, from: response).productAttributeTerms
+        do {
+            return try decoder.decode(ProductAttributeTermListEnvelope.self, from: response).productAttributeTerms
+        } catch {
+            return try decoder.decode([ProductAttributeTerm].self, from: response)
+        }
     }
 }
 

Networking/Networking/Mapper/ProductAttributeTermListMapper.swift

@@ -18,7 +18,11 @@ struct ProductAttributeTermMapper: Mapper {
             .siteID: siteID
         ]
 
-        return try decoder.decode(ProductAttributeTermEnvelope.self, from: response).productAttributeTerm
+        do {
+            return try decoder.decode(ProductAttributeTermEnvelope.self, from: response).productAttributeTerm
+        } catch {
+            return try decoder.decode(ProductAttributeTerm.self, from: response)
+        }
     }
 }
 

Networking/Networking/Mapper/ProductAttributeTermMapper.swift

@@ -26,7 +26,11 @@ struct ProductVariationListMapper: Mapper {
             .productID: productID
         ]
 
-        return try decoder.decode(ProductVariationsEnvelope.self, from: response).productVariations
+        do {
+            return try decoder.decode(ProductVariationsEnvelope.self, from: response).productVariations
+        } catch {
+            return try decoder.decode([ProductVariation].self, from: response)
+        }
     }
 }
 

Networking/Networking/Mapper/ProductVariationListMapper.swift

@@ -24,7 +24,12 @@ struct ProductVariationMapper: Mapper {
             .siteID: siteID,
             .productID: productID
         ]
-        return try decoder.decode(ProductVariationEnvelope.self, from: response).productVariation
+
+        do {
+            return try decoder.decode(ProductVariationEnvelope.self, from: response).productVariation
+        } catch {
+            return try decoder.decode(ProductVariation.self, from: response)
+        }
     }
 }
 

Networking/Networking/Mapper/ProductVariationMapper.swift

@@ -44,7 +44,11 @@ private struct ProductVariationsEnvelope: Decodable {
     public init(from decoder: Decoder) throws {
         let container = try decoder.container(keyedBy: CodingKeys.self)
 
-        let nestedContainer = try container.nestedContainer(keyedBy: CodingKeys.self, forKey: .data)
-        createdProductVariations = try nestedContainer.decode([ProductVariation].self, forKey: .create)
+        do {
+            let nestedContainer = try container.nestedContainer(keyedBy: CodingKeys.self, forKey: .data)
+            createdProductVariations = try nestedContainer.decode([ProductVariation].self, forKey: .create)
+        } catch {
+            createdProductVariations = try container.decode([ProductVariation].self, forKey: .create)
+        }
     }
 }

Networking/Networking/Mapper/ProductVariationsBulkCreateMapper.swift

@@ -44,7 +44,11 @@ private struct ProductVariationsEnvelope: Decodable {
     public init(from decoder: Decoder) throws {
         let container = try decoder.container(keyedBy: CodingKeys.self)
 
-        let nestedContainer = try container.nestedContainer(keyedBy: CodingKeys.self, forKey: .data)
-        updatedProductVariations = try nestedContainer.decode([ProductVariation].self, forKey: .update)
+        do {
+            let nestedContainer = try container.nestedContainer(keyedBy: CodingKeys.self, forKey: .data)
+            updatedProductVariations = try nestedContainer.decode([ProductVariation].self, forKey: .update)
+        } catch {
+            updatedProductVariations = try container.decode([ProductVariation].self, forKey: .update)
+        }
     }
 }

Networking/Networking/Mapper/ProductVariationsBulkUpdateMapper.swift

@@ -37,7 +37,11 @@ private struct ProductsEnvelope: Decodable {
     public init(from decoder: Decoder) throws {
         let container = try decoder.container(keyedBy: CodingKeys.self)
 
-        let nestedContainer = try container.nestedContainer(keyedBy: CodingKeys.self, forKey: .data)
-        updatedProducts = try nestedContainer.decode([Product].self, forKey: .update)
+        do {
+            let nestedContainer = try container.nestedContainer(keyedBy: CodingKeys.self, forKey: .data)
+            updatedProducts = try nestedContainer.decode([Product].self, forKey: .update)
+        } catch {
+            updatedProducts = try container.decode([Product].self, forKey: .update)
+        }
     }
 }