[Local catalog] Skip incremental sync when full sync in progress (#16326)

Author: joshheald

Modules/Sources/Yosemite/Tools/POS/POSCatalogSyncCoordinator.swift

@@ -105,12 +105,9 @@ public actor POSCatalogSyncCoordinator: POSCatalogSyncCoordinatorProtocol {
             throw POSCatalogSyncError.shouldNotSync
         }
 
-        switch fullSyncStateModel.state[siteID] {
-        case .syncStarted, .initialSyncStarted:
+        if await fullSyncInProgress(for: siteID) {
             DDLogInfo("⚠️ POSCatalogSyncCoordinator: Sync already in progress for site \(siteID)")
             throw POSCatalogSyncError.syncAlreadyInProgress(siteID: siteID)
-        default:
-            break
         }
 
         let isFirstSync = await lastFullSyncDate(for: siteID) == nil
@@ -199,6 +196,19 @@ public actor POSCatalogSyncCoordinator: POSCatalogSyncCoordinatorProtocol {
         return shouldSync
     }
 
+    private func fullSyncInProgress(for siteID: Int64) async -> Bool {
+        switch fullSyncStateModel.state[siteID] {
+        case .syncStarted, .initialSyncStarted:
+            return true
+        default:
+            return false
+        }
+    }
+
+    private func ongoingSyncInProgress(for siteID: Int64) async -> Bool {
+        ongoingIncrementalSyncs.contains(siteID)
+    }
+
     /// Performs an incremental sync if applicable based on sync conditions
     /// - Parameters:
     ///   - siteID: The site ID to sync catalog for
@@ -213,11 +223,16 @@ public actor POSCatalogSyncCoordinator: POSCatalogSyncCoordinatorProtocol {
             return
         }
 
-        if ongoingIncrementalSyncs.contains(siteID) {
+        if await ongoingSyncInProgress(for: siteID) {
             DDLogInfo("⚠️ POSCatalogSyncCoordinator: Incremental sync already in progress for site \(siteID)")
             throw POSCatalogSyncError.syncAlreadyInProgress(siteID: siteID)
         }
 
+        if await fullSyncInProgress(for: siteID) {
+            DDLogInfo("⚠️ POSCatalogSyncCoordinator: Full sync already in progress for site \(siteID)")
+            throw POSCatalogSyncError.syncAlreadyInProgress(siteID: siteID)
+        }
+
         guard let lastFullSyncDate = await lastFullSyncDate(for: siteID) else {
             return
         }

Modules/Tests/YosemiteTests/Tools/POS/POSCatalogSyncCoordinatorTests.swift

@@ -195,12 +195,8 @@ struct POSCatalogSyncCoordinatorTests {
         try await Task.sleep(nanoseconds: 10_000_000) // 10ms
 
         // When - try to start second sync while first is blocked
-        do {
+        await #expect(throws: POSCatalogSyncError.syncAlreadyInProgress(siteID: sampleSiteID)) {
             _ = try await sut.performFullSync(for: sampleSiteID)
-            #expect(Bool(false), "Should have thrown syncAlreadyInProgress error")
-        } catch let error as POSCatalogSyncError {
-            // Then
-            #expect(error == POSCatalogSyncError.syncAlreadyInProgress(siteID: sampleSiteID))
         }
 
         let currentState = await sut.loadLastFullSyncState(for: sampleSiteID)
@@ -370,12 +366,8 @@ struct POSCatalogSyncCoordinatorTests {
         try await Task.sleep(nanoseconds: 10_000_000) // 10ms
 
         // When - try to start second incremental sync while first is blocked
-        do {
-            _ = try await sut.performIncrementalSyncIfApplicable(for: sampleSiteID, maxAge: sampleMaxAge)
-            #expect(Bool(false), "Should have thrown syncAlreadyInProgress error")
-        } catch let error as POSCatalogSyncError {
-            // Then
-            #expect(error == POSCatalogSyncError.syncAlreadyInProgress(siteID: sampleSiteID))
+        await #expect(throws: POSCatalogSyncError.syncAlreadyInProgress(siteID: sampleSiteID)) {
+            try await sut.performIncrementalSyncIfApplicable(for: sampleSiteID, maxAge: sampleMaxAge)
         }
 
         // Cleanup