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

Fixed: Dont display efz and ps for inactive memberships
continuous-integration/drone/push Build is failing Details

This commit is contained in:
philipp lang 2024-08-30 19:04:18 +02:00
parent 565b1ffbce
commit 21def11ae9
4 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Efz/EfzPendingBlock.php
View File

@ -19,7 +19,7 @@ class EfzPendingBlock extends Block
})
->whereCurrentGroup()
->orderByRaw('lastname, firstname')
->whereHas('memberships', fn ($builder) => $builder->isLeader());
->whereHas('memberships', fn ($builder) => $builder->isLeader()->active());
}
/**

2
app/Member/PsPendingBlock.php
View File

@ -23,7 +23,7 @@ class PsPendingBlock extends Block
})
->whereCurrentGroup()
->orderByRaw('lastname, firstname')
->whereHas('memberships', fn ($builder) => $builder->isLeader());
->whereHas('memberships', fn ($builder) => $builder->isLeader()->active());
}
/**

10
tests/Feature/Member/PsPendingBlockTest.php
View File

@ -27,31 +27,31 @@ class PsPendingBlockTest extends TestCase
->defaults()
->for($group)
->has(Membership::factory()->in('€ LeiterIn', 5, 'Wölfling', 8))
->has(Membership::factory()->in('€ LeiterIn', 5, 'Wölfling', 8))
->create(['firstname' => 'Max', 'lastname' => 'Doe', 'ps_at' => now()->subYears(4)]);
$validMorePs = Member::factory()
->defaults()
->for($group)
->has(Membership::factory()->in('€ LeiterIn', 5, 'Wölfling', 8))
->has(Membership::factory()->in('€ LeiterIn', 5, 'Wölfling', 8))
->create(['firstname' => 'Joe', 'lastname' => 'Doe', 'more_ps_at' => now()->subYears(4)]);
$invalidPs = Member::factory()
->defaults()
->for($group)
->has(Membership::factory()->in('€ LeiterIn', 5, 'Wölfling', 8))
->has(Membership::factory()->in('€ LeiterIn', 5, 'Wölfling', 8))
->create(['firstname' => 'Mike', 'lastname' => 'Doe', 'ps_at' => now()->subYears(5)]);
$invalidMorePs = Member::factory()
->defaults()
->for($group)
->has(Membership::factory()->in('€ LeiterIn', 5, 'Wölfling', 8))
->has(Membership::factory()->in('€ LeiterIn', 5, 'Wölfling', 8))
->create(['firstname' => 'Nora', 'lastname' => 'Doe', 'more_ps_at' => now()->subYears(5)]);
$inactiveMembership = Member::factory()
->defaults()
->for($group)
->has(Membership::factory()->in('€ LeiterIn', 5, 'Wölfling', 8)->ended())
->create(['firstname' => 'Nora', 'lastname' => 'Doe', 'more_ps_at' => now()->subYears(5)]);
$invalidPsButValidMorePs = Member::factory()
->defaults()
->for($group)
->has(Membership::factory()->in('€ LeiterIn', 5, 'Wölfling', 8))
->has(Membership::factory()->in('€ LeiterIn', 5, 'Wölfling', 8))
->create(['firstname' => 'Hey', 'lastname' => 'Doe', 'ps_at' => now()->subYears(10), 'more_ps_at' => now()->subYears(3)]);
$notALeader = Member::factory()
->defaults()

5
tests/Feature/Membership/EfzPendingBlockTest.php
View File

@ -38,6 +38,11 @@ class EfzPendingBlockTest extends TestCase
->defaults()
->for($group)
->create(['firstname' => 'Joe', 'lastname' => 'Muster', 'efz' => now()->subYears(5)->endOfYear()]);
Member::factory()
->has(Membership::factory()->in('€ LeiterIn', 1, 'Biber', 2)->ended())
->defaults()
->for($group)
->create(['firstname' => 'Joe', 'lastname' => 'Muster', 'efz' => now()->subYears(5)->endOfYear()]);
Member::factory()
->has(Membership::factory()->in('€ LeiterIn', 1, 'Biber', 2))
->defaults()