Skip to content

[WOOMOB-1443] Filter out unsupported products and variations in Local Catalog #14767

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.

Sign up for GitHub

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
Oct 17, 2025
Merged

[WOOMOB-1443] Filter out unsupported products and variations in Local Catalog #14767

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
674399a
Filter out unsupported variations in Local catalog
malinajirka Oct 16, 2025
e9a1238
Filter out unsupported products in Local catalog
malinajirka Oct 16, 2025
9ee65e6
Add clarification comment
malinajirka Oct 16, 2025
ee00183
Extract values into constants
malinajirka Oct 16, 2025
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
1 change: 1 addition & 0 deletions ...n/kotlin/com/woocommerce/android/ui/woopos/common/data/WooPosProductsTypesFilterConfig.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import org.wordpress.android.fluxc.store.WCProductStore.DownloadableOptions
import org.wordpress.android.fluxc.store.WCProductStore.ProductFilterOption
import javax.inject.Inject

// Note: For the Local Catalog feature, the filtering is done locally in WooPosProductsDao.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seeing the comment, I assume you considered reusing this for the filteriting to have a single source of truth for the whole POS; therefore, just curious why you didn't go with that approach?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good question. I couldn't figure out a way on how to re-use it.

  1. We likely want to filter on the DB layer for performance/memory reasons.
  2. This config lives in a different module than the DB -> we can't create a circular dependency.
  3. Room queries can reference only constants.
    Wdyt? Can you think of a way on how to re-use it?

class WooPosProductsTypesFilterConfig @Inject constructor() {
val filters: Map<ProductFilterOption, String> =
mapOf(
Expand Down
1 change: 1 addition & 0 deletions ...kotlin/com/woocommerce/android/ui/woopos/common/data/WooPosVariationsTypesFilterConfig.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import org.wordpress.android.fluxc.store.WCProductStore.DownloadableOptions
import org.wordpress.android.fluxc.store.WCProductStore.VariationFilterOption
import javax.inject.Inject

// Note: For the Local Catalog feature, the filtering is done locally in WooPosVariationsDao.
class WooPosVariationsTypesFilterConfig @Inject constructor() {
val filters: Map<VariationFilterOption, String> =
mapOf(
Expand Down
6 changes: 1 addition & 5 deletions ...com/woocommerce/android/ui/woopos/home/items/variations/WooPosVariationsInDbDataSource.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,15 +36,11 @@ class WooPosVariationsInDbDataSource @Inject constructor(
forceRefresh: Boolean
): Flow<FetchResult> = getVariationsFromDatabaseFlow(productId)
.map { variations ->
FetchResult.Remote(Result.success(variations.applyFilter()))
FetchResult.Remote(Result.success(variations))
}
.flowOn(Dispatchers.IO)

override suspend fun loadMore(productId: Long): Result<List<WooPosVariation>> = withContext(Dispatchers.IO) {
Result.success(emptyList())
}
}

private fun List<WooPosVariation>.applyFilter(): List<WooPosVariation> {
return filter { !it.isDownloadable }
}
16 changes: 15 additions & 1 deletion ...ugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/dao/pos/WooPosProductsDao.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,21 @@ import org.wordpress.android.fluxc.persistence.entity.pos.WooPosProductEntity

@Dao
abstract class WooPosProductsDao {
@Query("SELECT * FROM PosProductEntity WHERE localSiteId = :localSiteId ORDER BY LOWER(name)")
companion object {
private const val PRODUCT_STATUS_PUBLISH = "publish"
private const val PRODUCT_TYPE_SIMPLE = "simple"
private const val PRODUCT_TYPE_VARIABLE = "variable"
private const val DOWNLOADABLE_FALSE = 0
}

@Query(
"SELECT * FROM PosProductEntity " +
"WHERE localSiteId = :localSiteId " +
"AND status = '$PRODUCT_STATUS_PUBLISH' " +
"AND (type = '$PRODUCT_TYPE_SIMPLE' OR type = '$PRODUCT_TYPE_VARIABLE') " +
"AND downloadable = '$DOWNLOADABLE_FALSE' " +
"ORDER BY LOWER(name)"
)
abstract fun observeAllProducts(localSiteId: LocalId): Flow<List<WooPosProductEntity>>

@Query("SELECT * FROM PosProductEntity WHERE localSiteId = :localSiteId AND remoteId = :remoteId")
Expand Down
15 changes: 13 additions & 2 deletions ...in/src/main/kotlin/org/wordpress/android/fluxc/persistence/dao/pos/WooPosVariationsDao.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,19 @@ import org.wordpress.android.fluxc.persistence.entity.pos.WooPosVariationEntity

@Dao
abstract class WooPosVariationsDao {

@Query("SELECT * FROM PosVariationEntity WHERE localSiteId = :localSiteId AND remoteProductId = :productId ORDER BY variationName ASC")
companion object {
private const val VARIATION_STATUS_PUBLISH = "publish"
private const val DOWNLOADABLE_FALSE = 0
}

@Query(
"SELECT * FROM PosVariationEntity " +
"WHERE localSiteId = :localSiteId " +
"AND remoteProductId = :productId " +
"AND status = '$VARIATION_STATUS_PUBLISH' " +
"AND downloadable = '$DOWNLOADABLE_FALSE' " +
"ORDER BY variationName ASC"
)
abstract fun observeVariationsForProduct(
localSiteId: Int,
productId: Long
Expand Down
Loading