Skip to content

Reduce code duplication in WooPosSyncAction #14856

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 7 commits into from
Oct 30, 2025
Merged

Reduce code duplication in WooPosSyncAction #14856

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1d9a40b
Add common interface for product and variation fetch result
malinajirka Oct 29, 2025
bbe91d6
Add PaginatedSyncHelper to reduce code duplication
malinajirka Oct 29, 2025
f1a09b6
Merge branch 'trunk' into issue/woomob-1334-woo-poslocal-catalog-run-…
malinajirka Oct 29, 2025
b6f75d0
Revert Project_Default.xml change
malinajirka Oct 29, 2025
d3a47bc
Use shared result type for both product and variation sync
malinajirka Oct 29, 2025
d369ea6
Revert changes to Project_Default.xml
malinajirka Oct 29, 2025
84f1594
Use shared WooPosSyncFetchResult
malinajirka Oct 29, 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
44 changes: 13 additions & 31 deletions ...kotlin/com/woocommerce/android/ui/woopos/localcatalog/WooPosLocalCatalogSyncRepository.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
package com.woocommerce.android.ui.woopos.localcatalog

import com.woocommerce.android.ui.woopos.common.util.WooPosLogWrapper
import com.woocommerce.android.ui.woopos.localcatalog.WooPosSyncProductsAction.WooPosSyncProductsResult
import com.woocommerce.android.ui.woopos.localcatalog.WooPosSyncVariationsAction.WooPosSyncVariationsResult
import com.woocommerce.android.ui.woopos.util.datastore.WooPosPreferencesRepository
import com.woocommerce.android.ui.woopos.util.datastore.WooPosSyncTimestampManager
import com.woocommerce.android.util.CoroutineDispatchers
Expand Down Expand Up @@ -95,20 +93,20 @@ class WooPosLocalCatalogSyncRepository @Inject constructor(
}

val productSyncResult = syncProducts(site, modifiedAfterGmt, pageSize, maxPages)
if (productSyncResult is WooPosSyncProductsResult.Failed) {
if (productSyncResult is WooPosSyncResult.Failed) {
return productSyncResult.toPosLocalCatalogSyncFailure()
}

val variationSyncResult = syncVariations(site, modifiedAfterGmt, pageSize, maxPages)
if (variationSyncResult is WooPosSyncVariationsResult.Failed) {
if (variationSyncResult is WooPosSyncResult.Failed) {
return variationSyncResult.toPosLocalCatalogSyncFailure()
}

val syncDuration = System.currentTimeMillis() - startTime

return PosLocalCatalogSyncResult.Success(
productsSynced = (productSyncResult as WooPosSyncProductsResult.Success).productsSynced,
variationsSynced = (variationSyncResult as WooPosSyncVariationsResult.Success).variationsSynced,
productsSynced = (productSyncResult as WooPosSyncResult.Success).syncedCount,
variationsSynced = (variationSyncResult as WooPosSyncResult.Success).syncedCount,
syncDurationMs = syncDuration
)
}
Expand All @@ -118,10 +116,10 @@ class WooPosLocalCatalogSyncRepository @Inject constructor(
modifiedAfterGmt: String?,
pageSize: Int,
maxPages: Int
): WooPosSyncProductsResult {
): WooPosSyncResult {
val result = posSyncAction.syncProducts(site, modifiedAfterGmt, pageSize, maxPages)

if (result is WooPosSyncProductsResult.Success) {
if (result is WooPosSyncResult.Success) {
result.serverDate?.let { serverDate ->
syncTimestampManager.parseTimestampFromApi(serverDate)?.let { timestamp ->
syncTimestampManager.storeProductsLastSyncTimestamp(timestamp)
Expand All @@ -138,10 +136,10 @@ class WooPosLocalCatalogSyncRepository @Inject constructor(
modifiedAfterGmt: String?,
pageSize: Int,
maxPages: Int
): WooPosSyncVariationsResult {
): WooPosSyncResult {
val result = posSyncAction.syncVariations(site, modifiedAfterGmt, pageSize, maxPages)

if (result is WooPosSyncVariationsResult.Success) {
if (result is WooPosSyncResult.Success) {
result.serverDate?.let { serverDate ->
syncTimestampManager.parseTimestampFromApi(serverDate)?.let { timestamp ->
syncTimestampManager.storeVariationsLastSyncTimestamp(timestamp)
Expand All @@ -160,34 +158,18 @@ class WooPosLocalCatalogSyncRepository @Inject constructor(
posLocalCatalogStore.getVariationCount(LocalId(site.id)).getOrElse { 0 }
}

private fun WooPosSyncProductsResult.Failed.toPosLocalCatalogSyncFailure(): PosLocalCatalogSyncResult.Failure {
private fun WooPosSyncResult.Failed.toPosLocalCatalogSyncFailure(): PosLocalCatalogSyncResult.Failure {
return when (this) {
is WooPosSyncProductsResult.Failed.CatalogTooLarge -> {
is WooPosSyncResult.Failed.CatalogTooLarge -> {
PosLocalCatalogSyncResult.Failure.CatalogTooLarge(
error = "Product catalog too large: $totalPages pages exceed maximum of $maxPages pages",
error = "Catalog too large: $totalPages pages exceed maximum of $maxPages pages",
totalPages = totalPages,
maxPages = maxPages
)
}

else -> {
PosLocalCatalogSyncResult.Failure.UnexpectedError(error)
}
}
}

private fun WooPosSyncVariationsResult.Failed.toPosLocalCatalogSyncFailure(): PosLocalCatalogSyncResult.Failure {
return when (this) {
is WooPosSyncVariationsResult.Failed.CatalogTooLarge -> {
PosLocalCatalogSyncResult.Failure.CatalogTooLarge(
error = "Variations catalog too large: $totalPages pages exceed maximum of $maxPages pages",
totalPages = totalPages,
maxPages = maxPages
)
}

else -> {
PosLocalCatalogSyncResult.Failure.UnexpectedError(error)
is WooPosSyncResult.Failed.UnexpectedError -> {
PosLocalCatalogSyncResult.Failure.UnexpectedError(errorMessage)
}
}
}
Expand Down
Loading
Loading