Skip to content

Commit ae63cd3

Browse files
committed
POSCatalogSyncRemote: remove productTypes parameter from products incremental sync, as product types filtering is not supported in full sync at least for now.
1 parent b0d5574 commit ae63cd3

File tree

2 files changed

+5
-15
lines changed

2 files changed

+5
-15
lines changed

Modules/Sources/Networking/Remote/POSCatalogSyncRemote.swift

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,15 @@ public class POSCatalogSyncRemote: Remote {
1010
/// - Parameters:
1111
/// - modifiedAfter: Only products modified after this date will be returned.
1212
/// - siteID: Site ID to load products from.
13-
/// - productTypes: Product types to filter by.
1413
/// - pageNumber: Page number for pagination.
1514
/// - Returns: Paginated list of POS products.
1615
///
1716
// periphery:ignore - TODO - remove this periphery ignore comment when this endpoint is integrated with catalog sync
18-
public func loadProducts(modifiedAfter: Date, siteID: Int64, productTypes: [ProductType] = [.simple, .variable], pageNumber: Int)
17+
public func loadProducts(modifiedAfter: Date, siteID: Int64, pageNumber: Int)
1918
async throws -> PagedItems<POSProduct> {
2019
let path = "products"
2120
let parameters = [
2221
ParameterKey.modifiedAfter: dateFormatter.string(from: modifiedAfter),
23-
ParameterKey.productTypes: productTypes.map { $0.rawValue }.joined(separator: ","),
2422
ParameterKey.page: String(pageNumber),
2523
ParameterKey.perPage: String(Constants.defaultPageSize),
2624
ParameterKey.fields: POSProduct.requestFields.joined(separator: ",")
@@ -68,7 +66,6 @@ private extension POSCatalogSyncRemote {
6866

6967
enum ParameterKey {
7068
static let modifiedAfter = "modified_after"
71-
static let productTypes = "include_types"
7269
static let page = "page"
7370
static let perPage = "per_page"
7471
static let fields = "_fields"

Modules/Tests/NetworkingTests/Remote/POSCatalogSyncRemoteTests.swift

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,17 @@ struct POSCatalogSyncRemoteTests {
1111
// Given
1212
let remote = POSCatalogSyncRemote(network: network)
1313
let modifiedAfter = Date(timeIntervalSince1970: 1692968400) // 2023-08-25 12:00:00 UTC
14-
let productTypes: [ProductType] = [.simple, .variable]
1514
let pageNumber = 2
1615

1716
// When
18-
_ = try? await remote.loadProducts(modifiedAfter: modifiedAfter, siteID: sampleSiteID, productTypes: productTypes, pageNumber: pageNumber)
17+
_ = try? await remote.loadProducts(modifiedAfter: modifiedAfter, siteID: sampleSiteID, pageNumber: pageNumber)
1918

2019
// Then
2120
let queryParametersDictionary = try #require(network.queryParametersDictionary as? [String: any Hashable])
2221
let dateFormatter = ISO8601DateFormatter()
2322
let expectedDateString = dateFormatter.string(from: modifiedAfter)
2423

2524
#expect(queryParametersDictionary["modified_after"] as? String == expectedDateString)
26-
#expect(queryParametersDictionary["include_types"] as? String == "simple,variable")
2725
#expect(queryParametersDictionary["page"] as? String == String(pageNumber))
2826
#expect(queryParametersDictionary["per_page"] as? String == "100")
2927
#expect(queryParametersDictionary["_fields"] as? String == POSProduct.requestFields.joined(separator: ","))
@@ -33,12 +31,11 @@ struct POSCatalogSyncRemoteTests {
3331
// Given
3432
let remote = POSCatalogSyncRemote(network: network)
3533
let modifiedAfter = Date()
36-
let productTypes: [ProductType] = [.simple]
3734
let expectedProductsCount = 2
3835

3936
// When
4037
network.simulateResponse(requestUrlSuffix: "products", filename: "products-load-pos")
41-
let pagedProducts = try await remote.loadProducts(modifiedAfter: modifiedAfter, siteID: sampleSiteID, productTypes: productTypes, pageNumber: 1)
38+
let pagedProducts = try await remote.loadProducts(modifiedAfter: modifiedAfter, siteID: sampleSiteID, pageNumber: 1)
4239

4340
// Then
4441
#expect(pagedProducts.items.count == expectedProductsCount)
@@ -55,7 +52,7 @@ struct POSCatalogSyncRemoteTests {
5552

5653
// When/Then
5754
await #expect(throws: NetworkError.notFound()) {
58-
try await remote.loadProducts(modifiedAfter: Date(), siteID: sampleSiteID, productTypes: [.simple], pageNumber: 1)
55+
try await remote.loadProducts(modifiedAfter: Date(), siteID: sampleSiteID, pageNumber: 1)
5956
}
6057
}
6158

@@ -70,7 +67,6 @@ struct POSCatalogSyncRemoteTests {
7067
let pagedProducts = try await remote.loadProducts(
7168
modifiedAfter: modifiedAfter,
7269
siteID: sampleSiteID,
73-
productTypes: [.simple],
7470
pageNumber: pageNumber
7571
)
7672

@@ -89,7 +85,6 @@ struct POSCatalogSyncRemoteTests {
8985
let pagedProducts = try await remote.loadProducts(
9086
modifiedAfter: modifiedAfter,
9187
siteID: sampleSiteID,
92-
productTypes: [.simple],
9388
pageNumber: pageNumber
9489
)
9590

@@ -109,7 +104,6 @@ struct POSCatalogSyncRemoteTests {
109104
let pagedProducts = try await remote.loadProducts(
110105
modifiedAfter: modifiedAfter,
111106
siteID: sampleSiteID,
112-
productTypes: [.simple],
113107
pageNumber: 1
114108
)
115109

@@ -128,7 +122,6 @@ struct POSCatalogSyncRemoteTests {
128122
let pagedProducts = try await remote.loadProducts(
129123
modifiedAfter: modifiedAfter,
130124
siteID: sampleSiteID,
131-
productTypes: [.simple],
132125
pageNumber: 1
133126
)
134127

@@ -281,7 +274,7 @@ struct POSCatalogSyncRemoteTests {
281274

282275
// When
283276
network.simulateResponse(requestUrlSuffix: "products", filename: "empty-data-array")
284-
_ = try? await remote.loadProducts(modifiedAfter: modifiedAfter, siteID: sampleSiteID, productTypes: [.simple], pageNumber: largePageNumber)
277+
_ = try? await remote.loadProducts(modifiedAfter: modifiedAfter, siteID: sampleSiteID, pageNumber: largePageNumber)
285278

286279
// Then
287280
let queryParametersDictionary = try #require(network.queryParametersDictionary as? [String: any Hashable])

0 commit comments

Comments
 (0)