Revert persistence changes for incremental sync for a separate PR.

Author: jaclync

Modules/Sources/Storage/GRDB/Model/PersistedProductAttribute.swift

@@ -34,7 +34,7 @@ extension PersistedProductAttribute: FetchableRecord, MutablePersistableRecord {
 
     public enum Columns {
         static let id = Column(CodingKeys.id)
-        public static let productID = Column(CodingKeys.productID)
+        static let productID = Column(CodingKeys.productID)
         static let name = Column(CodingKeys.name)
         static let position = Column(CodingKeys.position)
         static let visible = Column(CodingKeys.visible)

Modules/Sources/Storage/GRDB/Model/PersistedProductImage.swift

@@ -34,7 +34,7 @@ extension PersistedProductImage: FetchableRecord, PersistableRecord {
 
     public enum Columns {
         static let id = Column(CodingKeys.id)
-        public static let productID = Column(CodingKeys.productID)
+        static let productID = Column(CodingKeys.productID)
         static let dateCreated = Column(CodingKeys.dateCreated)
         static let dateModified = Column(CodingKeys.dateModified)
         static let src = Column(CodingKeys.src)

Modules/Sources/Storage/GRDB/Model/PersistedProductVariationAttribute.swift

@@ -26,7 +26,7 @@ extension PersistedProductVariationAttribute: FetchableRecord, MutablePersistabl
 
     public enum Columns {
         static let id = Column(CodingKeys.id)
-        public static let productVariationID = Column(CodingKeys.productVariationID)
+        static let productVariationID = Column(CodingKeys.productVariationID)
         static let name = Column(CodingKeys.name)
         static let option = Column(CodingKeys.option)
     }

Modules/Sources/Storage/GRDB/Model/PersistedProductVariationImage.swift

@@ -34,7 +34,7 @@ extension PersistedProductVariationImage: FetchableRecord, PersistableRecord {
 
     public enum Columns {
         static let id = Column(CodingKeys.id)
-        public static let productVariationID = Column(CodingKeys.productVariationID)
+        static let productVariationID = Column(CodingKeys.productVariationID)
         static let dateCreated = Column(CodingKeys.dateCreated)
         static let dateModified = Column(CodingKeys.dateModified)
         static let src = Column(CodingKeys.src)

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

@@ -20,25 +20,22 @@ public protocol POSCatalogIncrementalSyncServiceProtocol {
 public final class POSCatalogIncrementalSyncService: POSCatalogIncrementalSyncServiceProtocol {
     private let syncRemote: POSCatalogSyncRemoteProtocol
     private let batchSize: Int
-    private let persistenceService: POSCatalogPersistenceServiceProtocol
     private var lastIncrementalSyncDates: [Int64: Date] = [:]
     private let batchedLoader: BatchedRequestLoader
 
-    public convenience init?(credentials: Credentials?, batchSize: Int = 1, grdbManager: GRDBManagerProtocol) {
+    public convenience init?(credentials: Credentials?, batchSize: Int = 1) {
         guard let credentials else {
             DDLogError("⛔️ Could not create POSCatalogIncrementalSyncService due missing credentials")
             return nil
         }
         let network = AlamofireNetwork(credentials: credentials, ensuresSessionManagerIsInitialized: true)
         let syncRemote = POSCatalogSyncRemote(network: network)
-        let persistenceService = POSCatalogPersistenceService(grdbManager: grdbManager)
-        self.init(syncRemote: syncRemote, batchSize: batchSize, persistenceService: persistenceService)
+        self.init(syncRemote: syncRemote, batchSize: batchSize)
     }
 
-    init(syncRemote: POSCatalogSyncRemoteProtocol, batchSize: Int, persistenceService: POSCatalogPersistenceServiceProtocol) {
+    init(syncRemote: POSCatalogSyncRemoteProtocol, batchSize: Int) {
         self.syncRemote = syncRemote
         self.batchSize = batchSize
-        self.persistenceService = persistenceService
         self.batchedLoader = BatchedRequestLoader(batchSize: batchSize)
     }
 
@@ -54,8 +51,7 @@ public final class POSCatalogIncrementalSyncService: POSCatalogIncrementalSyncSe
             let catalog = try await loadCatalog(for: siteID, modifiedAfter: modifiedAfter, syncRemote: syncRemote)
             DDLogInfo("✅ Loaded \(catalog.products.count) products and \(catalog.variations.count) variations for siteID \(siteID)")
 
-            try await persistenceService.persistIncrementalCatalogData(catalog, siteID: siteID)
-            DDLogInfo("✅ Persisted \(catalog.products.count) products and \(catalog.variations.count) variations to database for siteID \(siteID)")
+            // TODO: WOOMOB-1298 - persist to database
 
             // TODO: WOOMOB-1289 - replace with store settings persistence
             lastIncrementalSyncDates[siteID] = syncStartDate

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

@@ -8,12 +8,6 @@ protocol POSCatalogPersistenceServiceProtocol {
     ///   - catalog: The catalog to persist
     ///   - siteID: The site ID to associate the catalog with
     func replaceAllCatalogData(_ catalog: POSCatalog, siteID: Int64) async throws
-
-    /// Persists incremental catalog data (insert/update)
-    /// - Parameters:
-    ///   - catalog: The catalog difference to persist
-    ///   - siteID: The site ID to associate the catalog with
-    func persistIncrementalCatalogData(_ catalog: POSCatalog, siteID: Int64) async throws
 }
 
 final class POSCatalogPersistenceService: POSCatalogPersistenceServiceProtocol {
@@ -74,70 +68,6 @@ final class POSCatalogPersistenceService: POSCatalogPersistenceServiceProtocol {
                       "\(variationImageCount) variation images, \(variationAttributeCount) variation attributes")
         }
     }
-
-    func persistIncrementalCatalogData(_ catalog: POSCatalog, siteID: Int64) async throws {
-        DDLogInfo("💾 Persisting incremental catalog with \(catalog.products.count) products and \(catalog.variations.count) variations")
-
-        try await grdbManager.databaseConnection.write { db in
-            let site = PersistedSite(id: siteID)
-            try site.insert(db, onConflict: .ignore)
-
-            for product in catalog.productsToPersist {
-                try product.insert(db, onConflict: .replace)
-            }
-
-            let productIDs = catalog.products.map { $0.productID }.map { String($0) }.joined(separator: ",")
-
-            try PersistedProductImage
-                .filter(sql: "\(PersistedProductImage.Columns.productID.name) IN (\(productIDs))")
-                .deleteAll(db)
-            for image in catalog.productImagesToPersist {
-                try image.insert(db, onConflict: .replace)
-            }
-
-            try PersistedProductAttribute
-                .filter(sql: "\(PersistedProductAttribute.Columns.productID.name) IN (\(productIDs))")
-                .deleteAll(db)
-            for var attribute in catalog.productAttributesToPersist {
-                try attribute.insert(db)
-            }
-
-            for variation in catalog.variationsToPersist {
-                try variation.insert(db, onConflict: .replace)
-            }
-
-            let variationIDs = catalog.variations.map { $0.productVariationID }.map { String($0) }.joined(separator: ",")
-
-            try PersistedProductVariationImage
-                .filter(sql: "\(PersistedProductVariationImage.Columns.productVariationID.name) IN (\(variationIDs))")
-                .deleteAll(db)
-            for image in catalog.variationImagesToPersist {
-                try image.insert(db, onConflict: .replace)
-            }
-
-            try PersistedProductVariationAttribute
-                .filter(sql: "\(PersistedProductVariationAttribute.Columns.productVariationID.name) IN (\(variationIDs))")
-                .deleteAll(db)
-            for var attribute in catalog.variationAttributesToPersist {
-                try attribute.insert(db)
-            }
-        }
-
-        DDLogInfo("✅ Incremental catalog persistence complete")
-
-        try await grdbManager.databaseConnection.read { db in
-            let productCount = try PersistedProduct.fetchCount(db)
-            let productImageCount = try PersistedProductImage.fetchCount(db)
-            let productAttributeCount = try PersistedProductAttribute.fetchCount(db)
-            let variationCount = try PersistedProductVariation.fetchCount(db)
-            let variationImageCount = try PersistedProductVariationImage.fetchCount(db)
-            let variationAttributeCount = try PersistedProductVariationAttribute.fetchCount(db)
-
-            DDLogInfo("Total after incremental update: \(productCount) products, \(productImageCount) product images, " +
-                      "\(productAttributeCount) product attributes, \(variationCount) variations, " +
-                      "\(variationImageCount) variation images, \(variationAttributeCount) variation attributes")
-        }
-    }
 }
 
 private extension POSCatalog {