Update product and variation list view models to remove references to protocol

Author: rachelmcr

WooCommerce/Classes/ViewRelated/Orders/Order Creation/ProductsSection/AddProductToOrderViewModel.swift

@@ -48,7 +48,7 @@ final class AddProductToOrderViewModel: ObservableObject {
 
     /// Current sync status; used to determine what list view to display.
     ///
-    @Published private(set) var syncStatus: AddProductToOrderSyncStatus?
+    @Published private(set) var syncStatus: SyncStatus?
 
     /// SyncCoordinator: Keeps tracks of which pages have been refreshed, and encapsulates the "What should we sync now" logic.
     ///

WooCommerce/Classes/ViewRelated/Orders/Order Creation/ProductsSection/AddProductVariationToOrderViewModel.swift

@@ -1,9 +1,9 @@
 import Yosemite
 import protocol Storage.StorageManagerType
 
-/// View model for `AddProductToOrder` with a list of product variations for a product.
+/// View model for `AddProductVariationToOrder`.
 ///
-final class AddProductVariationToOrderViewModel: AddProductToOrderViewModelProtocol {
+final class AddProductVariationToOrderViewModel: ObservableObject {
     private let siteID: Int64
 
     /// Storage to fetch product variation list
@@ -24,17 +24,17 @@ final class AddProductVariationToOrderViewModel: AddProductToOrderViewModelProto
         productVariationsResultsController.fetchedObjects.filter { $0.purchasable }
     }
 
-    /// View models for each product row
+    /// View models for each product variation row
     ///
-    var productRows: [ProductRowViewModel] {
+    var productVariationRows: [ProductRowViewModel] {
         productVariations.map { .init(productVariation: $0, allAttributes: product.attributesForVariations, canChangeQuantity: false) }
     }
 
     // MARK: Sync & Storage properties
 
     /// Current sync status; used to determine what list view to display.
     ///
-    @Published private(set) var syncStatus: AddProductToOrderSyncStatus?
+    @Published private(set) var syncStatus: SyncStatus?
 
     /// SyncCoordinator: Keeps tracks of which pages have been refreshed, and encapsulates the "What should we sync now" logic.
     ///
@@ -68,7 +68,7 @@ final class AddProductVariationToOrderViewModel: AddProductToOrderViewModelProto
 
     /// Select a product variation to add to the order
     ///
-    func selectProductOrVariation(_ productID: Int64) {
+    func selectVariation(_ productID: Int64) {
         // TODO: Add the selected product variation to the order
     }
 }
@@ -155,3 +155,14 @@ private extension AddProductVariationToOrderViewModel {
         syncingCoordinator.delegate = self
     }
 }
+
+// MARK: - Utils
+extension AddProductVariationToOrderViewModel {
+    /// Represents possible statuses for syncing product variations
+    ///
+    enum SyncStatus {
+        case firstPageSync
+        case results
+        case empty
+    }
+}

WooCommerce/WooCommerceTests/ViewRelated/Orders/Order Creation/AddProductVariationToOrderViewModelTests.swift

@@ -24,7 +24,7 @@ class AddProductVariationToOrderViewModelTests: XCTestCase {
         super.tearDown()
     }
 
-    func test_view_model_adds_product_rows_with_unchangeable_quantity() {
+    func test_view_model_adds_product_variation_rows_with_unchangeable_quantity() {
         // Given
         let product = Product.fake().copy(productID: sampleProductID)
         let productVariation = ProductVariation.fake().copy(siteID: sampleSiteID, productID: sampleProductID, purchasable: true)
@@ -34,13 +34,14 @@ class AddProductVariationToOrderViewModelTests: XCTestCase {
         let viewModel = AddProductVariationToOrderViewModel(siteID: sampleSiteID, product: product, storageManager: storageManager)
 
         // Then
-        XCTAssertEqual(viewModel.productRows.count, 1)
+        XCTAssertEqual(viewModel.productVariationRows.count, 1)
 
-        let productRow = viewModel.productRows[0]
-        XCTAssertFalse(productRow.canChangeQuantity, "Product row canChangeQuantity property should be false but is true instead")
+        let productVariationRow = viewModel.productVariationRows[0]
+        XCTAssertFalse(productVariationRow.canChangeQuantity,
+                       "Product variation row canChangeQuantity property should be false but is true instead")
     }
 
-    func test_product_rows_only_include_purchasable_product_variations() {
+    func test_product_variation_rows_only_include_purchasable_product_variations() {
         // Given
         let product = Product.fake().copy(productID: sampleProductID)
         let purchasableProductVariation = ProductVariation.fake().copy(siteID: sampleSiteID,
@@ -54,8 +55,10 @@ class AddProductVariationToOrderViewModelTests: XCTestCase {
         let viewModel = AddProductVariationToOrderViewModel(siteID: sampleSiteID, product: product, storageManager: storageManager)
 
         // Then
-        XCTAssertTrue(viewModel.productRows.contains(where: { $0.productOrVariationID == 1 }), "Product rows do not include purchasable product variation")
-        XCTAssertFalse(viewModel.productRows.contains(where: { $0.productOrVariationID == 2 }), "Product rows include non-purchasable product variation")
+        XCTAssertTrue(viewModel.productVariationRows.contains(where: { $0.productOrVariationID == 1 }),
+                      "Product variation rows do not include purchasable product variation")
+        XCTAssertFalse(viewModel.productVariationRows.contains(where: { $0.productOrVariationID == 2 }),
+                       "Product variation rows include non-purchasable product variation")
     }
 
     func test_scrolling_indicator_appears_only_during_sync() {