Initialize VM with required data and receive Product entity in convenience init

Author: rachelmcr

WooCommerce/Classes/ViewRelated/Orders/Order Creation/NewOrder.swift

@@ -95,7 +95,14 @@ private struct ProductsSection: View {
                     .headlineStyle()
 
                 // TODO: Add a product row for each product added to the order
-                let viewModel = ProductRowViewModel(product: ProductRowViewModel.sampleProduct, canChangeQuantity: true) // Temporary view model
+                let viewModel = ProductRowViewModel(id: 1,
+                                                    name: "Love Ficus",
+                                                    sku: "123456",
+                                                    price: "20",
+                                                    stockStatusKey: "instock",
+                                                    stockQuantity: 7,
+                                                    manageStock: true,
+                                                    canChangeQuantity: true) // Temporary view model with fake data
                 ProductRow(viewModel: viewModel)
 
                 Button(NewOrder.Localization.addProduct) {

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

@@ -13,7 +13,14 @@ struct AddProduct: View {
                 // TODO: Make the product list searchable
                 LazyVStack {
                     // TODO: Add a product row for each non-variable product in the store
-                    let viewModel = ProductRowViewModel(product: ProductRowViewModel.sampleProduct, canChangeQuantity: false) // Temporary view model
+                    let viewModel = ProductRowViewModel(id: 1,
+                                                        name: "Love Ficus",
+                                                        sku: "123456",
+                                                        price: "20",
+                                                        stockStatusKey: "instock",
+                                                        stockQuantity: 7,
+                                                        manageStock: true,
+                                                        canChangeQuantity: false) // Temporary view model with fake data
                     ProductRow(viewModel: viewModel)
                 }
                 .padding()

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

@@ -25,7 +25,7 @@ struct ProductRow: View {
 
                     // Product details
                     VStack(alignment: .leading) {
-                        Text(viewModel.nameLabel)
+                        Text(viewModel.name)
                         Text(viewModel.stockAndPriceLabel)
                             .subheadlineStyle()
                         Text(viewModel.skuLabel)
@@ -114,14 +114,28 @@ private enum Localization {
 
 struct ProductRow_Previews: PreviewProvider {
     static var previews: some View {
-        let viewModel = ProductRowViewModel(product: ProductRowViewModel.sampleProduct, canChangeQuantity: true)
-        let viewModel2 = ProductRowViewModel(product: ProductRowViewModel.sampleProduct, canChangeQuantity: false)
+        let viewModel = ProductRowViewModel(id: 1,
+                                            name: "Love Ficus",
+                                            sku: "123456",
+                                            price: "20",
+                                            stockStatusKey: "instock",
+                                            stockQuantity: 7,
+                                            manageStock: true,
+                                            canChangeQuantity: true)
+        let viewModelWithoutStepper = ProductRowViewModel(id: 1,
+                                                          name: "Love Ficus",
+                                                          sku: "123456",
+                                                          price: "20",
+                                                          stockStatusKey: "instock",
+                                                          stockQuantity: 7,
+                                                          manageStock: true,
+                                                          canChangeQuantity: false)
 
         ProductRow(viewModel: viewModel)
             .previewDisplayName("ProductRow with stepper")
             .previewLayout(.sizeThatFits)
 
-        ProductRow(viewModel: viewModel2)
+        ProductRow(viewModel: viewModelWithoutStepper)
             .previewDisplayName("ProductRow without stepper")
             .previewLayout(.sizeThatFits)
     }

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

@@ -4,25 +4,43 @@ import Yosemite
 /// View model for `ProductRow`.
 ///
 final class ProductRowViewModel: ObservableObject, Identifiable {
+    private let currencyFormatter: CurrencyFormatter
+
+    /// Whether the product quantity can be changed.
+    /// Controls whether the stepper is rendered.
+    ///
+    let canChangeQuantity: Bool
+
+    // MARK: Product properties
+
     /// Product ID
     /// Required by SwiftUI as a unique identifier
     ///
     let id: Int64
 
-    private let currencyFormatter: CurrencyFormatter
+    /// Product name
+    ///
+    let name: String
 
-    /// Whether the product quantity can be changed.
-    /// Controls whether the stepper is rendered.
+    /// Product SKU
     ///
-    let canChangeQuantity: Bool
+    private let sku: String?
+
+    /// Product price
+    ///
+    private let price: String
+
+    /// Product stock status
+    ///
+    private let stockStatus: ProductStockStatus
 
-    /// Product to display
+    /// Product stock quantity
     ///
-    private let product: Product
+    private let stockQuantity: Decimal?
 
-    /// Label showing product name
+    /// Whether the product's stock quantity is managed
     ///
-    let nameLabel: String
+    private let manageStock: Bool
 
     /// Label showing product stock status and price.
     ///
@@ -38,7 +56,7 @@ final class ProductRowViewModel: ObservableObject, Identifiable {
     /// Label showing product SKU
     ///
     lazy var skuLabel: String = {
-        guard let sku = product.sku, sku.isNotEmpty else {
+        guard let sku = sku, sku.isNotEmpty else {
             return ""
         }
         return String.localizedStringWithFormat(Localization.skuFormat, sku)
@@ -48,36 +66,60 @@ final class ProductRowViewModel: ObservableObject, Identifiable {
     ///
     @Published var quantity: Int64 = 1
 
-    init(product: Product,
+    init(id: Int64,
+         name: String,
+         sku: String?,
+         price: String,
+         stockStatusKey: String,
+         stockQuantity: Decimal?,
+         manageStock: Bool,
          canChangeQuantity: Bool,
          currencyFormatter: CurrencyFormatter = CurrencyFormatter(currencySettings: ServiceLocator.currencySettings)) {
-        self.id = product.productID
-        self.product = product
-        self.nameLabel = product.name
+        self.id = id
+        self.name = name
+        self.sku = sku
+        self.price = price
+        self.stockStatus = .init(rawValue: stockStatusKey)
+        self.stockQuantity = stockQuantity
+        self.manageStock = manageStock
         self.canChangeQuantity = canChangeQuantity
         self.currencyFormatter = currencyFormatter
     }
 
+    convenience init(product: Product,
+                     canChangeQuantity: Bool,
+                     currencyFormatter: CurrencyFormatter = CurrencyFormatter(currencySettings: ServiceLocator.currencySettings)) {
+        self.init(id: product.productID,
+                  name: product.name,
+                  sku: product.sku,
+                  price: product.price,
+                  stockStatusKey: product.stockStatusKey,
+                  stockQuantity: product.stockQuantity,
+                  manageStock: product.manageStock,
+                  canChangeQuantity: canChangeQuantity,
+                  currencyFormatter: currencyFormatter)
+    }
+
     /// Create the stock text based on a product's stock status/quantity.
     ///
     private func createStockText() -> String {
-        switch product.productStockStatus {
+        switch stockStatus {
         case .inStock:
-            if let stockQuantity = product.stockQuantity, product.manageStock {
+            if let stockQuantity = stockQuantity, manageStock {
                 let localizedStockQuantity = NumberFormatter.localizedString(from: stockQuantity as NSDecimalNumber, number: .decimal)
                 return String.localizedStringWithFormat(Localization.stockFormat, localizedStockQuantity)
             } else {
-                return product.productStockStatus.description
+                return stockStatus.description
             }
         default:
-            return product.productStockStatus.description
+            return stockStatus.description
         }
     }
 
     /// Create the price text based on a product's price.
     ///
     private func createPriceText() -> String? {
-        let unformattedPrice = product.price.isNotEmpty ? product.price : "0"
+        let unformattedPrice = price.isNotEmpty ? price : "0"
         return currencyFormatter.formatAmount(unformattedPrice)
     }
 }
@@ -88,8 +130,3 @@ private extension ProductRowViewModel {
         static let skuFormat = NSLocalizedString("SKU: %1$@", comment: "SKU label in order details > product row. The variable shows the SKU of the product.")
     }
 }
-
-// MARK: SwiftUI Preview Helpers
-extension ProductRowViewModel {
-    static let sampleProduct = Product().copy(productID: 2, name: "Love Ficus", sku: "123456", price: "20", stockQuantity: 7, stockStatusKey: "instock")
-}

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

@@ -12,10 +12,10 @@ class ProductRowViewModelTests: XCTestCase {
         let viewModel = ProductRowViewModel(product: product, canChangeQuantity: false)
 
         // Then
-        XCTAssertEqual(viewModel.product, product)
+        XCTAssertEqual(viewModel.id, product.productID)
+        XCTAssertEqual(viewModel.name, product.name)
         XCTAssertFalse(viewModel.canChangeQuantity)
         XCTAssertEqual(viewModel.quantity, 1)
-        XCTAssertEqual(viewModel.nameLabel, product.name)
     }
 
     func test_view_model_creates_expected_label_for_product_with_managed_stock() {