silva
/
adrema
2
1
Fork 0
Code Issues 23 Pull Requests 1 Projects 1 Releases 104 Wiki Activity

Fix member search for membership when one param is empty

This commit is contained in:
philipp lang 2024-03-08 22:26:16 +01:00
parent a25d983de0
commit d29f7b6e8a
2 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Member/FilterScope.php
View File

@ -2,8 +2,11 @@
namespace App\Member; namespace App\Member;
use App\Activity;
use App\Group;
use App\Invoice\BillKind; use App\Invoice\BillKind;
use App\Lib\Filter; use App\Lib\Filter;
use App\Subactivity;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
use Laravel\Scout\Builder; use Laravel\Scout\Builder;
use Spatie\LaravelData\Attributes\MapInputName; use Spatie\LaravelData\Attributes\MapInputName;
@ -139,6 +142,9 @@ class FilterScope extends Filter
*/ */
protected function possibleValuesForMembership(array $membership): Collection protected function possibleValuesForMembership(array $membership): Collection
{ {
$membership['group_ids'] = count($membership['group_ids']) === 0 ? Group::pluck('id')->toArray() : $membership['group_ids'];
$membership['activity_ids'] = count($membership['activity_ids']) === 0 ? Activity::pluck('id')->toArray() : $membership['activity_ids'];
$membership['subactivity_ids'] = count($membership['subactivity_ids']) === 0 ? Subactivity::pluck('id')->toArray() : $membership['subactivity_ids'];
return $this->combinations($membership['group_ids'], $membership['activity_ids'], $membership['subactivity_ids']) return $this->combinations($membership['group_ids'], $membership['activity_ids'], $membership['subactivity_ids'])
->map(fn ($combination) => collect($combination)->implode('|')); ->map(fn ($combination) => collect($combination)->implode('|'));
} }

20
tests/EndToEnd/MemberIndexTest.php
View File

@ -199,6 +199,26 @@ class MemberIndexTest extends EndToEndTestCase
]])->assertInertiaCount('data.data', 1); ]])->assertInertiaCount('data.data', 1);
} }
public function testGroupOfMembershipsFilterCanBeEmpty(): void
{
$this->withoutExceptionHandling()->login()->loginNami();
$mitglied = Activity::factory()->create();
$woelfling = Subactivity::factory()->create();
$group = Group::factory()->create();
Member::factory()->defaults()->has(Membership::factory()->for($mitglied)->for($woelfling)->for($group))->create();
sleep(1);
$this->callFilter('member.index', ['memberships' => [
['group_ids' => [], 'activity_ids' => [$mitglied->id], 'subactivity_ids' => [$woelfling->id]],
]])->assertInertiaCount('data.data', 1);
$this->callFilter('member.index', ['memberships' => [
['group_ids' => [$group->id], 'activity_ids' => [], 'subactivity_ids' => [$woelfling->id]],
]])->assertInertiaCount('data.data', 1);
$this->callFilter('member.index', ['memberships' => [
['group_ids' => [$group->id], 'activity_ids' => [$mitglied->id], 'subactivity_ids' => []],
]])->assertInertiaCount('data.data', 1);
}
public function testItFiltersForSearchButNotForPayments(): void public function testItFiltersForSearchButNotForPayments(): void
{ {
$this->withoutExceptionHandling()->login()->loginNami(); $this->withoutExceptionHandling()->login()->loginNami();