br0kenpixel/isop-mirror
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: add option to ignore overlapping internships if they have the same ID

Browse Source
This commit is contained in:
Veronika Fehérvíziová
2025-10-31 22:43:59 +01:00
parent 107cf8a7ea
commit 5065b2ad8d
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
backend/app/Http/Controllers/InternshipController.php
View File

@@ -183,10 +183,7 @@ class InternshipController extends Controller
}
$this->validateNewInternship($request);
if($internship->start !== $request->start || $internship->end !== $request->end) {
$this->checkOverlap($user->id, $request->start, $request->end);
}
$this->checkOverlap($user->id, $request->start, $request->end, $internship->id);
$internship->update($request->except(['user_id']));
return response()->noContent();
@@ -224,8 +221,13 @@ class InternshipController extends Controller
]);
}
private function checkOverlap(int $user_id, string $start_date, string $end_date) {
private function checkOverlap(int $user_id, string $start_date, string $end_date, ?int $current_id = null) {
$existingInternship = Internship::where('user_id', $user_id)
// check if the two internships do not have the same ID
->when($current_id, function ($query) use ($current_id) {
$query->where('id', '!=', $current_id);
})
// check if the start/end period collides with another internship
->where(function ($query) use ($start_date, $end_date) {
$query->whereBetween('start', [$start_date, $end_date])
->orWhereBetween('end', [$start_date, $end_date])
@@ -241,5 +243,5 @@ class InternshipController extends Controller
'message' => 'You already have an internship during this period.'
], 400));
}
}
}
}