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

Fixed: Show only active memberships in testers block
continuous-integration/drone/push Build is passing Details

This commit is contained in:
philipp lang 2023-04-29 21:20:04 +02:00
parent d7305c1a2e
commit 45968d7349
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Member/Membership.php
View File

@ -100,6 +100,6 @@ class Membership extends Model
*/
public function scopeTrying(Builder $query): Builder
{
return $query->whereHas('activity', fn ($builder) => $builder->where('is_try', true));
return $query->active()->whereHas('activity', fn ($builder) => $builder->where('is_try', true));
}
}

4
tests/Feature/Membership/TestersBlockTest.php
View File

@ -20,6 +20,10 @@ class TestersBlockTest extends TestCase
->defaults()
->has(Membership::factory()->in('Schnuppermitgliedschaft', 7, 'Wölfling', 8)->state(['created_at' => now()->subMonths(10)]))
->create(['firstname' => 'Max', 'lastname' => 'Muster']);
$inactiveMember = Member::factory()
->defaults()
->has(Membership::factory()->ended()->in('Schnuppermitgliedschaft', 7, 'Wölfling', 8)->state(['created_at' => now()->subMonths(10)]))
->create(['firstname' => 'Max', 'lastname' => 'Muster']);
$data = app(TestersBlock::class)->render()['data'];