fix: stats_tab data ignoring when isPending is not present

flow-mn · Nov 18, 2024 · cc66565 · cc66565
1 parent 84447dc
commit cc66565
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 14 deletions.
diff --git a/lib/objectbox/actions.dart b/lib/objectbox/actions.dart
@@ -144,13 +144,14 @@ extension MainActions on ObjectBox {
     bool ignoreTransfers = true,
     String? currencyOverride,
   }) async {
-    final Condition<Transaction> dateFilter =
-        Transaction_.transactionDate.betweenDate(from, to);
+    final Condition<Transaction> dateFilter = Transaction_.transactionDate
+        .betweenDate(from, to)
+        .and(Transaction_.isPending
+            .isNull()
+            .or(Transaction_.isPending.notEquals(true)));
 
-    final Query<Transaction> transactionsQuery = ObjectBox()
-        .box<Transaction>()
-        .query(dateFilter.and(Transaction_.isPending.notEquals(true)))
-        .build();
+    final Query<Transaction> transactionsQuery =
+        ObjectBox().box<Transaction>().query(dateFilter).build();
 
     final List<Transaction> transactions = await transactionsQuery.findAsync();
 
@@ -181,13 +182,14 @@ extension MainActions on ObjectBox {
     bool omitZeroes = true,
     String? currencyOverride,
   }) async {
-    final Condition<Transaction> dateFilter =
-        Transaction_.transactionDate.betweenDate(from, to);
-
-    final Query<Transaction> transactionsQuery = ObjectBox()
-        .box<Transaction>()
-        .query(dateFilter.and(Transaction_.isPending.notEquals(true)))
-        .build();
+    final Condition<Transaction> dateFilter = Transaction_.transactionDate
+        .betweenDate(from, to)
+        .and(Transaction_.isPending
+            .isNull()
+            .or(Transaction_.isPending.notEquals(true)));
+
+    final Query<Transaction> transactionsQuery =
+        ObjectBox().box<Transaction>().query(dateFilter).build();
 
     final List<Transaction> transactions = await transactionsQuery.findAsync();
 

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -3,7 +3,7 @@ description: A personal finance managing app
 
 publish_to: "none" # Remove this line if you wish to publish to pub.dev
 
-version: "0.8.1+80"
+version: "0.8.1+81"
 
 environment:
   sdk: ">=3.5.0 <4.0.0"