Skip to content

Dynamic Dashboard: Update Yosemite with stock report fetching #12781

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
May 20, 2024
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
6 changes: 3 additions & 3 deletions Networking/Networking/Remote/ProductsRemote.swift
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ public protocol ProductsRemoteProtocol {
func loadNumberOfProducts(siteID: Int64) async throws -> Int64

func loadStock(for siteID: Int64,
with stockStatus: ProductStockStatus,
with stockType: String,
pageNumber: Int,
pageSize: Int,
orderBy: ProductsRemote.OrderKey,
Expand Down Expand Up @@ -414,14 +414,14 @@ public final class ProductsRemote: Remote, ProductsRemoteProtocol {
}

public func loadStock(for siteID: Int64,
with stockStatus: ProductStockStatus,
with stockType: String,
pageNumber: Int,
pageSize: Int,
orderBy: ProductsRemote.OrderKey,
order: ProductsRemote.Order) async throws -> [ProductStock] {
let path = Path.stockReports
let parameters: [String: Any] = [
ParameterKey.type: stockStatus.rawValue,
ParameterKey.type: stockType,
ParameterKey.page: String(pageNumber),
ParameterKey.perPage: String(pageSize),
ParameterKey.order: order,
Expand Down
4 changes: 2 additions & 2 deletions Networking/NetworkingTests/Remote/ProductsRemoteTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -737,7 +737,7 @@ final class ProductsRemoteTests: XCTestCase {
network.simulateResponse(requestUrlSuffix: "reports/stock", filename: "product-stock")

// When
let stock = try await remote.loadStock(for: 8, with: .outOfStock, pageNumber: 1, pageSize: 3, orderBy: .name, order: .descending)
let stock = try await remote.loadStock(for: 8, with: "outOfStock", pageNumber: 1, pageSize: 3, orderBy: .name, order: .descending)

// Then
XCTAssertEqual(stock.count, 1)
Expand All @@ -756,7 +756,7 @@ final class ProductsRemoteTests: XCTestCase {
let remote = ProductsRemote(network: network)

// When
await assertThrowsError({ _ = try await remote.loadStock(for: 8, with: .outOfStock, pageNumber: 1, pageSize: 3, orderBy: .name, order: .descending) },
await assertThrowsError({ _ = try await remote.loadStock(for: 8, with: "outofstock", pageNumber: 1, pageSize: 3, orderBy: .name, order: .descending) },
errorAssert: {
// Then
$0 as? NetworkError == .notFound()
Expand Down
17 changes: 17 additions & 0 deletions Yosemite/Yosemite/Actions/ProductAction.swift
Original file line number Diff line number Diff line change
Expand Up @@ -189,4 +189,21 @@ public enum ProductAction: Action {
categories: [ProductCategory],
tags: [ProductTag],
completion: (Result<AIProduct, Error>) -> Void)

/// Fetches stock based on the given status for a site
/// - Parameter siteID: Site ID to fetch stock for.
/// - Parameter stockType: Raw type of stock to query.
/// - Parameter pageNumber: The index of the content page to query.
/// - Parameter pageSize: The max amount of items to return per page.
/// - Parameter orderBy: The key to sort returned items.
/// - Parameter order: Whether to sort returned items ASC or DESC.
/// - Parameter completion: Closure to trigger when fetching completes.
///
case fetchStockReport(siteID: Int64,
stockType: String,
pageNumber: Int,
pageSize: Int,
orderBy: ProductsRemote.OrderKey,
order: ProductsRemote.Order,
completion: (Result<[ProductStock], Error>) -> Void)
}
30 changes: 30 additions & 0 deletions Yosemite/Yosemite/Stores/ProductStore.swift
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,14 @@ public class ProductStore: Store {
categories: categories,
tags: tags,
completion: completion)
case let .fetchStockReport(siteID, stockType, pageNumber, pageSize, orderBy, order, completion):
fetchStockReport(siteID: siteID,
stockType: stockType,
pageNumber: pageNumber,
pageSize: pageSize,
orderBy: orderBy,
order: order,
completion: completion)
}
}
}
Expand Down Expand Up @@ -731,6 +739,28 @@ private extension ProductStore {
completion(result)
}
}

func fetchStockReport(siteID: Int64,
stockType: String,
pageNumber: Int,
pageSize: Int,
orderBy: ProductsRemote.OrderKey,
order: ProductsRemote.Order,
completion: @escaping (Result<[ProductStock], Error>) -> Void) {
Task { @MainActor in
do {
let stock = try await remote.loadStock(for: siteID,
with: stockType,
pageNumber: pageNumber,
pageSize: pageSize,
orderBy: orderBy,
order: order)
completion(.success(stock))
} catch {
completion(.failure(error))
}
}
}
}


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ final class MockProductsRemote {

private var searchProductsBySKUResultsBySKU = [String: Result<[Product], Error>]()

private var fetchedStockResult: Result<[ProductStock], Error>?

/// The number of times that `loadProduct()` was invoked.
private(set) var invocationCountOfLoadProduct: Int = 0

Expand Down Expand Up @@ -102,6 +104,10 @@ final class MockProductsRemote {
func whenSearchingProductsBySKU(sku: String, thenReturn result: Result<[Product], Error>) {
searchProductsBySKUResultsBySKU[sku] = result
}

func whenFetchingStock(thenReturn result: Result<[ProductStock], Error>) {
fetchedStockResult = result
}
}

// MARK: - ProductsEndpointsProviding
Expand Down Expand Up @@ -270,12 +276,19 @@ extension MockProductsRemote: ProductsRemoteProtocol {
}

func loadStock(for siteID: Int64,
with stockStatus: ProductStockStatus,
with stockType: String,
pageNumber: Int,
pageSize: Int,
orderBy: ProductsRemote.OrderKey,
order: ProductsRemote.Order) async throws -> [ProductStock] {
// no-op
return []
guard let result = fetchedStockResult else {
throw NetworkError.notFound()
}
switch result {
case let .success(stock):
return stock
case let .failure(error):
throw error
}
}
}
64 changes: 64 additions & 0 deletions Yosemite/YosemiteTests/Stores/ProductStoreTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -2831,6 +2831,70 @@ final class ProductStoreTests: XCTestCase {
XCTAssertTrue(result.isFailure)
XCTAssertEqual(result.failure as? NetworkError, .timeout())
}

// MARK: - Fetch stock

func test_fetchStock_returns_stock_on_success() throws {
// Given
let stock = ProductStock.fake().copy(siteID: sampleSiteID,
productID: 13,
name: "Steamed bun",
sku: "1353",
manageStock: true,
stockQuantity: 4,
stockStatusKey: "instock")
let mockRemote = MockProductsRemote()
mockRemote.whenFetchingStock(thenReturn: .success([stock]))
let productStore = ProductStore(dispatcher: dispatcher,
storageManager: storageManager,
network: network,
remote: mockRemote)

// When
let result = waitFor { promise in
productStore.onAction(ProductAction.fetchStockReport(siteID: self.sampleSiteID,
stockType: "lowstock",
pageNumber: 1,
pageSize: 3,
orderBy: .date,
order: .descending,
completion: { result in
promise(result)
}))
}

// Then
let receivedStock = try XCTUnwrap(result.get())
XCTAssertEqual(receivedStock.count, 1)
XCTAssertEqual(receivedStock.first, stock)
}

func test_fetchStock_returns_error_on_failure() throws {
// Given
let mockRemote = MockProductsRemote()
mockRemote.whenFetchingStock(thenReturn: .failure(NetworkError.timeout()))
let productStore = ProductStore(dispatcher: dispatcher,
storageManager: storageManager,
network: network,
remote: mockRemote)

// When
let result = waitFor { promise in
productStore.onAction(ProductAction.fetchStockReport(siteID: self.sampleSiteID,
stockType: "lowstock",
pageNumber: 1,
pageSize: 3,
orderBy: .date,
order: .descending,
completion: { result in
promise(result)
}))
}

// Then
XCTAssertTrue(result.isFailure)
XCTAssertEqual(result.failure as? NetworkError, .timeout())
}
}

// MARK: - Private Helpers
Expand Down
Loading