Merge pull request #6201 from woocommerce/issue/6030-order-fees-networking

Order Creation: Add support for removing fees from order in Networking layer

Author: rachelmcr

Networking/Networking/Model/Copiable/Models+Copiable.generated.swift

@@ -334,7 +334,7 @@ extension Order {
 extension OrderFeeLine {
     public func copy(
         feeID: CopiableProp<Int64> = .copy,
-        name: CopiableProp<String> = .copy,
+        name: NullableCopiableProp<String> = .copy,
         taxClass: CopiableProp<String> = .copy,
         taxStatus: CopiableProp<OrderFeeTaxStatus> = .copy,
         total: CopiableProp<String> = .copy,

Networking/Networking/Model/OrderFeeLine.swift

@@ -5,7 +5,13 @@ import Codegen
 ///
 public struct OrderFeeLine: Equatable, Codable, GeneratedFakeable, GeneratedCopiable {
     public let feeID: Int64
-    public let name: String
+
+    /// Fee Name
+    ///
+    /// Sending a null value to the REST API removes the Fee Line from the Order.
+    ///
+    public let name: String?
+
     public let taxClass: String
     public let taxStatus: OrderFeeTaxStatus
     public let total: String
@@ -16,7 +22,7 @@ public struct OrderFeeLine: Equatable, Codable, GeneratedFakeable, GeneratedCopi
     /// OrderFeeLine struct initializer.
     ///
     public init(feeID: Int64,
-                name: String,
+                name: String?,
                 taxClass: String,
                 taxStatus: OrderFeeTaxStatus,
                 total: String,

Networking/NetworkingTests/Remote/OrdersRemoteTests.swift

@@ -232,6 +232,28 @@ final class OrdersRemoteTests: XCTestCase {
         assertEqual(received, expected)
     }
 
+    func test_update_order_properly_encodes_fee_lines_for_removal_from_order() throws {
+        // Given
+        let remote = OrdersRemote(network: network)
+        let fee = OrderFeeLine(feeID: 333, name: nil, taxClass: "", taxStatus: .none, total: "12.34", totalTax: "", taxes: [], attributes: [])
+        let order = Order.fake().copy(fees: [fee])
+
+        // When
+        remote.updateOrder(from: 123, order: order, fields: [.fees]) { result in }
+
+        // Then
+        let request = try XCTUnwrap(network.requestsForResponseData.last as? JetpackRequest)
+        let received = try XCTUnwrap(request.parameters["fee_lines"] as? [[String: AnyHashable]]).first
+        let expected: [String: AnyHashable] = [
+            "id": fee.feeID,
+            "name": NSNull(),
+            "tax_status": fee.taxStatus.rawValue,
+            "tax_class": fee.taxClass,
+            "total": fee.total
+        ]
+        assertEqual(expected, received)
+    }
+
 
     // MARK: - Load Order Notes Tests
 
@@ -301,7 +323,7 @@ final class OrdersRemoteTests: XCTestCase {
         let received = try XCTUnwrap(request.parameters["fee_lines"] as? [[String: AnyHashable]]).first
         let expected: [String: AnyHashable] = [
             "id": fee.feeID,
-            "name": fee.name,
+            "name": fee.name ?? "",
             "tax_status": fee.taxStatus.rawValue,
             "tax_class": fee.taxClass,
             "total": fee.total