improve record filtering, more dao methods

Author: Razeeman

core/src/main/java/com/example/util/simpletimetracker/core/interactor/RecordFilterInteractor.kt

@@ -130,8 +130,6 @@ class RecordFilterInteractor @Inject constructor(
         val durations: List<Range> = filters.getDuration()?.let(::listOf).orEmpty()
         val duplicationItems: List<RecordsFilter.DuplicationsItem> = filters.getDuplicationItems()
 
-        // TODO Use different queries for optimization.
-        // TODO by tag (tagged, untagged).
         val records: List<RecordBase> = when {
             hasUntracked -> {
                 val range = definedRanges.firstOrNull() ?: Range(0, 0)
@@ -177,6 +175,13 @@ class RecordFilterInteractor @Inject constructor(
             selectedAnyComment -> {
                 interactor.getWithParams(GetParam.AnyComment)
             }
+            selectedTagItems.isNotEmpty() -> {
+                val tagged = selectedTaggedIds.takeIf { it.isNotEmpty() }
+                    ?.let { interactor.getWithParams(GetParam.Tagged(it)) }.orEmpty()
+                val untagged = selectedUntagged.takeIf { it }
+                    ?.let { interactor.getWithParams(GetParam.Untagged) }.orEmpty()
+                tagged + untagged
+            }
             else -> interactor.getAll()
         }.let {
             // For these filter running records are added separately.
@@ -362,4 +367,4 @@ class RecordFilterInteractor @Inject constructor(
     companion object {
         private val dayInMillis = TimeUnit.DAYS.toMillis(1)
     }
-}
+}

data_local/src/main/java/com/example/util/simpletimetracker/data_local/record/RecordDao.kt

@@ -37,6 +37,14 @@ interface RecordDao {
     @Query("SELECT * FROM records WHERE comment != \"\"")
     suspend fun searchAnyComments(): List<RecordWithRecordTagsDBO>
 
+    @Transaction
+    @Query("SELECT * FROM records WHERE EXISTS(SELECT 1 FROM recordToRecordTag WHERE record_id = records.id AND record_tag_id IN (:tagIds))")
+    suspend fun getTagged(tagIds: List<Long>): List<RecordWithRecordTagsDBO>
+
+    @Transaction
+    @Query("SELECT * FROM records WHERE NOT EXISTS(SELECT 1 FROM recordToRecordTag WHERE record_id = records.id)")
+    suspend fun getUntagged(): List<RecordWithRecordTagsDBO>
+
     @Transaction
     @Query("SELECT * FROM records WHERE id = :id LIMIT 1")
     suspend fun get(id: Long): RecordWithRecordTagsDBO?
@@ -106,4 +114,4 @@ interface RecordDao {
 
     @Query("DELETE FROM records")
     suspend fun clear()
-}
+}

data_local/src/main/java/com/example/util/simpletimetracker/data_local/record/RecordRepoImpl.kt

@@ -68,6 +68,16 @@ class RecordRepoImpl @Inject constructor(
         recordDao.searchAnyComments().map(::mapItem)
     }
 
+    override suspend fun getTagged(tagIds: List<Long>): List<Record> = withContext(Dispatchers.IO) {
+        logDataAccess("getTagged")
+        recordDao.getTagged(tagIds).map(::mapItem)
+    }
+
+    override suspend fun getUntagged(): List<Record> = withContext(Dispatchers.IO) {
+        logDataAccess("getUntagged")
+        recordDao.getUntagged().map(::mapItem)
+    }
+
     override suspend fun get(id: Long): Record? = mutex.withLockedCache(
         logMessage = "get",
         accessCache = { recordCache[id] },
@@ -226,4 +236,4 @@ class RecordRepoImpl @Inject constructor(
     private data class GetFromRangeKey(
         val range: Range,
     )
-}
+}

domain/src/main/java/com/example/util/simpletimetracker/domain/record/interactor/RecordInteractor.kt

@@ -28,6 +28,8 @@ class RecordInteractor @Inject constructor(
             is GetParam.TypeWithComment -> recordRepo.searchByTypeWithComment(param.ids, param.text)
             is GetParam.Comment -> recordRepo.searchComment(param.text)
             is GetParam.AnyComment -> recordRepo.searchAnyComments()
+            is GetParam.Tagged -> recordRepo.getTagged(param.ids)
+            is GetParam.Untagged -> recordRepo.getUntagged()
             is GetParam.FromRange -> recordRepo.getFromRange(param.range)
             is GetParam.FromRangeByType -> recordRepo.getFromRangeByType(param.ids, param.range)
         }
@@ -125,7 +127,9 @@ class RecordInteractor @Inject constructor(
         data class TypeWithComment(val ids: List<Long>, val text: String) : GetParam
         data class Comment(val text: String) : GetParam
         data object AnyComment : GetParam
+        data class Tagged(val ids: List<Long>) : GetParam
+        data object Untagged : GetParam
         data class FromRange(val range: Range) : GetParam
         data class FromRangeByType(val ids: List<Long>, val range: Range) : GetParam
     }
-}
+}

domain/src/main/java/com/example/util/simpletimetracker/domain/record/repo/RecordRepo.kt

@@ -19,6 +19,10 @@ interface RecordRepo {
 
     suspend fun searchAnyComments(): List<Record>
 
+    suspend fun getTagged(tagIds: List<Long>): List<Record>
+
+    suspend fun getUntagged(): List<Record>
+
     suspend fun get(id: Long): Record?
 
     suspend fun getFromRange(range: Range): List<Record>
@@ -56,4 +60,4 @@ interface RecordRepo {
     suspend fun removeByType(typeId: Long)
 
     suspend fun clear()
-}
+}