fix qty 0 bug

wealth-wave · Aug 9, 2024 · 54c6a02 · 54c6a02
1 parent 6dd78bf
commit 54c6a02
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 20 deletions.
diff --git a/lib/domain/models/investment.dart b/lib/domain/models/investment.dart
@@ -45,14 +45,8 @@ class Investment {
         .fold(0, (value, element) => value + element);
   }
 
-  double get qty {
-    if (_qty == null) {
-      return 1;
-    } else if (_qty == 0) {
-      return 1;
-    } else {
-      return _qty;
-    }
+  double? get qty {
+    return _qty;
   }
 
   DateTime getLastInvestedOn() {
@@ -78,18 +72,21 @@ class Investment {
     final value = this.value;
     final irr = this.irr;
     if (value != null) {
-      return value * qty;
+      return value * (qty ?? 1);
     } else if (irr != null) {
       final payments = getPayments(till: DateTime.now());
       return IRRCalculator().calculateFutureValueOnIRR(
           payments: payments, irr: irr, futureDate: DateTime.now());
     } else {
-      throw Exception('Value and IRR are null');
+      return 0;
     }
   }
 
   double getValuePerUnit() {
-    return getValue() / qty;
+    if (qty == 0) {
+      return 0;
+    }
+    return getValue() / (qty ?? 1);
   }
 
   double getValueOn(
@@ -107,7 +104,7 @@ class Investment {
           till: futureDate, considerFuturePayments: considerFuturePayments);
       final irr = IRRCalculator().calculateIRR(
           payments: paymentTillNow,
-          value: value * qty,
+          value: value * (qty ?? 1),
           valueUpdatedOn: DateTime.now());
       return IRRCalculator().calculateFutureValueOnIRR(
         irr: irr,
@@ -120,7 +117,7 @@ class Investment {
       return IRRCalculator().calculateFutureValueOnIRR(
           payments: payments, irr: irr, futureDate: futureDate);
     } else {
-      throw Exception('Value and IRR are null');
+      return 0;
     }
   }
 
@@ -134,10 +131,10 @@ class Investment {
 
       return IRRCalculator().calculateIRR(
           payments: payments,
-          value: value * qty,
+          value: value * (qty ?? 1),
           valueUpdatedOn: DateTime.now());
     } else {
-      throw Exception('Value and IRR are null');
+      return 0;
     }
   }
 
@@ -153,7 +150,9 @@ class Investment {
           riskLevel: investmentDO.riskLevel,
           irr: investmentDO.irr,
           value: investmentDO.value,
-          qty: investmentDO.qty,
+          qty: transactionsDOs.any((element) => element.qty > 0)
+              ? investmentDO.qty
+              : null,
           valueUpdatedOn: investmentDO.valueUpdatedOn,
           basketId: investmentDO.basketId,
           maturityDate: investmentDO.maturityDate,

diff --git a/lib/ui/models/investment_vo.dart b/lib/ui/models/investment_vo.dart
@@ -53,7 +53,7 @@ class InvestmentVO {
         investedValue: investment.getTotalInvestedAmount(),
         currentValue: investment.getValue(),
         valueUpdatedDate: investment.valueUpdatedOn,
-        qty: investment.qty,
+        qty: investment.qty ?? 1,
         valuePerQty: investment.getValuePerUnit(),
         basketId: investment.basketId,
         basketName: investment.basketName,

diff --git a/lib/ui/pages/investments_page.dart b/lib/ui/pages/investments_page.dart
@@ -119,6 +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,
         margin: const EdgeInsets.all(AppDimen.defaultPadding),
         child: InkWell(
           onTap: () => {
@@ -177,7 +178,8 @@ class _InvestmentsPage extends PageState<InvestmentsViewState, InvestmentsPage,
                             Text(
                               ('Qty ${NumberFormat.compact().format(investmentVO.qty)}'),
                             ),
-                            const Padding(padding: EdgeInsets.all(AppDimen.minPadding)),
+                            const Padding(
+                                padding: EdgeInsets.all(AppDimen.minPadding)),
                             Text(
                               ('Price ${NumberFormat.compact().format(investmentVO.valuePerQty)}'),
                             ),

diff --git a/lib/ui/presentation/investment_presenter.dart b/lib/ui/presentation/investment_presenter.dart
@@ -139,7 +139,7 @@ class InvestmentVO {
         irr: investment.getIRR(),
         investedValue: investment.getTotalInvestedAmount(),
         currentValue: investment.getValue(),
-        qty: investment.qty,
+        qty: investment.qty ?? 1,
         basketId: investment.basketId,
         basketName: investment.basketName,
         transactions: investment.transactions,

diff --git a/lib/ui/presentation/investments_presenter.dart b/lib/ui/presentation/investments_presenter.dart
@@ -14,7 +14,6 @@ class InvestmentsPresenter extends Presenter<InvestmentsViewState> {
         .get()
         .then((investments) => investments
             .map((investment) => InvestmentVO.from(investment: investment))
-            .where((element) => element.qty > 0)
             .toList())
         .then((investmentVOs) {
       investmentVOs.sort((a, b) => a.currentValue > b.currentValue ? -1 : 1);