Merge pull request #7529 from woocommerce/issue/7446-load-orders-shipping-in-list

Load order shipping data in list request

Author: ealeksandrov

Networking/Networking/Remote/OrdersRemote.swift

@@ -32,7 +32,7 @@ public class OrdersRemote: Remote {
                 ParameterKeys.page: String(pageNumber),
                 ParameterKeys.perPage: String(pageSize),
                 ParameterKeys.statusKey: statusesString ?? Defaults.statusAny,
-                ParameterKeys.fields: ParameterValues.listFieldValues,
+                ParameterKeys.fields: ParameterValues.fieldValues,
             ]
 
             if let after = after {
@@ -61,7 +61,7 @@ public class OrdersRemote: Remote {
     ///
     public func loadOrder(for siteID: Int64, orderID: Int64, completion: @escaping (Order?, Error?) -> Void) {
         let parameters = [
-            ParameterKeys.fields: ParameterValues.singleOrderFieldValues
+            ParameterKeys.fields: ParameterValues.fieldValues
         ]
 
         let path = "\(Constants.ordersPath)/\(orderID)"
@@ -105,7 +105,7 @@ public class OrdersRemote: Remote {
             ParameterKeys.page: String(pageNumber),
             ParameterKeys.perPage: String(pageSize),
             ParameterKeys.statusKey: Defaults.statusAny,
-            ParameterKeys.fields: ParameterValues.listFieldValues
+            ParameterKeys.fields: ParameterValues.fieldValues
         ]
 
         let path = Constants.ordersPath
@@ -288,21 +288,13 @@ public extension OrdersRemote {
     }
 
     enum ParameterValues {
-        // Same as singleOrderFieldValues except we exclude the shipping field
-        static let listFieldValues: String = commonOrderFieldValues.joined(separator: ",")
-        static let singleOrderFieldValues: String = (commonOrderFieldValues + singleOrderExtraFieldValues).joined(separator: ",")
+        static let fieldValues: String = commonOrderFieldValues.joined(separator: ",")
         private static let commonOrderFieldValues = [
             "id", "parent_id", "number", "status", "currency", "customer_id", "customer_note", "date_created_gmt", "date_modified_gmt", "date_paid_gmt",
             "discount_total", "discount_tax", "shipping_total", "shipping_tax", "total", "total_tax", "payment_method", "payment_method_title",
-            "payment_url", "line_items", "billing", "coupon_lines", "shipping_lines", "refunds", "fee_lines", "order_key", "tax_lines", "meta_data",
+            "payment_url", "line_items", "shipping", "billing", "coupon_lines", "shipping_lines", "refunds", "fee_lines", "order_key", "tax_lines", "meta_data",
             "is_editable", "needs_payment", "needs_processing"
         ]
-        // Use with caution. Any fields in here will be overwritten with empty values by
-        // `Order+ReadOnlyConvertible.swift: Order.update(with:)` when the list of orders is fetched.
-        // See p91TBi-7yL-p2 for discussion.
-        private static let singleOrderExtraFieldValues = [
-            "shipping"
-        ]
     }
 
     /// Order fields supported for update

Networking/NetworkingTests/Remote/OrdersRemoteTests.swift

@@ -40,12 +40,10 @@ final class OrdersRemoteTests: XCTestCase {
     ///
     func test_order_fields_parameter_values_do_not_contain_whitespace() throws {
         // When
-        let orderListFieldsValue = OrdersRemote.ParameterValues.listFieldValues
-        let orderFieldsValue = OrdersRemote.ParameterValues.singleOrderFieldValues
+        let fieldValues = OrdersRemote.ParameterValues.fieldValues
 
         // Then
-        XCTAssertFalse(orderListFieldsValue.contains(" "))
-        XCTAssertFalse(orderFieldsValue.contains(" "))
+        XCTAssertFalse(fieldValues.contains(" "))
     }
 
     // MARK: - Load All Orders Tests