Handle changes to package response on shipping label purchase form

Author: rachelmcr

WooCommerce/Classes/ViewRelated/Orders/Order Details/Shipping Labels/Create Shipping Label Form/Package Details/ShippingLabelPackageDetails.swift

@@ -8,7 +8,7 @@ struct ShippingLabelPackageDetails: View {
 
     /// Completion callback
     ///
-    typealias Completion = (_ selectedPackageID: String?, _ totalPackageWeight: String?) -> Void
+    typealias Completion = (_ packagesResponse: ShippingLabelPackagesResponse?, _ selectedPackageID: String?, _ totalPackageWeight: String?) -> Void
     private let onCompletion: Completion
 
     init(viewModel: ShippingLabelPackageDetailsViewModel, completion: @escaping Completion) {
@@ -82,7 +82,7 @@ struct ShippingLabelPackageDetails: View {
         .navigationBarItems(trailing: Button(action: {
             ServiceLocator.analytics.track(.shippingLabelPurchaseFlow,
                                            withProperties: ["state": "packages_selected"])
-            onCompletion(viewModel.selectedPackageID, viewModel.totalWeight)
+            onCompletion(viewModel.packagesResponse, viewModel.selectedPackageID, viewModel.totalWeight)
             presentation.wrappedValue.dismiss()
         }, label: {
             Text(Localization.doneButton)
@@ -120,12 +120,12 @@ struct ShippingLabelPackageDetails_Previews: PreviewProvider {
                                                              selectedPackageID: nil,
                                                              totalWeight: nil)
 
-        ShippingLabelPackageDetails(viewModel: viewModel, completion: { (selectedPackageID, totalPackageWeight) in
+        ShippingLabelPackageDetails(viewModel: viewModel, completion: { (_, _, _) in
         })
         .environment(\.colorScheme, .light)
         .previewDisplayName("Light")
 
-        ShippingLabelPackageDetails(viewModel: viewModel, completion: { (selectedPackageID, totalPackageWeight) in
+        ShippingLabelPackageDetails(viewModel: viewModel, completion: { (_, _, _) in
         })
         .environment(\.colorScheme, .dark)
         .previewDisplayName("Dark")

WooCommerce/Classes/ViewRelated/Orders/Order Details/Shipping Labels/Create Shipping Label Form/ShippingLabelFormViewController.swift

@@ -422,8 +422,10 @@ private extension ShippingLabelFormViewController {
                                                       packagesResponse: viewModel.packagesResponse,
                                                       selectedPackageID: selectedPackageID,
                                                       totalWeight: totalPackageWeight)
-        let packageDetails = ShippingLabelPackageDetails(viewModel: vm) { [weak self] (selectedPackageID, totalPackageWeight) in
-            self?.viewModel.handlePackageDetailsValueChanges(selectedPackageID: selectedPackageID, totalPackageWeight: totalPackageWeight)
+        let packageDetails = ShippingLabelPackageDetails(viewModel: vm) { [weak self] (packagesResponse, selectedPackageID, totalPackageWeight) in
+            self?.viewModel.handlePackageDetailsValueChanges(packagesResponse: packagesResponse,
+                                                             selectedPackageID: selectedPackageID,
+                                                             totalPackageWeight: totalPackageWeight)
         }
 
         let hostingVC = UIHostingController(rootView: packageDetails)

WooCommerce/Classes/ViewRelated/Orders/Order Details/Shipping Labels/Create Shipping Label Form/ShippingLabelFormViewModel.swift

@@ -196,7 +196,8 @@ final class ShippingLabelFormViewModel {
         }
     }
 
-    func handlePackageDetailsValueChanges(selectedPackageID: String?, totalPackageWeight: String?) {
+    func handlePackageDetailsValueChanges(packagesResponse: ShippingLabelPackagesResponse?, selectedPackageID: String?, totalPackageWeight: String?) {
+        self.packagesResponse = packagesResponse
         self.selectedPackageID = selectedPackageID
         self.totalPackageWeight = totalPackageWeight
 

WooCommerce/WooCommerceTests/ViewRelated/Shipping Label/Create Shipping Label/ShippingLabelFormViewModelTests.swift

@@ -169,13 +169,17 @@ final class ShippingLabelFormViewModelTests: XCTestCase {
         let shippingLabelFormViewModel = ShippingLabelFormViewModel(order: MockOrders().makeOrder(),
                                                                     originAddress: nil,
                                                                     destinationAddress: nil)
+        let expectedPackageResponse = ShippingLabelPackagesResponse.fake()
         let expectedPackageID = "my-package-id"
         let expectedPackageWeight = "55"
 
         // When
-        shippingLabelFormViewModel.handlePackageDetailsValueChanges(selectedPackageID: expectedPackageID, totalPackageWeight: expectedPackageWeight)
+        shippingLabelFormViewModel.handlePackageDetailsValueChanges(packagesResponse: expectedPackageResponse,
+                                                                    selectedPackageID: expectedPackageID,
+                                                                    totalPackageWeight: expectedPackageWeight)
 
         // Then
+        XCTAssertEqual(shippingLabelFormViewModel.packagesResponse, expectedPackageResponse)
         XCTAssertEqual(shippingLabelFormViewModel.selectedPackageID, expectedPackageID)
         XCTAssertEqual(shippingLabelFormViewModel.totalPackageWeight, expectedPackageWeight)
     }
@@ -197,7 +201,9 @@ final class ShippingLabelFormViewModelTests: XCTestCase {
         XCTAssertNotNil(shippingLabelFormViewModel.selectedRate)
 
         // When
-        shippingLabelFormViewModel.handlePackageDetailsValueChanges(selectedPackageID: expectedPackageID, totalPackageWeight: expectedPackageWeight)
+        shippingLabelFormViewModel.handlePackageDetailsValueChanges(packagesResponse: ShippingLabelPackagesResponse.fake(),
+                                                                    selectedPackageID: expectedPackageID,
+                                                                    totalPackageWeight: expectedPackageWeight)
 
         // Then
         XCTAssertNil(shippingLabelFormViewModel.selectedRate)
@@ -229,7 +235,9 @@ final class ShippingLabelFormViewModelTests: XCTestCase {
         XCTAssertNotNil(shippingLabelFormViewModel.selectedRate)
 
         // When
-        shippingLabelFormViewModel.handlePackageDetailsValueChanges(selectedPackageID: expectedPackageID, totalPackageWeight: expectedPackageWeight)
+        shippingLabelFormViewModel.handlePackageDetailsValueChanges(packagesResponse: ShippingLabelPackagesResponse.fake(),
+                                                                    selectedPackageID: expectedPackageID,
+                                                                    totalPackageWeight: expectedPackageWeight)
 
         // Then
         XCTAssertEqual(shippingLabelFormViewModel.customsForms.first?.packageID, expectedPackageID)
@@ -865,7 +873,9 @@ final class ShippingLabelFormViewModelTests: XCTestCase {
         // When
         viewModel.handleOriginAddressValueChanges(address: MockShippingLabelAddress.sampleAddress(phone: "0123456789", country: "US"), validated: true)
         viewModel.handleDestinationAddressValueChanges(address: MockShippingLabelAddress.sampleAddress(country: "VN"), validated: true)
-        viewModel.handlePackageDetailsValueChanges(selectedPackageID: expectedPackageID, totalPackageWeight: "55")
+        viewModel.handlePackageDetailsValueChanges(packagesResponse: ShippingLabelPackagesResponse.fake(),
+                                                   selectedPackageID: expectedPackageID,
+                                                   totalPackageWeight: "55")
 
         // Then
         let defaultForms = viewModel.customsForms