wip

app/Http/Controllers/PortfolioController.php

@@ -2,7 +2,9 @@
 
 namespace App\Http\Controllers;
 
+use App\Models\Holding;
 use App\Models\Portfolio;
+use App\Models\DailyChange;
 
 class PortfolioController extends Controller
 {
@@ -21,12 +23,19 @@ class PortfolioController extends Controller
     public function show(Portfolio $portfolio)
     {
 
-        $portfolio->marketGainLoss = rand(-200, 3999);
-        $portfolio->totalCostBasis = rand(-200, 3999);
-        $portfolio->totalMarketValue = rand(-200, 3999);
-        $portfolio->realizedGainLoss = rand(-200, 3999);
-        $portfolio->dividendsEarned = rand(-200, 3999);
-
-        return view('portfolio.show', compact(['portfolio']));
+        // get portfolio metrics
+        $metrics = cache()->remember(
+            'portfolio-metrics-' . $portfolio->id, 
+            60, 
+            function () use ($portfolio) {
+                return
+                 Holding::query()
+                    ->portfolio($portfolio->id)
+                    ->getPortfolioMetrics()
+                    ->first();
+            }
+        );
+        
+        return view('portfolio.show', compact(['portfolio', 'metrics']));
     }
 }

app/Imports/Sheets/DailyChangesSheet.php

@@ -28,8 +28,8 @@ class DailyChangesSheet implements ToCollection, WithHeadingRow, SkipsEmptyRows
                 'date' => $row['date'],
                 'total_market_value' => $row['total_market_value'],
                 'total_cost_basis' => $row['total_cost_basis'],
-                'total_gain_loss' => $row['total_gain_loss'],
-                'total_dividends' => $row['total_dividends'],
+                'total_gain' => $row['total_gain'],
+                'total_dividends_earned' => $row['total_dividends_earned'],
                 'realized_gains' => $row['realized_gains'],
                 'notes' => $row['notes'],
             ]);

app/Models/DailyChange.php

@@ -36,8 +36,8 @@ class DailyChange extends Model
         'date',
         'total_market_value',
         'total_cost_basis',
-        'total_gain_loss',
-        'total_dividends',
+        'total_gain',
+        'total_dividends_earned',
         'realized_gains',
         'notes',
     ];
@@ -62,7 +62,11 @@ class DailyChange extends Model
     {
         return $query->where('user_id', auth()->user()->id);
     }
-
+    
+    public function scopePortfolio($query, $portfolio)
+    {
+        return $query->where('portfolio_id', $portfolio);
+    }
     public function portfolio()
     {
         return $this->belongsTo(Portfolio::class);

app/Models/Holding.php

@@ -25,7 +25,7 @@ class Holding extends Model
         'quantity',
         'average_cost_basis',
         'total_cost_basis',
-        'realized_gain_loss_dollars',
+        'realized_gain_dollars',
         'dividends_earned',
         'splits_synced_at',
         'dividends_synced_at'
@@ -110,14 +110,14 @@ class Holding extends Model
 
     public function scopeGetPortfolioMetrics($query) 
     {
-        $query->selectRaw('SUM(holdings.dividends_earned) AS total_dividends_earned')
-            ->selectRaw('SUM(holdings.realized_gain_loss_dollars) AS realized_gain_loss_dollars')
-            ->selectRaw('@total_market_value:=SUM(holdings.quantity * market_data.market_value) AS total_market_value')
-            ->selectRaw('@sum_total_cost_basis:=SUM(holdings.total_cost_basis) AS total_cost_basis')
-            ->selectRaw('@total_gain_loss_dollars:=(@total_market_value - @sum_total_cost_basis) AS total_gain_loss_dollars')
-            ->selectRaw('(@total_gain_loss_dollars / @sum_total_cost_basis) * 100 AS total_gain_loss_percent')
+
+        $query->selectRaw('COALESCE(SUM(holdings.dividends_earned),0) AS total_dividends_earned')
+            ->selectRaw('COALESCE(SUM(holdings.realized_gain_dollars),0) AS realized_gain_dollars')
+            ->selectRaw('@total_market_value:=COALESCE(SUM(holdings.quantity * market_data.market_value),0) AS total_market_value')
+            ->selectRaw('@sum_total_cost_basis:=COALESCE(SUM(holdings.total_cost_basis),0) AS total_cost_basis')
+            ->selectRaw('@total_gain_dollars:=COALESCE((@total_market_value - @sum_total_cost_basis),0) AS total_gain_dollars')
+            ->selectRaw('COALESCE((@total_gain_dollars / @sum_total_cost_basis) * 100,0) AS total_gain_percent')
             ->join('market_data', 'market_data.symbol', 'holdings.symbol');
-            // =(VLOOKUP(if(today or end of year),'Daily Change'!$A:$B,2,false) - VLOOKUP(first of year),'Daily Change'!$A:$C,3,false)) / (SUMIFS(transactions.cost_basis_lot,transactions.date,"<"&date(left(D19,4)+1,1,1),transactions.type,"Buy")-SUMIFS(transactions.cost_basis_lot,transactions.date,"<"&date(left(D19,4)+1,1,1),transactions.type,"Sell"))-1
     }
 
     public function scopeSymbol($query, $symbol)

app/Models/Transaction.php

@@ -44,11 +44,15 @@ class Transaction extends Model
         static::saved(function ($transaction) {
 
             $transaction->syncHolding();
+
+            cache()->forget('portfolio-metrics-' . $transaction->portfolio_id);
         });
 
         static::deleted(function ($transaction) {
 
             $transaction->syncHolding();
+
+            cache()->forget('portfolio-metrics-' . $transaction->portfolio_id);
         });
     }
 
@@ -171,7 +175,7 @@ class Transaction extends Model
             'quantity' => $total_quantity,
             'average_cost_basis' => $average_cost_basis,
             'total_cost_basis' => $total_quantity * $average_cost_basis,
-            'realized_gain_loss_dollars' => $query->realized_gains,
+            'realized_gain_dollars' => $query->realized_gains,
         ]);
 
         $holding->save();