save commit

lib/api/apis/goal_investment_api.dart

@@ -9,10 +9,10 @@ class GoalInvestmentApi {
   Future<int> create(
       {required final int goalId,
       required final int investmentId,
-      required final double split}) async {
+      required final double splitPercentage}) async {
     return _db.into(_db.goalInvestmentTable).insert(
         GoalInvestmentTableCompanion.insert(
-            goalId: goalId, investmentId: investmentId, split: split));
+            goalId: goalId, investmentId: investmentId, splitPercentage: splitPercentage));
   }
 
   Future<List<GoalInvestmentDO>> getBy(
@@ -38,12 +38,12 @@ class GoalInvestmentApi {
       {required final int id,
       required final int goalId,
       required final int investmentId,
-      required final double split}) async {
+      required final double splitPercentage}) async {
     return (_db.update(_db.goalInvestmentTable)..where((t) => t.id.equals(id)))
         .write(GoalInvestmentTableCompanion(
             investmentId: Value(investmentId),
             goalId: Value(goalId),
-            split: Value(split)));
+            splitPercentage: Value(splitPercentage)));
   }
 
   Future<int> deleteBy(

lib/api/db/app_database.dart

@@ -107,7 +107,7 @@ class GoalInvestmentTable extends Table {
   IntColumn get investmentId =>
       integer().named('INVESTMENT_ID').references(GoalTable, #id)();
 
-  RealColumn get split => real().named('SPLIT')();
+  RealColumn get splitPercentage => real().named('SPLIT_PERCENTAGE')();
 }
 
 @DataClassName('InvestmentEnrichedDO')

lib/domain/models/goal.dart

@@ -4,6 +4,7 @@ import 'package:wealth_wave/api/db/app_database.dart';
 import 'package:wealth_wave/contract/goal_importance.dart';
 import 'package:wealth_wave/domain/models/investment.dart';
 import 'package:wealth_wave/domain/models/irr_calculator.dart';
+import 'package:wealth_wave/utils/utils.dart';
 
 class Goal {
   final int id;
@@ -44,7 +45,7 @@ class Goal {
                 .then((investmentDO) =>
                     Investment.from(investmentDO: investmentDO))
                 .then((investment) =>
-                    MapEntry(investment, goalInvestment.split)))))
+                    MapEntry(investment, goalInvestment.splitPercentage)))))
         .then((entries) => Map.fromEntries(entries));
   }
 
@@ -57,8 +58,10 @@ class Goal {
                 .then((investmentDO) =>
                     Investment.from(investmentDO: investmentDO))
                 .then((investment) => investment.getTotalInvestedAmount())
-                .then((amount) => amount * goalInvestment.split))))
-        .then((amounts) => amounts.isNotEmpty ? amounts.reduce((value, element) => value + element): 0);
+                .then((amount) => amount * goalInvestment.splitPercentage))))
+        .then((amounts) => amounts.isNotEmpty
+            ? amounts.reduce((value, element) => value + element)
+            : 0);
   }
 
   Future<double> getMaturityAmount() {
@@ -79,14 +82,18 @@ class Goal {
                     Investment.from(investmentDO: investmentDO))
                 .then((investment) => investment.getValueOn(
                     date: maturityDate, considerFuturePayments: true))
-                .then((amount) => amount * goalInvestment.split))))
-        .then((amounts) => amounts.isNotEmpty ? amounts.reduce((value, element) => value + element): 0);
+                .then((amount) => calculatePercentageOfValue(
+                    value: amount,
+                    percentage: goalInvestment.splitPercentage)))))
+        .then((amounts) => amounts.isNotEmpty
+            ? amounts.reduce((value, element) => value + element)
+            : 0);
   }
 
   Future<void> tagInvestment(
       {required final int investmentId, required final double split}) async {
     return _goalInvestmentApi
-        .create(goalId: id, investmentId: investmentId, split: split)
+        .create(goalId: id, investmentId: investmentId, splitPercentage: split)
         .then((goalInvestmentDO) => {});
   }
 
@@ -95,7 +102,11 @@ class Goal {
       required final int investmentId,
       required final double split}) async {
     return _goalInvestmentApi
-        .update(id: id, goalId: id, investmentId: investmentId, split: split)
+        .update(
+            id: id,
+            goalId: id,
+            investmentId: investmentId,
+            splitPercentage: split)
         .then((goalInvestmentDO) => {});
   }
 

lib/domain/models/investment.dart

@@ -117,7 +117,7 @@ class Investment {
             (goalInvestment) => _goalApi
                 .getBy(id: goalInvestment.goalId)
                 .then((goalDO) => Goal.from(goalDO: goalDO))
-                .then((goal) => MapEntry(goal, goalInvestment.split)))))
+                .then((goal) => MapEntry(goal, goalInvestment.splitPercentage)))))
         .then((entries) => Map.fromEntries(entries));
   }
 
@@ -211,7 +211,7 @@ class Investment {
   Future<void> tagGoal(
       {required final int goalId, required final double split}) async {
     return _goalInvestmentApi
-        .create(goalId: goalId, investmentId: id, split: split)
+        .create(goalId: goalId, investmentId: id, splitPercentage: split)
         .then((goalInvestmentDO) => {});
   }
 
@@ -220,7 +220,7 @@ class Investment {
       required final int goalId,
       required final double split}) async {
     return _goalInvestmentApi
-        .update(id: id, goalId: goalId, investmentId: id, split: split)
+        .update(id: id, goalId: goalId, investmentId: id, splitPercentage: split)
         .then((goalInvestmentDO) => {});
   }
 

lib/utils/utils.dart

@@ -0,0 +1,4 @@
+double calculatePercentageOfValue(
+    {required final double value, required final double percentage}) {
+  return value * percentage / 100;
+}