Merge branch 'woomob-1252-top-level-catalog-sync-coordinator' into woomob-1252-always-full-sync-if-site-not-in-database

Author: joshheald

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

@@ -5,8 +5,7 @@ import GRDB
 public protocol POSCatalogSyncCoordinatorProtocol {
     /// Performs a full catalog sync for the specified site
     /// - Parameter siteID: The site ID to sync catalog for
-    /// - Returns: The synced catalog containing products and variations
-    func performFullSync(for siteID: Int64) async throws -> POSCatalog
+    func performFullSync(for siteID: Int64) async throws
 
     /// Determines if a full sync should be performed based on the age of the last sync
     /// - Parameters:
@@ -17,28 +16,27 @@ public protocol POSCatalogSyncCoordinatorProtocol {
 }
 
 public final class POSCatalogSyncCoordinator: POSCatalogSyncCoordinatorProtocol {
-    private let syncService: POSCatalogFullSyncServiceProtocol
+    private let fullSyncService: POSCatalogFullSyncServiceProtocol
     private let settingsStore: SiteSpecificAppSettingsStoreMethodsProtocol
     private let grdbManager: GRDBManagerProtocol
 
-    public init(syncService: POSCatalogFullSyncServiceProtocol,
+    public init(fullSyncService: POSCatalogFullSyncServiceProtocol,
                 settingsStore: SiteSpecificAppSettingsStoreMethodsProtocol? = nil,
                 grdbManager: GRDBManagerProtocol) {
-        self.syncService = syncService
+        self.fullSyncService = fullSyncService
         self.settingsStore = settingsStore ?? SiteSpecificAppSettingsStoreMethods(fileStorage: PListFileStorage())
         self.grdbManager = grdbManager
     }
 
-    public func performFullSync(for siteID: Int64) async throws -> POSCatalog {
+    public func performFullSync(for siteID: Int64) async throws {
         DDLogInfo("🔄 POSCatalogSyncCoordinator starting full sync for site \(siteID)")
 
-        let catalog = try await syncService.startFullSync(for: siteID)
+        let catalog = try await fullSyncService.startFullSync(for: siteID)
 
         // Record the sync timestamp
         settingsStore.setPOSLastFullSyncDate(Date(), for: siteID)
 
         DDLogInfo("✅ POSCatalogSyncCoordinator completed full sync for site \(siteID)")
-        return catalog
     }
 
     public func shouldPerformFullSync(for siteID: Int64, maxAge: TimeInterval) -> Bool {

Modules/Tests/YosemiteTests/Stores/Helpers/SiteSpecificAppSettingsStoreMethodsTests.swift

@@ -230,8 +230,6 @@ struct SiteSpecificAppSettingsStoreMethodsTests {
         #expect(retrievedCouponTerms == couponTerms)
     }
 
-
-
     // MARK: - POS Last Full Sync Date Tests
 
     @Test func getPOSLastFullSyncDate_returns_nil_when_no_date_exists() {

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

@@ -15,7 +15,7 @@ struct POSCatalogSyncCoordinatorTests {
         self.mockSettingsStore = MockSiteSpecificAppSettingsStoreMethods()
         self.grdbManager = try GRDBManager()
         self.sut = POSCatalogSyncCoordinator(
-            syncService: mockSyncService,
+            fullSyncService: mockSyncService,
             settingsStore: mockSettingsStore,
             grdbManager: grdbManager
         )
@@ -29,14 +29,12 @@ struct POSCatalogSyncCoordinatorTests {
             products: [POSProduct.fake()],
             variations: [POSProductVariation.fake()]
         )
-        mockSyncService.startFullSyncResult = expectedCatalog
+        mockSyncService.startFullSyncResult = .success(expectedCatalog)
 
         // When
-        let result = try await sut.performFullSync(for: sampleSiteID)
+        try await sut.performFullSync(for: sampleSiteID)
 
         // Then
-        #expect(result.products.count == expectedCatalog.products.count)
-        #expect(result.variations.count == expectedCatalog.variations.count)
         #expect(mockSyncService.startFullSyncCallCount == 1)
         #expect(mockSyncService.lastSyncSiteID == sampleSiteID)
     }
@@ -45,7 +43,7 @@ struct POSCatalogSyncCoordinatorTests {
         // Given
         let beforeSync = Date()
         let expectedCatalog = POSCatalog(products: [], variations: [])
-        mockSyncService.startFullSyncResult = expectedCatalog
+        mockSyncService.startFullSyncResult = .success(expectedCatalog)
 
         // When
         _ = try await sut.performFullSync(for: sampleSiteID)
@@ -64,7 +62,7 @@ struct POSCatalogSyncCoordinatorTests {
     @Test func performFullSync_propagates_errors() async throws {
         // Given
         let expectedError = NSError(domain: "sync", code: 500, userInfo: [NSLocalizedDescriptionKey: "Sync failed"])
-        mockSyncService.startFullSyncError = expectedError
+        mockSyncService.startFullSyncResult = .failure(expectedError)
 
         // When/Then
         await #expect(throws: expectedError) {
@@ -205,8 +203,7 @@ struct POSCatalogSyncCoordinatorTests {
 // MARK: - Mock Services
 
 final class MockPOSCatalogFullSyncService: POSCatalogFullSyncServiceProtocol {
-    var startFullSyncResult: POSCatalog = POSCatalog(products: [], variations: [])
-    var startFullSyncError: Error?
+    var startFullSyncResult: Result<POSCatalog, Error> = .success(POSCatalog(products: [], variations: []))
 
     private(set) var startFullSyncCallCount = 0
     private(set) var lastSyncSiteID: Int64?
@@ -215,10 +212,11 @@ final class MockPOSCatalogFullSyncService: POSCatalogFullSyncServiceProtocol {
         startFullSyncCallCount += 1
         lastSyncSiteID = siteID
 
-        if let error = startFullSyncError {
+        switch startFullSyncResult {
+        case .success(let catalog):
+            return catalog
+        case .failure(let error):
             throw error
         }
-
-        return startFullSyncResult
     }
 }

WooCommerce/Classes/ViewRelated/MainTabBarController.swift

@@ -794,12 +794,12 @@ private extension MainTabBarController {
 
     func createPOSCatalogSyncCoordinator() -> POSCatalogSyncCoordinatorProtocol? {
         guard let credentials = ServiceLocator.stores.sessionManager.defaultCredentials,
-              let syncService = POSCatalogFullSyncService(credentials: credentials, grdbManager: ServiceLocator.grdbManager)
+              let fullSyncService = POSCatalogFullSyncService(credentials: credentials, grdbManager: ServiceLocator.grdbManager)
         else {
             return nil
         }
 
-        return POSCatalogSyncCoordinator(syncService: syncService, grdbManager: ServiceLocator.grdbManager)
+        return POSCatalogSyncCoordinator(fullSyncService: fullSyncService, grdbManager: ServiceLocator.grdbManager)
     }
 
     func triggerPOSCatalogSyncIfNeeded(for siteID: Int64) async {