Add sorting to list items

wealth-wave · Jan 1, 2024 · 5c23d02 · 5c23d02
1 parent f92d1c9
commit 5c23d02
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 7 deletions.
diff --git a/lib/api/apis/basket_api.dart b/lib/api/apis/basket_api.dart
@@ -7,7 +7,9 @@ class BasketApi {
   BasketApi({final AppDatabase? db}) : _db = db ?? AppDatabase.instance;
 
   Future<List<BasketDO>> getBaskets() async {
-    return _db.select(_db.basketTable).get();
+    return (_db.select(_db.basketTable)
+          ..orderBy([(t) => OrderingTerm(expression: t.name)]))
+        .get();
   }
 
   Future<int> createBasket({required final String name}) async {

diff --git a/lib/api/apis/goal_api.dart b/lib/api/apis/goal_api.dart
@@ -8,11 +8,14 @@ class GoalApi {
   GoalApi({final AppDatabase? db}) : _db = db ?? AppDatabase.instance;
 
   Future<List<GoalDO>> getGoals() async {
-    return _db.select(_db.goalTable).get();
+    return (_db.select(_db.goalTable)
+          ..orderBy([(t) => OrderingTerm.asc(t.targetDate)]))
+        .get();
   }
 
   Future<GoalDO> getGoal({required final int id}) async {
-    return (_db.select(_db.goalTable)..where((t) => t.id.equals(id))).getSingle();
+    return (_db.select(_db.goalTable)..where((t) => t.id.equals(id)))
+        .getSingle();
   }
 
   Future<int> createGoal(

diff --git a/lib/api/apis/investment_api.dart b/lib/api/apis/investment_api.dart
@@ -8,19 +8,26 @@ class InvestmentApi {
   InvestmentApi({final AppDatabase? db}) : _db = db ?? AppDatabase.instance;
 
   Future<List<InvestmentDO>> getInvestments() async {
-    return _db.select(_db.investmentTable).get();
+    return (_db.select(_db.investmentTable)
+          ..orderBy([(t) => OrderingTerm.asc(t.name)]))
+        .get();
   }
 
   Future<List<InvestmentEnrichedDO>> getEnrichedInvestments() async {
-    return _db.select(_db.investmentEnrichedView).get();
+    return (_db.select(_db.investmentEnrichedView)
+          ..orderBy([(t) => OrderingTerm.asc(t.name)]))
+        .get();
   }
 
   Future<List<TransactionDO>> getTransactions({final int? investmentId}) async {
     if (investmentId == null) {
-      return _db.select(_db.transactionTable).get();
+      return (_db.select(_db.transactionTable)
+            ..orderBy([(t) => OrderingTerm.desc(t.amountInvestedOn)]))
+          .get();
     } else {
       return (_db.select(_db.transactionTable)
-            ..where((t) => t.investmentId.equals(investmentId)))
+            ..where((t) => t.investmentId.equals(investmentId))
+            ..orderBy([(t) => OrderingTerm.desc(t.amountInvestedOn)]))
           .get();
     }
   }