Merge release/23.6 into trunk (#16315)

Author: iamgabrielma

Modules/Sources/Networking/Model/Product/Product.swift

@@ -766,12 +766,9 @@ public struct Product: Codable, GeneratedCopiable, Equatable, GeneratedFakeable
         try container.encode(password, forKey: .password)
 
         // Metadata
-        var metaDataValuePairs = buildMetaDataValuePairs()
-
-        // Add custom fields to metadata
-        let customFields = buildCustomFields()
-        metaDataValuePairs.append(contentsOf: customFields)
-
+        let metaDataValuePairs = buildMetaDataValuePairs()
+        // Custom fields will not be included in metadata - when updating products.
+        // They are saved separately with `MetaDataStore`.
         // Encode metadata if it's not empty
         if metaDataValuePairs.isEmpty == false {
             try container.encode(metaDataValuePairs, forKey: .metadata)
@@ -785,16 +782,6 @@ public struct Product: Codable, GeneratedCopiable, Equatable, GeneratedFakeable
         }
         return metaDataArray
     }
-
-    // Function to get the custom fields
-    private func buildCustomFields() -> [[String: String]] {
-        var customFieldsArray: [[String: String]] = []
-        for customField in customFields {
-            customFieldsArray.append(["id": "\(customField.metadataID)", "key": customField.key, "value": customField.value.stringValue])
-        }
-        return customFieldsArray
-    }
-
 }
 
 /// Defines all of the Product CodingKeys

Modules/Tests/NetworkingTests/Mapper/ProductMapperTests.swift

@@ -489,7 +489,7 @@ final class ProductMapperTests: XCTestCase {
         XCTAssertEqual(product.customFields.first?.value.stringValue, "10")
     }
 
-    /// Test that metadata and subscription are properly encoded.
+    /// Test that only subscription details are encoded for metadata.
     ///
     func test_metadata_and_subscription_are_properly_encoded() throws {
         // Given
@@ -524,7 +524,7 @@ final class ProductMapperTests: XCTestCase {
         // Then
         XCTAssertNotNil(encodedJSON)
         let encodedMetadata = encodedJSON?["meta_data"] as? [[String: Any]]
-        XCTAssertEqual(encodedMetadata?.count, customFields.count + subscription.toKeyValuePairs().count) // Including subscription metadata
+        XCTAssertEqual(encodedMetadata?.count, subscription.toKeyValuePairs().count) // Including only subscription metadata
         XCTAssertEqual(encodedMetadata?[0]["key"] as? String, "_subscription_length")
         XCTAssertEqual(encodedMetadata?[0]["value"] as? String, subscription.length)
         XCTAssertEqual(encodedMetadata?[1]["key"] as? String, "_subscription_period")
@@ -541,12 +541,6 @@ final class ProductMapperTests: XCTestCase {
         XCTAssertEqual(encodedMetadata?[6]["value"] as? String, subscription.trialPeriod.rawValue)
         XCTAssertEqual(encodedMetadata?[7]["key"] as? String, "_subscription_one_time_shipping")
         XCTAssertEqual(encodedMetadata?[7]["value"] as? String, subscription.oneTimeShipping ? "yes" : "no")
-        XCTAssertEqual(Int64(encodedMetadata?[8]["id"] as? String ?? ""), customFields[0].metadataID)
-        XCTAssertEqual(encodedMetadata?[8]["key"] as? String, customFields[0].key)
-        XCTAssertEqual(encodedMetadata?[8]["value"] as? String, customFields[0].value.stringValue)
-        XCTAssertEqual(Int64(encodedMetadata?[9]["id"] as? String ?? ""), customFields[1].metadataID)
-        XCTAssertEqual(encodedMetadata?[9]["key"] as? String, customFields[1].key)
-        XCTAssertEqual(encodedMetadata?[9]["value"] as? String, customFields[1].value.stringValue)
     }
 
     /// Test that attributes are properly encoded.