Fixed: Dont display efz and ps for inactive memberships
continuous-integration/drone/push Build is failing
Details
continuous-integration/drone/push Build is failing
Details
This commit is contained in:
parent
565b1ffbce
commit
21def11ae9
|
@ -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());
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -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());
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -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()
|
||||
|
|
|
@ -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()
|
||||
|
|
Loading…
Reference in New Issue