Exclude inactive investments for dashboard

wealth-wave · Aug 15, 2024 · e0910ab · e0910ab
1 parent 54c6a02
commit e0910ab
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/lib/domain/models/investment.dart b/lib/domain/models/investment.dart
@@ -53,6 +53,10 @@ class Investment {
     return getPayments().lastOrNull?.createdOn ?? DateTime.now();
   }
 
+  bool inActive() {
+    return transactions.any((element) => element.qty > 0) && qty == 0;
+  }
+
   List<Payment> getPayments(
       {final DateTime? till, bool considerFuturePayments = false}) {
     final payments = transactions

diff --git a/lib/ui/models/investment_vo.dart b/lib/ui/models/investment_vo.dart
@@ -13,6 +13,7 @@ class InvestmentVO {
   final double currentValue;
   final DateTime? valueUpdatedDate;
   final double qty;
+  final bool inActive;
   final double valuePerQty;
   final DateTime? maturityDate;
   final int? basketId;
@@ -37,6 +38,7 @@ class InvestmentVO {
       required this.currentValue,
       required this.valueUpdatedDate,
       required this.qty,
+      required this.inActive,
       required this.valuePerQty,
       required this.maturityDate,
       required this.transactions,
@@ -53,6 +55,7 @@ class InvestmentVO {
         investedValue: investment.getTotalInvestedAmount(),
         currentValue: investment.getValue(),
         valueUpdatedDate: investment.valueUpdatedOn,
+        inActive: investment.inActive(),
         qty: investment.qty ?? 1,
         valuePerQty: investment.getValuePerUnit(),
         basketId: investment.basketId,

diff --git a/lib/ui/pages/investments_page.dart b/lib/ui/pages/investments_page.dart
@@ -119,7 +119,7 @@ class _InvestmentsPage extends PageState<InvestmentsViewState, InvestmentsPage,
       {required final BuildContext context,
       required final InvestmentVO investmentVO}) {
     return Card(
-        color: investmentVO.qty == 0 ? Colors.grey : null,
+        color: investmentVO.inActive ? Colors.grey : null,
         margin: const EdgeInsets.all(AppDimen.defaultPadding),
         child: InkWell(
           onTap: () => {

diff --git a/lib/ui/presentation/dashboard_presenter.dart b/lib/ui/presentation/dashboard_presenter.dart
@@ -26,7 +26,8 @@ class DashboardPresenter extends Presenter<DashboardViewState> {
       Map<int, double> irrComposition = {};
       List<Payment> payments = [];
 
-      for (var investment in investments) {
+      var activeInvestments = investments.where((investment) => !investment.inActive()).toList();
+      for (var investment in activeInvestments) {
         double investmentValue = investment.getValueOn(date: DateTime.now());
         double investedAmount =
             investment.getTotalInvestedAmount(till: DateTime.now());
@@ -60,8 +61,8 @@ class DashboardPresenter extends Presenter<DashboardViewState> {
         viewState.valueOverTime = _getValueOverTime(investments);
         viewState.investmentOverTime = _getInvestmentOverTime(investments);
         viewState.overallIRR = overallIRR;
-        viewState.basketIrr = _calculateBasketIRR(investments);
-        viewState.irrGroups = _calculateIRRGroups(investments);
+        viewState.basketIrr = _calculateBasketIRR(activeInvestments);
+        viewState.irrGroups = _calculateIRRGroups(activeInvestments);
       });
     });
   }