Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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)
Expand All @@ -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(),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
import XCTest
import Fakes
import Networking
@testable import WooCommerce

final class ProductFactoryTests: XCTestCase {
Expand Down Expand Up @@ -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)
}
}