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

Random shit: Fix selection to exclude parallel shifts

This commit is contained in:
Igor Scheller 2023-12-26 12:54:21 +01:00
parent a3a36de985
commit 2baa101a8f
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Controllers/ShiftsController.php
View File

@ -10,7 +10,9 @@ use Engelsystem\Http\Response;
use Engelsystem\Helpers\Authenticator; use Engelsystem\Helpers\Authenticator;
use Engelsystem\Http\UrlGeneratorInterface; use Engelsystem\Http\UrlGeneratorInterface;
use Engelsystem\Models\Shifts\Shift; use Engelsystem\Models\Shifts\Shift;
use Engelsystem\Models\Shifts\ShiftEntry;
use Engelsystem\Models\User\User; use Engelsystem\Models\User\User;
use Illuminate\Contracts\Database\Query\Builder as QueryBuilder;
use Illuminate\Database\Eloquent\Builder as EloquentBuilder; use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
use Illuminate\Database\Eloquent\Collection as DbCollection; use Illuminate\Database\Eloquent\Collection as DbCollection;
use Illuminate\Database\Query\JoinClause; use Illuminate\Database\Query\JoinClause;
@ -65,7 +67,8 @@ class ShiftsController extends BaseController
->where('angel_types.restricted', false) ->where('angel_types.restricted', false)
->orWhereNot('confirm_user_id', false); ->orWhereNot('confirm_user_id', false);
}); });
$shifts = $user->shiftEntries()->select('shift_id'); /** @var ShiftEntry[]|DbCollection $shiftEntries */
$shiftEntries = $user->shiftEntries()->with('shift')->get();
$freeShifts = Shift::query() $freeShifts = Shift::query()
->select('shifts.*') ->select('shifts.*')
@ -80,7 +83,7 @@ class ShiftsController extends BaseController
->whereNotNull('schedule_shift.shift_id'); ->whereNotNull('schedule_shift.shift_id');
}) })
// Not already signed in // Not already signed in
->whereNotIn('shifts.id', $shifts) ->whereNotIn('shifts.id', $shiftEntries->pluck('shift_id'))
// Same angel types // Same angel types
->where(function (EloquentBuilder $query) use ($angelTypes): void { ->where(function (EloquentBuilder $query) use ($angelTypes): void {
$query $query
@ -99,6 +102,13 @@ class ShiftsController extends BaseController
->limit(10) ->limit(10)
->orderBy('start'); ->orderBy('start');
foreach ($shiftEntries as $entry) {
$freeShifts->where(function (QueryBuilder $query) use ($entry) {
$query->where('end', '<=', $entry->shift->start);
$query->orWhere('start', '>=', $entry->shift->end);
});
}
return $freeShifts->get(); return $freeShifts->get();
} }