wip

improve import / export flow and clean up relationships

app/Http/Controllers/HoldingController.php

@@ -2,7 +2,6 @@
 
 namespace App\Http\Controllers;
 
-use App\Models\Holding;
 use App\Models\Portfolio;
 use Illuminate\Http\Request;
 
@@ -15,14 +14,12 @@ class HoldingController extends Controller
     public function show(Request $request, Portfolio $portfolio, String $symbol)
     {
 
+        $holding = $portfolio->holdings()
+                        ->with(['market_data'])
+                        ->symbol($symbol)
+                        ->portfolio($portfolio->id)
+                        ->first();
 
-        $holding = Holding::query()
-                            ->portfolio($portfolio->id)
-                            ->symbol($symbol)
-                            ->first();
-
-        $market_data = $holding->market_data;
-
-        return view('holding.show', compact(['portfolio', 'holding', 'market_data']));
+        return view('holding.show', compact(['portfolio', 'holding']));
     }
 }

app/Http/Controllers/PortfolioController.php

@@ -22,16 +22,17 @@ class PortfolioController extends Controller
      */
     public function show(Portfolio $portfolio)
     {
+        $portfolio->load(['transactions', 'holdings']);
+        
         // get portfolio metrics
         $metrics = cache()->tags(['metrics', 'portfolio', auth()->user()->id, $portfolio->id])->remember(
             'portfolio-metrics-' . $portfolio->id, 
             60, 
             function () use ($portfolio) {
-                return
-                 Holding::query()
-                    ->portfolio($portfolio->id)
-                    ->getPortfolioMetrics()
-                    ->first();
+                return Holding::query()
+                        ->portfolio($portfolio->id)
+                        ->getPortfolioMetrics()
+                        ->first();
             }
         );