Skip to content

[WOOMOB-1334] Execute Product and Variation sync in single transaction #14857

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

[WOOMOB-1334] Execute Product and Variation sync in single transaction #14857

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
976fe96
Execute product and variation sync within single transaction
malinajirka Oct 29, 2025
ab47842
Add tests for shared sync action
malinajirka Oct 29, 2025
7e8db35
Update repo tests
malinajirka Oct 29, 2025
c0ff22a
Fix detekt
malinajirka Oct 29, 2025
963598a
Refactor WooPosSyncAction for better readability
malinajirka Oct 29, 2025
718bc15
Merge branch 'trunk' into issue/woomob-1334-woo-poslocal-catalog-run-…
samiuelson Oct 30, 2025
5c95269
Use DateTimeProvider
malinajirka Oct 30, 2025
71ea3aa
Rename method for more clarity
malinajirka Oct 30, 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
67 changes: 19 additions & 48 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
Expand Up @@ -92,63 +92,34 @@ class WooPosLocalCatalogSyncRepository @Inject constructor(
return catalogSizeCheckResult.toPosLocalCatalogSyncFailure()
}

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

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

val syncDuration = System.currentTimeMillis() - startTime

return PosLocalCatalogSyncResult.Success(
productsSynced = (productSyncResult as WooPosSyncResult.Success).syncedCount,
variationsSynced = (variationSyncResult as WooPosSyncResult.Success).syncedCount,
syncDurationMs = syncDuration
)
}
val successResult = syncResult as WooPosSyncResult.Success

private suspend fun syncProducts(
site: SiteModel,
modifiedAfterGmt: String?,
pageSize: Int,
maxPages: Int
): WooPosSyncResult {
val result = posSyncAction.syncProducts(site, modifiedAfterGmt, pageSize, maxPages)

if (result is WooPosSyncResult.Success) {
result.serverDate?.let { serverDate ->
syncTimestampManager.parseTimestampFromApi(serverDate)?.let { timestamp ->
syncTimestampManager.storeProductsLastSyncTimestamp(timestamp)
logger.d("Stored products sync timestamp: $serverDate")
}
successResult.productsServerDate?.let { serverDate ->
syncTimestampManager.parseTimestampFromApi(serverDate)?.let { timestamp ->
syncTimestampManager.storeProductsLastSyncTimestamp(timestamp)
logger.d("Stored products sync timestamp: $serverDate")
}
}

return result
}

private suspend fun syncVariations(
site: SiteModel,
modifiedAfterGmt: String?,
pageSize: Int,
maxPages: Int
): WooPosSyncResult {
val result = posSyncAction.syncVariations(site, modifiedAfterGmt, pageSize, maxPages)

if (result is WooPosSyncResult.Success) {
result.serverDate?.let { serverDate ->
syncTimestampManager.parseTimestampFromApi(serverDate)?.let { timestamp ->
syncTimestampManager.storeVariationsLastSyncTimestamp(timestamp)
logger.d("Stored variations sync timestamp: $serverDate")
}
successResult.variationsServerDate?.let { serverDate ->
syncTimestampManager.parseTimestampFromApi(serverDate)?.let { timestamp ->
syncTimestampManager.storeVariationsLastSyncTimestamp(timestamp)
logger.d("Stored variations sync timestamp: $serverDate")
}
}

return result
val syncDuration = System.currentTimeMillis() - startTime
Copy link
Contributor

@samiuelson samiuelson Oct 30, 2025

Choose a reason for hiding this comment

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

💡 n.p.: I'm wondering if it would be better to inject the current time via DateTimeProvider and replace all 3 System::currentTimeMillis calls with DateTimeProvider::now already. Currently, it's not a big deal since we are not even asserting the syncDurationMs value in tests, but it can avoid making tests non-deterministic by accident in the future.

Copy link
Contributor Author

@malinajirka malinajirka Oct 30, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

Fixed 5c95269


return PosLocalCatalogSyncResult.Success(
productsSynced = successResult.productsSynced,
variationsSynced = successResult.variationsSynced,
syncDurationMs = syncDuration
)
}

suspend fun getProductCount(site: SiteModel): Int =
Expand Down
Loading