Remove unhelpful base requests

Author: joshheald

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

@@ -95,7 +95,8 @@ public extension PersistedProduct {
     /// Returns a request for POS-supported products (simple and variable, non-downloadable) for a given site, ordered by name
     static func posProductsRequest(siteID: Int64) -> QueryInterfaceRequest<PersistedProduct> {
         return PersistedProduct
-            .basePOSProductsRequest(siteID: siteID)
+            .filter(Columns.siteID == siteID)
+            .filter([ProductType.simple.rawValue, ProductType.variable.rawValue].contains(Columns.productTypeKey))
             .filter(Columns.downloadable == false)
             .order(Columns.name.collating(.localizedCaseInsensitiveCompare))
     }
@@ -106,17 +107,9 @@ public extension PersistedProduct {
     ///   - globalUniqueID: The global unique ID (barcode) to search for
     /// - Returns: A query request that matches products with the given global unique ID
     static func posProductByGlobalUniqueID(siteID: Int64, globalUniqueID: String) -> QueryInterfaceRequest<PersistedProduct> {
-        return PersistedProduct
-            .basePOSProductsRequest(siteID: siteID)
-            .filter(Columns.globalUniqueID == globalUniqueID)
-    }
-}
-
-private extension PersistedProduct {
-    static func basePOSProductsRequest(siteID: Int64) -> QueryInterfaceRequest<PersistedProduct> {
         return PersistedProduct
             .filter(Columns.siteID == siteID)
-            .filter([ProductType.simple.rawValue, ProductType.variable.rawValue].contains(Columns.productTypeKey))
+            .filter(Columns.globalUniqueID == globalUniqueID)
     }
 }
 

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

@@ -90,7 +90,7 @@ public extension PersistedProductVariation {
     /// Returns a request for non-downloadable variations of a parent product, ordered by ID
     static func posVariationsRequest(siteID: Int64, parentProductID: Int64) -> QueryInterfaceRequest<PersistedProductVariation> {
         return PersistedProductVariation
-            .basePOSVariationsRequest(siteID: siteID)
+            .filter(Columns.siteID == siteID)
             .filter(Columns.productID == parentProductID)
             .filter(Columns.downloadable == false)
             .order(Columns.id)
@@ -102,16 +102,9 @@ public extension PersistedProductVariation {
     ///   - globalUniqueID: The global unique ID (barcode) to search for
     /// - Returns: A query request that matches variations with the given global unique ID
     static func posVariationByGlobalUniqueID(siteID: Int64, globalUniqueID: String) -> QueryInterfaceRequest<PersistedProductVariation> {
-        return PersistedProductVariation
-            .basePOSVariationsRequest(siteID: siteID)
-            .filter(Columns.globalUniqueID == globalUniqueID)
-    }
-}
-
-private extension PersistedProductVariation {
-    static func basePOSVariationsRequest(siteID: Int64) -> QueryInterfaceRequest<PersistedProductVariation> {
         return PersistedProductVariation
             .filter(Columns.siteID == siteID)
+            .filter(Columns.globalUniqueID == globalUniqueID)
     }
 }