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

Fix: Scope should have its own where clause

This commit is contained in:
Philipp Lang 2023-06-29 12:58:05 +02:00
parent e37219b1ca
commit 9b2364bc34
3 changed files with 73 additions and 27 deletions

54
app/Member/FilterScope.php
View File

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

3
phpunit.xml
View File

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

43
tests/EndToEnd/MemberIndexTest.php Normal file
View File

@ -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'));
}
}