added account filter

lib/domains/transaction/transaction_bloc.dart

@@ -1,3 +1,5 @@
+import 'dart:async';
+
 import 'package:equatable/equatable.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:formz/formz.dart';
@@ -7,6 +9,7 @@ import 'package:krezus/domains/transaction/models/transaction_date.dart';
 import 'package:krezus/domains/transaction/models/transaction_description.dart';
 import 'package:krezus/domains/transaction/models/transaction_line.dart';
 import 'package:krezus/domains/transaction/models/transaction_value.dart';
+import 'package:krezus/repositories/metadata/models/account.dart';
 import 'package:krezus/repositories/metadata/models/category.dart';
 import 'package:krezus/repositories/transactions/models/transaction.dart';
 import 'package:krezus/repositories/transactions/transactions_repository.dart';
@@ -33,18 +36,19 @@ class TransactionBloc extends Bloc<TransactionEvent, TransactionState> {
     on<TransactionSetCurrent>(_onTransactionSetCurrent);
     on<TransactionDeleteCurrent>(_onTransactionDeleteCurrent);
     on<TransactionFilterCategory>(_onTransactionFilterCategory);
+    on<TransactionFilterAccount>(_onTransactionFilterAccount);
 
     _transactionsRepository
       .getTransactionsStream()
       .listen((transactions) => add(TransactionsLoad(transactions)));
   }
 
-  _onAccountLoad(TransactionsLoad event, Emitter<TransactionState> emit) {
+  FutureOr<void> _onAccountLoad(TransactionsLoad event, Emitter<TransactionState> emit) {
     var computeResult = _computeTransactionLine(event.transactions);
     emit(state.copyWith(
       transactions: event.transactions,
       transactionsLines: computeResult.list,
-      transactionsLinesFiltered: _applyCategoryFilter(computeResult.list),
+      transactionsLinesFiltered: _applyFilters(computeResult.list),
       globalTotal: computeResult.globalTotal,
       accountsTotals: computeResult.accountsTotals,
     ));
@@ -73,7 +77,7 @@ class TransactionBloc extends Bloc<TransactionEvent, TransactionState> {
     return (list: output, globalTotal: globalTotal, accountsTotals: accountsTotals, categories: categories.toList());
   }
 
-  _onTransactionDateChange(
+  FutureOr<void> _onTransactionDateChange(
     TransactionDateChange event, Emitter<TransactionState> emit
   ) {
     final transactionDate = TransactionDate.dirty(event.date);
@@ -83,7 +87,7 @@ class TransactionBloc extends Bloc<TransactionEvent, TransactionState> {
     ));
   }
 
-  _onTransactionCategoryChange(
+  FutureOr<void> _onTransactionCategoryChange(
     TransactionCategoryChange event, Emitter<TransactionState> emit
   ) {
     final transactionCategory = TransactionCategory.dirty(event.category);
@@ -93,7 +97,7 @@ class TransactionBloc extends Bloc<TransactionEvent, TransactionState> {
     ));
   }
 
-  _onTransactionDescriptionChange(
+  FutureOr<void> _onTransactionDescriptionChange(
     TransactionDescriptionChange event, Emitter<TransactionState> emit
   ) {
     final transactionDescription = TransactionDescription.dirty(event.description);
@@ -103,7 +107,7 @@ class TransactionBloc extends Bloc<TransactionEvent, TransactionState> {
     ));
   }
 
-  _onTransactionAccountChange(
+  FutureOr<void> _onTransactionAccountChange(
     TransactionAccountChange event, Emitter<TransactionState> emit
   ) {
     final transactionAccount = TransactionAccount.dirty(event.account);
@@ -113,7 +117,7 @@ class TransactionBloc extends Bloc<TransactionEvent, TransactionState> {
     ));
   }
 
-  _onTransactionValueChange(
+  FutureOr<void> _onTransactionValueChange(
     TransactionValueChange event, Emitter<TransactionState> emit
   ) {
     try {
@@ -131,19 +135,19 @@ class TransactionBloc extends Bloc<TransactionEvent, TransactionState> {
     }
   }
 
-  _onTransactionOpenAddDialog(
+  FutureOr<void> _onTransactionOpenAddDialog(
     TransactionOpenAddDialog event, Emitter<TransactionState> emit
   ) {
     emit(state.copyWith(showAddDialog: true));
   }
 
-  _onTransactionHideAddDialog(
+  FutureOr<void> _onTransactionHideAddDialog(
     TransactionHideAddDialog event, Emitter<TransactionState> emit
   ) {
     emit(state.copyWith(showAddDialog: false));
   }
 
-  _onTransactionAddDialog(
+  FutureOr<void> _onTransactionAddDialog(
     TransactionAdd event, Emitter<TransactionState> emit
   ) {
     if (state.isValid) {
@@ -174,14 +178,14 @@ class TransactionBloc extends Bloc<TransactionEvent, TransactionState> {
         // transactionValue: const TransactionValue.pure(),
         transactions: transactions,
         transactionsLines: computeResult.list,
-        transactionsLinesFiltered: _applyCategoryFilter(computeResult.list),
+        transactionsLinesFiltered: _applyFilters(computeResult.list),
         globalTotal: computeResult.globalTotal,
         accountsTotals: computeResult.accountsTotals,
       ));
     }
   }
 
-  _onTransactionSetCurrent(
+  FutureOr<void> _onTransactionSetCurrent(
     TransactionSetCurrent event, Emitter<TransactionState> emit
   ) {
     Transaction? transaction = event.transaction;
@@ -206,7 +210,7 @@ class TransactionBloc extends Bloc<TransactionEvent, TransactionState> {
     }
   }
 
-  _onTransactionDeleteCurrent(
+  FutureOr<void> _onTransactionDeleteCurrent(
     TransactionDeleteCurrent event, Emitter<TransactionState> emit
   ) {
     Transaction? currentTransaction = state.currentTransaction;
@@ -224,33 +228,72 @@ class TransactionBloc extends Bloc<TransactionEvent, TransactionState> {
         transactionValue: const TransactionValue.pure(),
         transactions: transactions,
         transactionsLines: computeResult.list,
-        transactionsLinesFiltered: _applyCategoryFilter(computeResult.list),
+        transactionsLinesFiltered: _applyFilters(computeResult.list),
         globalTotal: computeResult.globalTotal,
         accountsTotals: computeResult.accountsTotals,
       ));
     }
   }
-  
 
-  _onTransactionFilterCategory(TransactionFilterCategory event, Emitter<TransactionState> emit) {
-    List<TransactionLine> transactionsLinesFiltered = state.transactionsLines;
-    String? categoryLabel = event.category?.label;
-    if (categoryLabel != null) {
-      transactionsLinesFiltered = state.transactionsLines.where((transaction) => transaction.transaction.category == categoryLabel).toList();
-    }
+  FutureOr<void> _onTransactionFilterCategory(TransactionFilterCategory event, Emitter<TransactionState> emit) {
+    emit(TransactionState(
+      globalTotal: state.globalTotal,
+      accountsTotals: state.accountsTotals,
+      transactions: state.transactions,
+      transactionsLines: state.transactionsLines,
+      transactionsLinesFiltered: state.transactionsLinesFiltered,
+      transactionDate: state.transactionDate,
+      transactionCategory: state.transactionCategory,
+      transactionDescription: state.transactionDescription,
+      transactionAccount: state.transactionAccount,
+      transactionValue: state.transactionValue,
+      isValid: state.isValid,
+      showAddDialog: state.showAddDialog,
+      currentTransaction: state.currentTransaction,
+      categoryFilter: event.category,
+      accountFilter: state.accountFilter,
+    ));
 
     emit(state.copyWith(
-      transactionsLinesFiltered: transactionsLinesFiltered,
-      categoryFilter: event.category,
+      transactionsLinesFiltered: _applyFilters(state.transactionsLines),
     ));
   }
 
-  List<TransactionLine> _applyCategoryFilter(List<TransactionLine> transactionsLines) {
+  FutureOr<void> _onTransactionFilterAccount(TransactionFilterAccount event, Emitter<TransactionState> emit) {
+    emit(TransactionState(
+      globalTotal: state.globalTotal,
+      accountsTotals: state.accountsTotals,
+      transactions: state.transactions,
+      transactionsLines: state.transactionsLines,
+      transactionsLinesFiltered: state.transactionsLinesFiltered,
+      transactionDate: state.transactionDate,
+      transactionCategory: state.transactionCategory,
+      transactionDescription: state.transactionDescription,
+      transactionAccount: state.transactionAccount,
+      transactionValue: state.transactionValue,
+      isValid: state.isValid,
+      showAddDialog: state.showAddDialog,
+      currentTransaction: state.currentTransaction,
+      categoryFilter: state.categoryFilter,
+      accountFilter: event.account,
+    ));
+    emit(state.copyWith(
+      transactionsLinesFiltered: _applyFilters(state.transactionsLines),
+    ));
+  }
+
+  List<TransactionLine> _applyFilters(List<TransactionLine> transactionsLines) {
     List<TransactionLine> transactionsLinesFiltered = transactionsLines;
     String? categoryLabel = state.categoryFilter?.label;
     if (categoryLabel != null) {
-      transactionsLinesFiltered = state.transactionsLines.where((transaction) => transaction.transaction.category == categoryLabel).toList();
+      transactionsLinesFiltered = transactionsLinesFiltered.where((transaction) => transaction.transaction.category == categoryLabel).toList();
     }
+
+    String? accountLabel = state.accountFilter?.label;
+    if (accountLabel != null) {
+      transactionsLinesFiltered = transactionsLinesFiltered.where((transaction) => transaction.transaction.account == accountLabel).toList();
+    }
+
     return transactionsLinesFiltered;
   }
 }