changes to add transaction support in models

multifol-io · Jan 5, 2024 · 2fe1490 · 2fe1490
1 parent 8301f30
commit 2fe1490
Show file tree

Hide file tree

Showing 4 changed files with 128 additions and 15 deletions.
diff --git a/Shared/Models/FamilyData/Account.cs b/Shared/Models/FamilyData/Account.cs
@@ -37,6 +37,23 @@ public string Title {
     public int Owner { get; set; }
     public string? Identifier { get; set; }
     private string? _AccountType;
+
+    public Investment? SettlementInvestment {
+        get {
+            foreach (var investment in this.Investments)
+            {
+                if (investment.AssetType == AssetType.Cash_MoneyMarket 
+                    || investment.AssetType == AssetType.Cash_BankAccount 
+                    || investment.AssetType == AssetType.Cash)
+                {
+                    return investment;
+                }
+            }
+
+            return null;
+        }
+    }
+
     public string? AccountType {
         get { return _AccountType; }
         set {
@@ -63,6 +80,10 @@ public double Value {
             foreach (var investment in Investments) 
             {
                 newValue += investment.ValuePIN ?? 0;
+                foreach (var transaction in investment.Transactions)
+                {
+                    newValue += transaction.CustomValue(investment) ?? 0;
+                }
             }
 
             return newValue;
@@ -83,6 +104,19 @@ public string FullName
         }
     }
 
+    public Investment? FindInvestment(string ticker)
+    {
+        foreach (var investment in Investments)
+        {
+            if (investment.Ticker == ticker)
+            {
+                return investment;
+            }
+        }
+
+        return null;
+    }
+
     public List<Investment> Investments { get; set; }
 
     public List<Investment> AvailableFunds { get; set; }
@@ -137,8 +171,7 @@ public void UpdatePercentages(double totalValue, FamilyData familyData)
             UpdateInvestmentCategoryTotals(investment, familyData);
             foreach (var transaction in investment.Transactions)
             {
-                var fromInvestment = (transaction.FromInvestment == investment);
-                UpdateInvestmentCategoryTotals(investment, familyData, overrideValue:transaction.Value, useNegative:fromInvestment);
+                UpdateInvestmentCategoryTotals(investment, familyData, overrideValue:transaction.CustomValue(this.FindInvestment(transaction.HostTicker)));
             }
 
             if (investment.ExpenseRatio.HasValue && investment.Value.HasValue) {
@@ -147,7 +180,6 @@ public void UpdatePercentages(double totalValue, FamilyData familyData)
             } else {
                 familyData.InvestmentsMissingER++;
             }
-
         }
     }
 

diff --git a/Shared/Models/FamilyData/Investment.cs b/Shared/Models/FamilyData/Investment.cs
@@ -4,6 +4,7 @@
 public class Investment 
 {
     public Investment() {
+        Transactions = new();
     }
 
     public Investment(int? pin) : this()
@@ -12,7 +13,8 @@ public Investment(int? pin) : this()
     }
 
     [JsonIgnore]
-    public string Transaction { get; set; }
+    public Transaction SelectedTransaction { get; set; }
+
     [JsonIgnore]
     public bool Selected { get; set; }
 
@@ -29,13 +31,7 @@ public string? Name {
         }
     }
 
-    private List<Transaction> _Transactions = new();
-    public List<Transaction> Transactions
-    {
-        get {
-            return _Transactions;
-        }
-    }
+    public List<Transaction> Transactions { get; set; }
 
     public bool AutoCompleted { get; set; }
     private string? _Ticker;

diff --git a/Shared/Models/FamilyData/Transaction.cs b/Shared/Models/FamilyData/Transaction.cs
@@ -2,9 +2,94 @@
 
 public class Transaction
 {
+    public string? HostTicker { get; set; }
+    public string? OtherTicker { get; set; }
+
     [JsonIgnore]
-    public Investment FromInvestment { get; set; }
+    public bool Selected { get; set; }
+
     [JsonIgnore]
-    public Investment ToInvestment { get; set; }
-    public double? Value { get; set; }
+    public bool IsDraft { get; set; }
+
+    private double? _Value;
+    private double? _Shares;
+    private double? _Price;
+
+    public double? CustomValue(Investment investment) 
+    {
+        var ticker = investment.Ticker;
+        switch (Type) 
+        {
+            case "Dividend":
+                if (investment.AssetType == AssetType.Bond || investment.AssetType == AssetType.Bond_ETF || investment.AssetType == AssetType.Bond_Fund)
+                {
+                    return HostTicker == ticker ? 0 : -Value;
+                }
+                else
+                {
+                    return HostTicker == ticker ? -Value : Value;
+                }
+            case "Buy":
+                return HostTicker == ticker ? Value : -Value;
+            case "Sale":
+                return HostTicker == ticker ? -Value : Value;
+
+        }
+
+        return null;
+    }
+
+    public string? Type { get; set; }
+
+    public double? Value {
+        set {
+            _Value = value;
+            if (_Value != null && _Shares != null && _Price == null)
+            {
+                _Price = _Value / _Shares;
+            }
+
+            if (_Value != null && _Shares == null && _Price != null)
+            {
+                _Shares = _Value / _Price;
+            }
+        }
+        get { 
+            return _Value;
+        }
+    }
+    public double? Shares {
+        set {
+            _Shares = value;
+            if (_Shares != null && _Value != null && _Price == null)
+            {
+                _Price = _Value / _Shares;
+            }
+
+            if (_Shares != null && _Value == null && _Price != null)
+            {
+                _Value = _Price * _Shares;
+            }
+        }
+        get { 
+            return _Shares;
+        }
+    }
+    public double? Price {
+        set {
+            _Price = value;
+            if (_Price != null &&_Shares != null && _Value == null)
+            {
+                _Value = _Price * _Shares;
+            }
+
+            if (_Price != null && _Shares == null && _Value != null)
+            {
+                _Shares = _Value / _Price;
+            }
+        }
+        get { 
+            return _Price;
+        }
+    }
 }
diff --git a/wwwroot/cache.manifest b/wwwroot/cache.manifest
@@ -1,6 +1,6 @@
 CACHE MANIFEST
 
-# Version 1.0101
+# Version 1.0102
 
 NETWORK:
 *