Merge pull request #8005 from woocommerce/issue/7949-auto-draft-support

Products Onboarding: Support template products

Author: Ecarrion

WooCommerce/Classes/ViewRelated/Products/Add Product/AddProductCoordinator.swift

@@ -152,7 +152,8 @@ private extension AddProductCoordinator {
 
             switch result {
             case .success(let product):
-                self.presentProduct(product, formType: .edit) // We need to strongly capture `self` because no one is retaining `AddProductCoordinator`.
+                let newProduct = ProductFactory().newProduct(from: product) // Transforms the auto-draft product into a new product ready to be used.
+                self.presentProduct(newProduct) // We need to strongly capture `self` because no one is retaining `AddProductCoordinator`.
 
             case .failure(let error):
                 // Log error and inform the user
@@ -177,12 +178,12 @@ private extension AddProductCoordinator {
             assertionFailure("Unable to create product of type: \(bottomSheetProductType)")
             return
         }
-        presentProduct(product, formType: .add)
+        presentProduct(product)
     }
 
     /// Presents a product onto the current navigation stack.
     ///
-    func presentProduct(_ product: Product, formType: ProductFormType) {
+    func presentProduct(_ product: Product) {
         let model = EditableProductModel(product: product)
         let currencyCode = ServiceLocator.currencySettings.currencyCode
         let currency = ServiceLocator.currencySettings.symbol(from: currencyCode)
@@ -192,7 +193,7 @@ private extension AddProductCoordinator {
                                       isLocalID: true),
                            originalStatuses: model.imageStatuses)
         let viewModel = ProductFormViewModel(product: model,
-                                             formType: formType,
+                                             formType: .add,
                                              productImageActionHandler: productImageActionHandler)
         let viewController = ProductFormViewController(viewModel: viewModel,
                                                        eventLogger: ProductFormEventLogger(),

WooCommerce/Classes/ViewRelated/Products/Add Product/ProductFactory.swift

@@ -16,6 +16,13 @@ struct ProductFactory {
             return nil
         }
     }
+
+    /// Copies a product by cleaning properties like `id, name, and statusKey` to their default state.
+    /// This is usefult to turn an existing(on core) `auto-draft` product into a new app-product ready to be saved.
+    ///
+    func newProduct(from existingProduct: Product) -> Product {
+        existingProduct.copy(productID: 0, name: "", statusKey: ProductStatus.published.rawValue)
+    }
 }
 
 private extension ProductFactory {

WooCommerce/WooCommerceTests/ViewRelated/Products/Add Product/ProductFactoryTests.swift

@@ -1,4 +1,6 @@
 import XCTest
+import Fakes
+import Networking
 @testable import WooCommerce
 
 final class ProductFactoryTests: XCTestCase {
@@ -40,4 +42,23 @@ final class ProductFactoryTests: XCTestCase {
         let product = ProductFactory().createNewProduct(type: .custom("any"), isVirtual: false, siteID: siteID)
         XCTAssertNil(product)
     }
+
+    func test_creating_new_product_removes_expected_fields() {
+        // Given
+        let product = Product.fake().copy(siteID: 123, productID: 1234, name: "Test Product", statusKey: ProductStatus.autoDraft.rawValue, price: "20.00")
+
+        // When
+        let newProduct = ProductFactory().newProduct(from: product)
+
+        // Then
+
+        // Stay the same
+        XCTAssertEqual(newProduct.siteID, product.siteID)
+        XCTAssertEqual(newProduct.price, product.price)
+
+        // Changes
+        XCTAssertEqual(newProduct.productID, 0)
+        XCTAssertEqual(newProduct.name, "")
+        XCTAssertEqual(newProduct.statusKey, ProductStatus.published.rawValue)
+    }
 }