optimize fetching products from storage when checking products

Author: itsmeichigo

Modules/Sources/Storage/Tools/StorageType+Extensions.swift

@@ -271,6 +271,20 @@ public extension StorageType {
         return allObjects(ofType: Product.self, matching: predicate, sortedBy: [descriptor])
     }
 
+    /// Has stored Products for the provided siteID and optional requirements.
+    ///
+    func hasProducts(siteID: Int64, status: String?, type: String?) -> Bool {
+        var predicates: [NSPredicate] = [\Product.siteID == siteID]
+        if let status {
+            predicates.append(\Product.statusKey == status)
+        }
+        if let type {
+            predicates.append(\Product.productTypeKey == type)
+        }
+        let combinedPredicate = NSCompoundPredicate(type: .and, subpredicates: predicates)
+        return firstObject(ofType: Product.self, matching: combinedPredicate) != nil
+    }
+
     /// Retrieves all of the stored Products matching the provided array products ids from the provided SiteID
     ///
     func loadProducts(siteID: Int64, productsIDs: [Int64]) -> [Product] {

Modules/Sources/Yosemite/Stores/ProductStore.swift

@@ -568,14 +568,8 @@ private extension ProductStore {
                                  onCompletion: @escaping (Result<Bool, Error>) -> Void) {
         // Check for locally stored products first.
         let storage = storageManager.viewStorage
-        if let products = storage.loadProducts(siteID: siteID), !products.isEmpty {
-            if let status, (products.filter { $0.statusKey == status.rawValue }.isEmpty) == false {
-                return onCompletion(.success(true))
-            } else if let productType, products.contains(where: { $0.productTypeKey == productType.rawValue}) {
-                return onCompletion(.success(true))
-            } else if status == nil && productType == nil {
-                return onCompletion(.success(true))
-            }
+        if storage.hasProducts(siteID: siteID, status: status?.rawValue, type: productType?.rawValue) {
+            return onCompletion(.success(true))
         }
 
         // If there are no locally stored products, then check remote.