Fix of '[FEATURE] Reports by Excluding Tags'- reviews resoled

Ivy-Apps · Sep 23, 2024 · 2282880 · 2282880
1 parent 5a54321
commit 2282880
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/screen/reports/src/main/java/com/ivy/reports/FilterOverlay.kt b/screen/reports/src/main/java/com/ivy/reports/FilterOverlay.kt
@@ -278,7 +278,7 @@ fun BoxWithConstraintsScope.FilterOverlay(
 
             FilterDivider()
 
-            tagsFilter(
+            TagsFilter(
                 filter = localFilter,
                 onIncludesTagButtonClick = {
                     includedTagModalVisible = true
@@ -474,7 +474,7 @@ fun BoxWithConstraintsScope.FilterOverlay(
 }
 
 @Composable
-fun ColumnScope.tagsFilter(
+fun ColumnScope.TagsFilter(
     filter: ReportFilter?,
     onIncludesTagButtonClick: () -> Unit,
     onExcludesTagButtonClick: () -> Unit,

diff --git a/screen/reports/src/main/java/com/ivy/reports/ReportViewModel.kt b/screen/reports/src/main/java/com/ivy/reports/ReportViewModel.kt
@@ -389,12 +389,12 @@ class ReportViewModel @Inject constructor(
             transactionRepository.findAll()
         }
 
-        val exacludeableByTagTransactionsIds = if (filter.excludedTags.isNotEmpty()) {
+        val excludeableByTagTransactionsIds = if (filter.excludedTags.isNotEmpty()) {
             tagRepository.findByAllAssociatedIdForTagId(filter.excludedTags)
                 .asSequence()
                 .flatMap { it.value }
-                .map { TransactionId(it.associatedId.value) }
                 .distinct()
+                .map { TransactionId(it.associatedId.value) }
                 .toList()
                 .let {
                     transactionRepository.findByIds(it)
@@ -406,7 +406,7 @@ class ReportViewModel @Inject constructor(
         }
 
         return transactions
-            .filter { !exacludeableByTagTransactionsIds.contains(it.id) }
+            .filter { !excludeableByTagTransactionsIds.contains(it.id) }
             .filter {
                 with(transactionMapper) {
                     filter.trnTypes.contains(it.getTransactionType())