Fix: Scope should have its own where clause

app/Member/FilterScope.php

@@ -48,36 +48,36 @@ class FilterScope extends Filter
      */
     public function apply(Builder $query): Builder
     {
-        $query->orWhere(function ($query) {
-            if ($this->ausstand) {
-                $query->whereAusstand();
-            }
+        return $query->where(function ($query) {
+            $query->orWhere(function ($query) {
+                if ($this->ausstand) {
+                    $query->whereAusstand();
+                }
 
-            if ($this->billKind) {
-                $query->where('bill_kind', BillKind::fromValue($this->billKind));
-            }
+                if ($this->billKind) {
+                    $query->where('bill_kind', BillKind::fromValue($this->billKind));
+                }
 
-            if (count($this->groupIds)) {
-                $query->whereIn('group_id', $this->groupIds);
-            }
+                if (count($this->groupIds)) {
+                    $query->whereIn('group_id', $this->groupIds);
+                }
 
-            if (count($this->subactivityIds) + count($this->activityIds) > 0) {
-                $query->whereHas('memberships', function ($q) {
-                    $q->active();
-                    if (count($this->subactivityIds)) {
-                        $q->whereIn('subactivity_id', $this->subactivityIds);
-                    }
-                    if (count($this->activityIds)) {
-                        $q->whereIn('activity_id', $this->activityIds);
-                    }
-                });
-            }
-        })->orWhere(function ($query) {
-            if (count($this->additional)) {
-                $query->whereIn('id', $this->additional);
-            }
+                if (count($this->subactivityIds) + count($this->activityIds) > 0) {
+                    $query->whereHas('memberships', function ($q) {
+                        $q->active();
+                        if (count($this->subactivityIds)) {
+                            $q->whereIn('subactivity_id', $this->subactivityIds);
+                        }
+                        if (count($this->activityIds)) {
+                            $q->whereIn('activity_id', $this->activityIds);
+                        }
+                    });
+                }
+            })->orWhere(function ($query) {
+                if (count($this->additional)) {
+                    $query->whereIn('id', $this->additional);
+                }
+            });
         });
-
-        return $query;
     }
 }

database/migrations/2018_01_16_012910_create_activities_table.php

@@ -44,6 +44,8 @@ class CreateActivitiesTable extends Migration
      */
     public function down()
     {
+        Schema::dropIfExists('activity_subactivity');
+        Schema::dropIfExists('subactivities');
         Schema::dropIfExists('activities');
     }
 }

database/migrations/2021_07_04_101300_create_payments_table.php

@@ -44,5 +44,6 @@ class CreatePaymentsTable extends Migration
     public function down()
     {
         Schema::dropIfExists('payments');
+        Schema::dropIfExists('statuses');
     }
 }

database/migrations/2021_11_18_001427_create_courses_table.php

@@ -37,6 +37,7 @@ class CreateCoursesTable extends Migration
      */
     public function down()
     {
+        Schema::dropIfExists('course_members');
         Schema::dropIfExists('courses');
     }
 }

database/migrations/2021_11_18_215522_create_settings_table.php

@@ -22,4 +22,9 @@ class CreateSettingsTable extends Migration
             $table->timestamps();
         });
     }
+
+    public function down()
+    {
+        Schema::dropIfExists('settings');
+    }
 }

database/migrations/2022_02_17_011021_create_groups_parent_id_column.php

@@ -26,8 +26,8 @@ class CreateGroupsParentIdColumn extends Migration
     public function down()
     {
         Schema::table('groups', function (Blueprint $table) {
-            $table->dropForeign(['group_id']);
-            $table->dropColumn('group_id');
+            $table->dropForeign(['parent_id']);
+            $table->dropColumn('parent_id');
         });
     }
 }

database/migrations/2022_04_28_203444_create_members_prevention_column.php

@@ -32,6 +32,14 @@ return new class() extends Migration {
     public function down()
     {
         Schema::table('members', function (Blueprint $table) {
+            $table->dropColumn('ps_at');
+            $table->dropColumn('more_ps_at');
+            $table->dropColumn('without_education_at');
+            $table->dropColumn('without_efz_at');
+            $table->dropColumn('has_svk');
+            $table->dropColumn('has_vk');
+            $table->dropColumn('multiply_pv');
+            $table->dropColumn('multiply_more_pv');
         });
     }
 };

database/migrations/2022_08_30_132503_create_users_email_verified_add_column.php

@@ -27,6 +27,9 @@ return new class() extends Migration {
     public function down()
     {
         Schema::table('users', function (Blueprint $table) {
+            $table->dropUnique(['email']);
+            $table->dropColumn('email_verified_at');
+            $table->dropColumn('remember_token');
         });
     }
 };

database/migrations/2022_10_05_171451_create_members_slug_column.php

@@ -24,5 +24,8 @@ return new class() extends Migration {
      */
     public function down()
     {
+        Schema::table('members', function (Blueprint $table) {
+            $table->dropColumn('slug');
+        });
     }
 };

database/migrations/2022_12_11_192600_create_memberships_has_promise_column.php

@@ -24,5 +24,8 @@ return new class() extends Migration {
      */
     public function down()
     {
+        Schema::table('memberships', function (Blueprint $table) {
+            $table->dropColumn('promised_at');
+        });
     }
 };

database/migrations/2022_12_13_203644_create_subscription_children_table.php

@@ -1,6 +1,5 @@
 <?php
 
-use App\Payment\SubscriptionChild;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
@@ -13,8 +12,6 @@ return new class() extends Migration {
      */
     public function up()
     {
-        $subscriptions = DB::table('subscriptions')->get();
-
         Schema::table('subscriptions', function (Blueprint $table) {
             $table->dropColumn('amount');
             $table->boolean('split')->default(false);
@@ -27,14 +24,6 @@ return new class() extends Migration {
             $table->string('name');
             $table->unsignedInteger('amount');
         });
-
-        foreach ($subscriptions as $subscription) {
-            SubscriptionChild::create([
-                'parent_id' => $subscription->id,
-                'name' => 'name',
-                'amount' => $subscription->amount,
-            ]);
-        }
     }
 
     /**
@@ -44,5 +33,11 @@ return new class() extends Migration {
      */
     public function down()
     {
+        Schema::dropIfExists('subscription_children');
+        Schema::table('subscriptions', function (Blueprint $table) {
+            $table->unsignedInteger('amount');
+            $table->dropColumn('split');
+            $table->dropColumn('for_promise');
+        });
     }
 };

phpunit.xml

@@ -13,6 +13,9 @@
         <testsuite name="NamiUnit">
             <directory suffix="Test.php">./packages/laravel-nami/tests/Unit</directory>
         </testsuite>
+        <testsuite name="EndToEnd">
+            <directory suffix="Test.php">./tests/EndToEnd</directory>
+        </testsuite>
     </testsuites>
     <filter>
         <whitelist processUncoveredFilesFromWhitelist="true">

tests/EndToEnd/MemberIndexTest.php

@@ -0,0 +1,43 @@
+<?php
+
+namespace Tests\EndToEnd;
+
+use App\Group;
+use App\Member\Member;
+use App\Payment\Payment;
+use Illuminate\Foundation\Testing\DatabaseMigrations;
+use Tests\RequestFactories\Child;
+use Tests\TestCase;
+
+class MemberIndexTest extends TestCase
+{
+    use DatabaseMigrations;
+
+    public function testItHandlesFullTextSearch(): void
+    {
+        $this->withoutExceptionHandling()->login()->loginNami();
+        $group = Group::factory()->create();
+        Member::factory()->defaults()->for($group)->create(['firstname' => '::firstname::']);
+        Member::factory()->defaults()->for($group)->create(['firstname' => '::gggname::']);
+
+        $response = $this->callFilter('member.index', ['search' => '::firstname::']);
+
+        $this->assertCount(1, $this->inertia($response, 'data.data'));
+    }
+
+    public function testItFiltersForSearchButNotForPayments(): void
+    {
+        $this->withoutExceptionHandling()->login()->loginNami();
+        $group = Group::factory()->create();
+        Member::factory()->defaults()->for($group)
+            ->has(Payment::factory()->notPaid()->subscription('tollerbeitrag', [
+                new Child('a', 5400),
+            ]))
+            ->create(['firstname' => '::firstname::']);
+        Member::factory()->defaults()->for($group)->create(['firstname' => '::firstname::']);
+
+        $response = $this->callFilter('member.index', ['search' => '::firstname::', 'ausstand' => true]);
+
+        $this->assertCount(1, $this->inertia($response, 'data.data'));
+    }
+}