From 371165010a4fee31e939f67bd8712291b42f9205 Mon Sep 17 00:00:00 2001
From: machiav3lli <antonios.hazim@tutanota.com>
Date: Fri, 4 Mar 2022 19:26:05 +0100
Subject: [PATCH] Add: Update category to query functions

---
 .../com/looker/droidify/database/DAOs.kt      | 42 +++++++++++++------
 1 file changed, 30 insertions(+), 12 deletions(-)

diff --git a/src/main/kotlin/com/looker/droidify/database/DAOs.kt b/src/main/kotlin/com/looker/droidify/database/DAOs.kt
index 60617ef8..63ae9cb8 100644
--- a/src/main/kotlin/com/looker/droidify/database/DAOs.kt
+++ b/src/main/kotlin/com/looker/droidify/database/DAOs.kt
@@ -8,6 +8,7 @@ import com.looker.droidify.*
 import com.looker.droidify.database.entity.*
 import com.looker.droidify.entity.Order
 import com.looker.droidify.entity.Section
+import com.looker.droidify.entity.UpdateCategory
 import com.looker.droidify.ui.fragments.Request
 
 interface BaseDao<T> {
@@ -80,20 +81,32 @@ interface ProductDao : BaseDao<Product> {
     fun queryObject(query: SupportSQLiteQuery): List<Product>
 
     fun queryObject(request: Request): List<Product> = queryObject(
-        request.installed,
-        request.updates,
-        request.searchQuery,
-        request.section,
-        request.order,
-        request.numberOfItems
+        buildProductQuery(
+            request.installed,
+            request.updates,
+            request.searchQuery,
+            request.section,
+            request.order,
+            request.numberOfItems,
+            request.updateCategory
+        )
     )
 
     @Transaction
     fun queryObject(
         installed: Boolean, updates: Boolean, searchQuery: String,
-        section: Section, order: Order, numberOfItems: Int = 0
+        section: Section, order: Order, numberOfItems: Int = 0,
+        updateCategory: UpdateCategory = UpdateCategory.ALL
     ): List<Product> = queryObject(
-        buildProductQuery(installed, updates, searchQuery, section, order, numberOfItems)
+        buildProductQuery(
+            installed,
+            updates,
+            searchQuery,
+            section,
+            order,
+            numberOfItems,
+            updateCategory
+        )
     )
 
     @RawQuery(observedEntities = [Product::class])
@@ -106,14 +119,19 @@ interface ProductDao : BaseDao<Product> {
             request.searchQuery,
             request.section,
             request.order,
-            request.numberOfItems
+            request.numberOfItems,
+            request.updateCategory
         )
     )
 
-    // TODO add an UpdateCategory argument
     fun buildProductQuery(
-        installed: Boolean, updates: Boolean, searchQuery: String,
-        section: Section, order: Order, numberOfItems: Int = 0
+        installed: Boolean,
+        updates: Boolean,
+        searchQuery: String,
+        section: Section,
+        order: Order,
+        numberOfItems: Int = 0,
+        updateCategory: UpdateCategory = UpdateCategory.ALL
     ): SupportSQLiteQuery {
         val builder = QueryBuilder()