From cd47abddc6a90037d21554b47f50be00fd4541e7 Mon Sep 17 00:00:00 2001
From: hackerESQ <corey@coreyvarma.com>
Date: Thu, 24 Oct 2024 20:14:14 -0500
Subject: [PATCH] fix:exclude wishlists from performance chart

---
 app/Http/Controllers/DashboardController.php                | 1 +
 app/Models/DailyChange.php                                  | 6 ++++++
 app/Models/Holding.php                                      | 5 +++--
 .../views/livewire/portfolio-performance-chart.blade.php    | 3 ++-
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/app/Http/Controllers/DashboardController.php b/app/Http/Controllers/DashboardController.php
index f6d2709..439d911 100644
--- a/app/Http/Controllers/DashboardController.php
+++ b/app/Http/Controllers/DashboardController.php
@@ -22,6 +22,7 @@ class DashboardController extends Controller
                 return
                  Holding::query()
                     ->myHoldings()
+                    ->withoutWishlists()
                     ->withPortfolioMetrics()
                     ->first();
             }
diff --git a/app/Models/DailyChange.php b/app/Models/DailyChange.php
index b0065ae..59df828 100644
--- a/app/Models/DailyChange.php
+++ b/app/Models/DailyChange.php
@@ -46,6 +46,12 @@ class DailyChange extends Model
             });
         });
     }
+
+    public function scopeWithoutWishlists($query) {
+        return $query->whereHas('portfolio', function ($query) {
+            $query->where('portfolios.wishlist', 0);
+        });
+    }
     
     public function portfolio()
     {
diff --git a/app/Models/Holding.php b/app/Models/Holding.php
index b2dc3ef..439c14a 100644
--- a/app/Models/Holding.php
+++ b/app/Models/Holding.php
@@ -155,8 +155,9 @@ class Holding extends Model
     }
 
     public function scopeWithoutWishlists($query) {
-        return $query->join('portfolios', 'portfolios.id', 'holdings.portfolio_id')
-            ->where('portfolios.wishlist', 0);
+        return $query->whereHas('portfolio', function ($query) {
+                $query->where('portfolios.wishlist', 0);
+            });
     }
 
     public function scopeMyHoldings($query, $userId = null)
diff --git a/resources/views/livewire/portfolio-performance-chart.blade.php b/resources/views/livewire/portfolio-performance-chart.blade.php
index b688189..60d7cb8 100644
--- a/resources/views/livewire/portfolio-performance-chart.blade.php
+++ b/resources/views/livewire/portfolio-performance-chart.blade.php
@@ -51,6 +51,7 @@ new class extends Component {
                     SUM(total_dividends_earned) as total_dividends_earned 
                 */
             ')
+            ->withoutWishlists()
             ->groupBy('date')
             ->orderBy('date');
 
@@ -60,7 +61,7 @@ new class extends Component {
             
             $dailyChangeQuery->whereDate('date', '>=', now()->{$filterMethod['method']}(...$filterMethod['args']));
         }
-        
+        // dd($dailyChangeQuery->toSql());
         $dailyChange = $dailyChangeQuery->get();
 
         return [