fix: worng website selected

inikoo · Dec 11, 2024 · 10bf3f7 · 10bf3f7
1 parent f57ba12
commit 10bf3f7
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/app/Actions/Portfolio/Announcement/UI/GetActiveAnnouncement.php b/app/Actions/Portfolio/Announcement/UI/GetActiveAnnouncement.php
@@ -3,17 +3,22 @@
 namespace App\Actions\Portfolio\Announcement\UI;
 
 use App\Enums\Portfolio\Announcement\AnnouncementStatusEnum;
+use App\Models\Announcement;
 use App\Models\Portfolio\PortfolioWebsite;
 use Illuminate\Database\Eloquent\Collection;
 use Lorisleiva\Actions\Concerns\AsAction;
+use Spatie\QueryBuilder\QueryBuilder;
 
 class GetActiveAnnouncement
 {
     use AsAction;
 
     public function handle(PortfolioWebsite $portfolioWebsite): Collection
     {
-        return $portfolioWebsite->announcements()
+        $queryBuilder = QueryBuilder::for(Announcement::class);
+
+        return $queryBuilder
+            ->where('portfolio_website_id', $portfolioWebsite->id)
             ->where('status', AnnouncementStatusEnum::ACTIVE->value)
             ->get();
     }

diff --git a/app/Actions/Portfolio/Announcement/UI/ShowCompiledAnnouncement.php b/app/Actions/Portfolio/Announcement/UI/ShowCompiledAnnouncement.php
@@ -17,12 +17,13 @@ class ShowCompiledAnnouncement
 
     public function handle(PortfolioWebsite $portfolioWebsite, ?string $targetPage, string $targetUser): ?Announcement
     {
-        $announcements = GetActiveAnnouncement::run($portfolioWebsite);
+        $announcements = GetActiveAnnouncement::run();
 
         foreach ($announcements as $announcement) {
             $selectedAnnouncement = $announcement
-                ->where(function ($query) use ($targetPage) {
+                ->where(function ($query) use ($targetPage, $portfolioWebsite) {
                     $query->where('status', AnnouncementStatusEnum::ACTIVE->value)
+                    ->where('portfolio_website_id', $portfolioWebsite->id)
                     ->where(function ($subQuery) use ($targetPage) {
                         $subQuery->whereRaw("
                       EXISTS (