Merge pull request #60 from enrique-lozano/transaction-filters-improv…

…ements Transaction filters improvements
enrique-lozano · Oct 17, 2023 · 34a074d · 34a074d
2 parents 704eb59 + 54acbf6
commit 34a074d
Show file tree

Hide file tree

Showing 55 changed files with 6,817 additions and 3,512 deletions.
diff --git a/build.yaml b/build.yaml
@@ -16,6 +16,11 @@ targets:
           generate_values_in_copy_with: true
           scoped_dart_components: true
 
+      copy_with_extension_gen:
+        enabled: true
+        options:
+          copy_with_null: true
+
       slang_build_runner:
         options:
           base_locale: en

diff --git a/lib/app/accounts/account_details.dart b/lib/app/accounts/account_details.dart
@@ -5,15 +5,15 @@ import 'package:intl/intl.dart';
 import 'package:monekin/app/accounts/account_form.dart';
 import 'package:monekin/app/transactions/transaction_list.dart';
 import 'package:monekin/app/transactions/transactions.page.dart';
-import 'package:monekin/core/database/app_db.dart';
 import 'package:monekin/core/database/services/account/account_service.dart';
 import 'package:monekin/core/database/services/exchange-rate/exchange_rate_service.dart';
 import 'package:monekin/core/models/account/account.dart';
 import 'package:monekin/core/models/transaction/transaction.dart';
+import 'package:monekin/core/models/transaction/transaction_status.dart';
 import 'package:monekin/core/presentation/widgets/card_with_header.dart';
-import 'package:monekin/core/presentation/widgets/filter_sheet_modal.dart';
 import 'package:monekin/core/presentation/widgets/monekin_quick_actions_buttons.dart';
 import 'package:monekin/core/presentation/widgets/number_ui_formatters/currency_displayer.dart';
+import 'package:monekin/core/presentation/widgets/transaction_filter/transaction_filters.dart';
 import 'package:monekin/core/utils/list_tile_action_item.dart';
 import 'package:monekin/i18n/translations.g.dart';
 
@@ -47,7 +47,7 @@ class _AccountDetailsPageState extends State<AccountDetailsPage> {
               )),
       ListTileActionItem(
           label: t.transfer.create,
-          icon: Icons.swap_vert_rounded,
+          icon: TransactionType.transfer.icon(),
           onClick: account.isArchived
               ? null
               : () async {
@@ -386,27 +386,20 @@ class _AccountDetailsPageState extends State<AccountDetailsPage> {
                                 MaterialPageRoute(
                                   builder: (context) => TransactionsPage(
                                     filters: TransactionFilters(
-                                        accounts: [widget.account]),
+                                        accountsIDs: [widget.account.id]),
                                   ),
                                 ),
                               );
                             },
                             body: StreamBuilder(
                                 stream: TransactionService.instance
                                     .getTransactions(
-                                        predicate: (transaction,
-                                                account,
-                                                accountCurrency,
-                                                receivingAccount,
-                                                receivingAccountCurrency,
-                                                c,
-                                                p6) =>
-                                            AppDB.instance.buildExpr([
-                                              transaction.status.isNotInValues([
-                                                TransactionStatus.pending,
-                                                TransactionStatus.voided
-                                              ])
-                                            ]),
+                                        filters: TransactionFilters(
+                                          status: TransactionStatus.notIn({
+                                            TransactionStatus.pending,
+                                            TransactionStatus.voided
+                                          }),
+                                        ),
                                         limit: 5,
                                         orderBy: (p0, p1, p2, p3, p4, p5, p6) =>
                                             drift.OrderBy([

diff --git a/lib/app/accounts/account_form.dart b/lib/app/accounts/account_form.dart
@@ -1,4 +1,3 @@
-import 'package:drift/drift.dart' as drift;
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/flutter_svg.dart';
 import 'package:intl/intl.dart';
@@ -10,11 +9,13 @@ import 'package:monekin/core/database/services/transaction/transaction_service.d
 import 'package:monekin/core/models/account/account.dart';
 import 'package:monekin/core/models/currency/currency.dart';
 import 'package:monekin/core/models/supported-icon/supported_icon.dart';
+import 'package:monekin/core/models/transaction/transaction.dart';
 import 'package:monekin/core/presentation/widgets/currency_selector_modal.dart';
 import 'package:monekin/core/presentation/widgets/expansion_panel/single_expansion_panel.dart';
 import 'package:monekin/core/presentation/widgets/icon_selector_modal.dart';
 import 'package:monekin/core/presentation/widgets/inline_info_card.dart';
 import 'package:monekin/core/presentation/widgets/persistent_footer_button.dart';
+import 'package:monekin/core/presentation/widgets/transaction_filter/transaction_filters.dart';
 import 'package:monekin/core/services/supported_icon/supported_icon_service.dart';
 import 'package:monekin/core/utils/text_field_utils.dart';
 import 'package:monekin/i18n/translations.g.dart';
@@ -61,10 +62,8 @@ class _AccountFormPageState extends State<AccountFormPage> {
     if (_accountToEdit != null) {
       if ((await TransactionService.instance
               .getTransactions(
-                predicate: (transaction, account, accountCurrency,
-                        receivingAccount, receivingAccountCurrency, c, p6) =>
-                    account.id.isValue(_accountToEdit!.id) &
-                    transaction.date.isSmallerThanValue(_openingDate),
+                filters: TransactionFilters(
+                    accountsIDs: [_accountToEdit!.id], maxDate: _openingDate),
                 limit: 2,
               )
               .first)
@@ -286,19 +285,16 @@ class _AccountFormPageState extends State<AccountFormPage> {
                           onTap: () {
                             if (_currency == null) return;
 
-                            showModalBottomSheet(
-                                context: context,
-                                isScrollControlled: true,
-                                showDragHandle: true,
-                                builder: (context) {
-                                  return CurrencySelectorModal(
-                                      preselectedCurrency: _currency!,
-                                      onCurrencySelected: (newCurrency) {
-                                        setState(() {
-                                          _currency = newCurrency;
-                                        });
-                                      });
-                                });
+                            showCurrencySelectorModal(
+                              context,
+                              CurrencySelectorModal(
+                                  preselectedCurrency: _currency!,
+                                  onCurrencySelected: (newCurrency) {
+                                    setState(() {
+                                      _currency = newCurrency;
+                                    });
+                                  }),
+                            );
                           },
                           decoration: InputDecoration(
                               labelText: t.currencies.currency,
@@ -338,20 +334,16 @@ class _AccountFormPageState extends State<AccountFormPage> {
                         stream: _accountToEdit == null
                             ? Stream.value(true)
                             : TransactionService.instance
-                                .getTransactions(
-                                    predicate: (transaction,
-                                            account,
-                                            accountCurrency,
-                                            receivingAccount,
-                                            receivingAccountCurrency,
-                                            c,
-                                            p6) =>
-                                        transaction.receivingAccountID
-                                            .isNull() &
-                                        transaction.accountID
-                                            .isValue(_accountToEdit!.id),
-                                    limit: 1)
-                                .map((event) => event.isEmpty),
+                                .countTransactions(
+                                  predicate: TransactionFilters(
+                                    transactionTypes: [
+                                      TransactionType.expense,
+                                      TransactionType.income
+                                    ],
+                                    accountsIDs: [_accountToEdit!.id],
+                                  ),
+                                )
+                                .map((event) => event.numberOfRes == 0),
                         builder: (context, snapshot) {
                           if (!snapshot.hasData || snapshot.data! == false) {
                             return Container();

diff --git a/lib/app/accounts/all_accounts_balance.dart b/lib/app/accounts/all_accounts_balance.dart
@@ -8,7 +8,7 @@ import 'package:monekin/core/database/services/account/account_service.dart';
 import 'package:monekin/core/models/account/account.dart';
 import 'package:monekin/core/presentation/widgets/animated_progress_bar.dart';
 import 'package:monekin/core/presentation/widgets/card_with_header.dart';
-import 'package:monekin/core/presentation/widgets/filter_sheet_modal.dart';
+import 'package:monekin/core/presentation/widgets/transaction_filter/transaction_filters.dart';
 import 'package:monekin/i18n/translations.g.dart';
 
 import '../../core/database/services/currency/currency_service.dart';
@@ -31,27 +31,29 @@ class CurrencyWithMoney {
 }
 
 class AllAccountBalancePage extends StatefulWidget {
-  const AllAccountBalancePage({super.key, required this.date, this.filters});
+  const AllAccountBalancePage(
+      {super.key,
+      required this.date,
+      this.filters = const TransactionFilters()});
 
   final DateTime date;
 
-  final TransactionFilters? filters;
+  final TransactionFilters filters;
 
   @override
   State<AllAccountBalancePage> createState() => _AllAccountBalancePageState();
 }
 
 class _AllAccountBalancePageState extends State<AllAccountBalancePage> {
-  Future<List<AccountWithMoney>> getAccountsWithMoney(
-      DateTime date, TransactionFilters? filters) async {
-    final accounts =
-        filters?.accounts ?? await AccountService.instance.getAccounts().first;
+  Future<List<AccountWithMoney>> getAccountsWithMoney(DateTime date,
+      {TransactionFilters filters = const TransactionFilters()}) async {
+    final accounts = await filters.accounts().first;
 
     final balances = accounts.map((account) async => AccountWithMoney(
         money: await AccountService.instance
             .getAccountMoney(
               account: account,
-              categoriesIds: filters?.categories?.map((e) => e.id),
+              trFilters: filters,
               convertToPreferredCurrency: true,
               date: date,
             )
@@ -97,7 +99,7 @@ class _AllAccountBalancePageState extends State<AllAccountBalancePage> {
     final t = Translations.of(context);
 
     return FutureBuilder(
-        future: getAccountsWithMoney(widget.date, widget.filters),
+        future: getAccountsWithMoney(widget.date, filters: widget.filters),
         builder: (context, snapshot) {
           if (!snapshot.hasData) {
             return const LinearProgressIndicator();

diff --git a/lib/app/budgets/budget_details_page.dart b/lib/app/budgets/budget_details_page.dart
@@ -5,17 +5,17 @@ import 'package:monekin/app/budgets/budget_form_page.dart';
 import 'package:monekin/app/budgets/budgets_page.dart';
 import 'package:monekin/app/budgets/components/budget_evolution_chart.dart';
 import 'package:monekin/app/transactions/transaction_list.dart';
-import 'package:monekin/core/database/app_db.dart';
 import 'package:monekin/core/database/services/budget/budget_service.dart';
 import 'package:monekin/core/database/services/transaction/transaction_service.dart';
 import 'package:monekin/core/models/budget/budget.dart';
-import 'package:monekin/core/models/transaction/transaction.dart';
+import 'package:monekin/core/models/transaction/transaction_status.dart';
 import 'package:monekin/core/presentation/theme.dart';
 import 'package:monekin/core/presentation/widgets/animated_progress_bar.dart';
 import 'package:monekin/core/presentation/widgets/card_with_header.dart';
 import 'package:monekin/core/presentation/widgets/monekin_popup_menu_button.dart';
 import 'package:monekin/core/presentation/widgets/number_ui_formatters/currency_displayer.dart';
 import 'package:monekin/core/presentation/widgets/skeleton.dart';
+import 'package:monekin/core/presentation/widgets/transaction_filter/transaction_filters.dart';
 import 'package:monekin/core/utils/list_tile_action_item.dart';
 import 'package:monekin/i18n/translations.g.dart';
 
@@ -43,7 +43,7 @@ class _BudgetDetailsPageState extends State<BudgetDetailsPage> {
           title: Text(t.budgets.details.title),
           bottom: TabBar(tabs: [
             Tab(text: t.budgets.details.statistics),
-            Tab(text: t.general.transactions),
+            Tab(text: t.transaction.display(n: 1)),
           ]),
           actions: [
             MonekinPopuMenuButton(actionItems: [
@@ -225,21 +225,21 @@ class _BudgetDetailsPageState extends State<BudgetDetailsPage> {
             ),
           ),
           StreamBuilder(
-              stream: TransactionService.instance.getTransactions(
-                predicate: (transaction, account, accountCurrency,
-                        receivingAccount, receivingAccountCurrency, c, p6) =>
-                    AppDB.instance.buildExpr([
-                  c.id.isIn(widget.budget.categories) |
-                      c.parentCategoryID.isIn(widget.budget.categories),
-                  transaction.accountID.isIn(widget.budget.accounts),
-                  transaction.isHidden.isNotValue(true),
-                  transaction.date
-                      .isBiggerThanValue(widget.budget.currentDateRange[0]),
-                  transaction.date
-                      .isSmallerThanValue(widget.budget.currentDateRange[1]),
-                  transaction.status.isNotInValues(
-                      [TransactionStatus.pending, TransactionStatus.voided])
-                ]),
+              stream: TransactionService.instance.getTransactionsFromPredicate(
+                predicate: TransactionFilters(
+                  status: TransactionStatus.notIn(
+                      {TransactionStatus.pending, TransactionStatus.voided}),
+                  minDate: widget.budget.currentDateRange[0],
+                  maxDate: widget.budget.currentDateRange[1],
+                ).toTransactionExpression(
+                  extraFilters: (transaction, account, accountCurrency,
+                          receivingAccount, receivingAccountCurrency, c, p6) =>
+                      [
+                    c.id.isIn(widget.budget.categories) |
+                        c.parentCategoryID.isIn(widget.budget.categories),
+                    transaction.accountID.isIn(widget.budget.accounts),
+                  ],
+                ),
               ),
               builder: (context, snapshot) {
                 if (!snapshot.hasData) {

diff --git a/lib/app/categories/categories_list.dart b/lib/app/categories/categories_list.dart
@@ -171,8 +171,8 @@ class _CategoriesListState extends State<CategoriesList> {
               appBar: AppBar(
                 elevation: 0,
                 bottom: TabBar(tabs: [
-                  Tab(text: t.general.incomes),
-                  Tab(text: t.general.expenses),
+                  Tab(text: t.transaction.types.income(n: 10)),
+                  Tab(text: t.transaction.types.expense(n: 10)),
                 ]),
                 title: Row(
                   mainAxisAlignment: MainAxisAlignment.spaceBetween,

diff --git a/lib/app/categories/form/category_form.dart b/lib/app/categories/form/category_form.dart
@@ -249,10 +249,12 @@ class _CategoryFormPageState extends State<CategoryFormPage> {
                               items: [
                                 DropdownMenuItem(
                                     value: CategoryType.I,
-                                    child: Text(t.general.income)),
+                                    child:
+                                        Text(t.transaction.types.income(n: 1))),
                                 DropdownMenuItem(
                                     value: CategoryType.E,
-                                    child: Text(t.general.expense)),
+                                    child: Text(
+                                        t.transaction.types.expense(n: 1))),
                                 DropdownMenuItem(
                                     value: CategoryType.B,
                                     child: Text(t.categories.both_types))