Merge pull request rrze-mmz#163 from rrze-mmz/147-filter-series-based…

…-on-semester-shows-a-livewire-error Bugfix semester filter in series data table
stefanosgeo · Oct 17, 2024 · ed17ef3 · ed17ef3
2 parents b44d4e5 + 8e245d2
commit ed17ef3
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 3 deletions.
diff --git a/app/Http/Middleware/RememberPreviousUrlMiddleware.php b/app/Http/Middleware/RememberPreviousUrlMiddleware.php
@@ -17,7 +17,7 @@ public function handle(Request $request, Closure $next): Response
     {
         if (! $request->is(
             'login', 'logout', 'register', 'password/*', 'verify-email/*', 'verified/*', 'saml2Login', 'api/*',
-            'livewire'
+            'livewire/*'
         )) {
             session(['url.intended' => url()->current()]);
         }

diff --git a/app/Livewire/SeriesDataTable.php b/app/Livewire/SeriesDataTable.php
@@ -54,7 +54,10 @@ protected function determineClipQuery($search)
 
         // Apply semester filter if a semester is selected
         if ($this->selectedSemesterID) {
-            $query->where('semester_id', $this->selectedSemesterID);
+            // Filter series where at least one clip has the selected semester_id
+            $query->whereHas('clips', function ($q) {
+                $q->where('semester_id', $this->selectedSemesterID);
+            });
         }
 
         return $query;

diff --git a/app/Models/Series.php b/app/Models/Series.php
@@ -266,7 +266,7 @@ public function scopeWithLastPublicClip($query)
             ->public()
             ->withVideoAssets()
             ->whereColumn('series_id', 'series.id')
-            ->orderByDesc('episode')
+            ->orderByDesc('recording_date')
             ->take(1),
         ]);
     }

diff --git a/tests/Feature/Livewire/SeriesDataTableTest.php b/tests/Feature/Livewire/SeriesDataTableTest.php
@@ -2,6 +2,8 @@
 
 use App\Enums\Role;
 use App\Livewire\SeriesDataTable;
+use App\Models\Clip;
+use App\Models\Semester;
 use Facades\Tests\Setup\SeriesFactory;
 
 use function Pest\Laravel\get;
@@ -44,3 +46,24 @@
     Livewire::test(SeriesDataTable::class)
         ->assertSee($series->title);
 });
+
+it('filters series based on semester', function () {
+    $seriesA = SeriesFactory::withClips(3)->withAssets(1)->create();
+    $seriesA->clips->each(function (Clip $clip) {
+        $clip->semester_id = Semester::find(1)->id;
+        $clip->save();
+    });
+    $seriesB = SeriesFactory::withClips(3)->withAssets(1)->create();
+    $seriesB->clips->each(function (Clip $clip) {
+        $clip->semester_id = Semester::find(2)->id;
+        $clip->save();
+    });
+
+    Livewire::test(SeriesDataTable::class)
+        ->assertSee($seriesA->title)
+        ->assertSee($seriesB->title)
+        ->set('selectedSemesterID', Semester::find(1)->id)
+        ->assertSee($seriesA->title)
+        ->set('selectedSemesterID', Semester::find(2)->id)
+        ->assertSee($seriesB->title);
+});