iger
/
engelsystem
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix random shifts test

This commit is contained in:
Igor Scheller 2024-02-04 00:12:18 +01:00 committed by xuwhite
parent ff1edaad10
commit b10264d6ef
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Controllers/ShiftsController.php
View File

@ -50,8 +50,9 @@ class ShiftsController extends BaseController
->collect() ->collect()
// Prefer soon starting shifts // Prefer soon starting shifts
->groupBy('start') ->groupBy('start')
// Get first starting shifts
->first() ->first()
// Select one at random // Select one of them at random
->random(); ->random();
return $this->redirect->to($this->url->to('/shifts', ['action' => 'view', 'shift_id' => $randomShift->id])); return $this->redirect->to($this->url->to('/shifts', ['action' => 'view', 'shift_id' => $randomShift->id]));

2
tests/Unit/Controllers/ShiftsControllerTest.php
View File

@ -57,7 +57,7 @@ class ShiftsControllerTest extends ControllerTest
$otherUser = User::factory()->create(); $otherUser = User::factory()->create();
[$userAngelType, $otherAngelType] = AngelType::factory(2)->create(); [$userAngelType, $otherAngelType] = AngelType::factory(2)->create();
[$possibleShift1, $possibleShift2, $otherAngelTypeShift, $alreadySubscribedShift] = Shift::factory(4) [$possibleShift1, $possibleShift2, $otherAngelTypeShift, $alreadySubscribedShift] = Shift::factory(4)
->create(['start' => $start]); ->create(['start' => $start, 'end' => $start->addHours(2)]);
$this->user->userAngelTypes()->attach($userAngelType, ['confirm_user_id' => $this->user->id]); $this->user->userAngelTypes()->attach($userAngelType, ['confirm_user_id' => $this->user->id]);
NeededAngelType::factory()->create([ NeededAngelType::factory()->create([
'shift_id' => $possibleShift1->id, 'shift_id' => $possibleShift1->id,