Skip to content
This repository was archived by the owner on Feb 4, 2025. It is now read-only.

Commit d9a3dcb

Browse files
authored
Merge pull request #3118 from wordpress-mobile/issue/13041-woo-search-products-add-global-unique-id-param
[Woo] [Product Global Unique Id] Search Products by Global Unique Id - Add param
2 parents 64479b5 + 2c94dd8 commit d9a3dcb

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed

plugins/woocommerce/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/product/ProductRestClient.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -469,6 +469,7 @@ class ProductRestClient @Inject constructor(
469469
val payload = RemoteSearchProductsPayload(
470470
site = site,
471471
searchQuery = searchQuery,
472+
globalUniqueIdSearchQuery = globalUniqueIdSearchQuery,
472473
skuSearchOptions = skuSearchOptions,
473474
productsWithMetaData = productModels,
474475
offset = offset,
@@ -490,6 +491,7 @@ class ProductRestClient @Inject constructor(
490491
site = site,
491492
query = searchQuery,
492493
skuSearchOptions = skuSearchOptions,
494+
globalUniqueIdSearchQuery = globalUniqueIdSearchQuery,
493495
filterOptions = filterOptions
494496
)
495497
dispatcher.dispatch(WCProductActionBuilder.newSearchedProductsAction(payload))

plugins/woocommerce/src/main/kotlin/org/wordpress/android/fluxc/store/WCProductStore.kt

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -456,6 +456,7 @@ class WCProductStore @Inject constructor(
456456
var site: SiteModel,
457457
var searchQuery: String?,
458458
var skuSearchOptions: SkuSearchOptions,
459+
var globalUniqueIdSearchQuery: String?,
459460
var productsWithMetaData: List<ProductWithMetaData> = emptyList(),
460461
var offset: Int = 0,
461462
var loadedMore: Boolean = false,
@@ -467,10 +468,12 @@ class WCProductStore @Inject constructor(
467468
site: SiteModel,
468469
query: String?,
469470
skuSearchOptions: SkuSearchOptions,
471+
globalUniqueIdSearchQuery: String?,
470472
filterOptions: Map<ProductFilterOption, String>?
471473
) : this(
472474
site = site,
473475
searchQuery = query,
476+
globalUniqueIdSearchQuery = globalUniqueIdSearchQuery,
474477
skuSearchOptions = skuSearchOptions,
475478
filterOptions = filterOptions
476479
) {
@@ -700,6 +703,7 @@ class WCProductStore @Inject constructor(
700703
class OnProductsSearched(
701704
var searchQuery: String?,
702705
var isSkuSearch: SkuSearchOptions,
706+
var globalUniqueIdSearchQuery: String?,
703707
var searchResults: List<WCProductModel> = emptyList(),
704708
var canLoadMore: Boolean = false
705709
) : OnChanged<ProductError>()
@@ -1913,7 +1917,8 @@ class WCProductStore @Inject constructor(
19131917
emitChange(
19141918
OnProductsSearched(
19151919
searchQuery = payload.searchQuery,
1916-
isSkuSearch = payload.skuSearchOptions
1920+
isSkuSearch = payload.skuSearchOptions,
1921+
globalUniqueIdSearchQuery = payload.globalUniqueIdSearchQuery
19171922
)
19181923
)
19191924
} else {
@@ -1923,6 +1928,7 @@ class WCProductStore @Inject constructor(
19231928
OnProductsSearched(
19241929
searchQuery = payload.searchQuery,
19251930
isSkuSearch = payload.skuSearchOptions,
1931+
globalUniqueIdSearchQuery = payload.globalUniqueIdSearchQuery,
19261932
searchResults = payload.productsWithMetaData.map { it.product },
19271933
canLoadMore = payload.canLoadMore
19281934
)

0 commit comments

Comments
 (0)