refactor controllers to use form requests for validation
This commit is contained in:
@@ -2,6 +2,7 @@
|
||||
|
||||
namespace App\Http\Controllers;
|
||||
|
||||
use App\Http\Requests\EducationRequest;
|
||||
use App\Models\Education;
|
||||
use Illuminate\Http\Request;
|
||||
|
||||
@@ -19,22 +20,11 @@ class EducationController extends Controller
|
||||
return view('educations.create');
|
||||
}
|
||||
|
||||
public function store(Request $request)
|
||||
public function store(EducationRequest $request)
|
||||
{
|
||||
$data = $request->validate([
|
||||
'opleiding' => 'required|string|max:255',
|
||||
'instituut' => 'required|string|max:255',
|
||||
'startdatum' => 'required|date',
|
||||
'einddatum' => 'nullable|date|after_or_equal:startdatum',
|
||||
'beschrijving' => 'nullable|string',
|
||||
'afbeelding' => 'nullable|image|max:2048',
|
||||
]);
|
||||
$education = Education::create($request->validated());
|
||||
|
||||
$education = Education::create($data);
|
||||
|
||||
if ($request->hasFile('afbeelding')) {
|
||||
$education->addMediaFromRequest('afbeelding')->toMediaCollection('image');
|
||||
}
|
||||
$this->handleImageUpload($request, $education);
|
||||
|
||||
return redirect()->route('educations.index')->with('success', 'Opleiding toegevoegd.');
|
||||
}
|
||||
@@ -49,32 +39,31 @@ class EducationController extends Controller
|
||||
return view('educations.edit', compact('education'));
|
||||
}
|
||||
|
||||
public function update(Request $request, Education $education)
|
||||
public function update(EducationRequest $request, Education $education)
|
||||
{
|
||||
$data = $request->validate([
|
||||
'opleiding' => 'required|string|max:255',
|
||||
'instituut' => 'required|string|max:255',
|
||||
'startdatum' => 'required|date',
|
||||
'einddatum' => 'nullable|date|after_or_equal:startdatum',
|
||||
'beschrijving' => 'nullable|string',
|
||||
'afbeelding' => 'nullable|image|max:2048',
|
||||
]);
|
||||
$education->update($request->validated());
|
||||
|
||||
$education->update($data);
|
||||
|
||||
if ($request->hasFile('afbeelding')) {
|
||||
$education->clearMediaCollection('image');
|
||||
|
||||
$education->addMediaFromRequest('afbeelding')->toMediaCollection('image');
|
||||
}
|
||||
$this->handleImageUpload($request, $education, true);
|
||||
|
||||
return redirect()->route('educations.index')->with('success', 'Opleiding bijgewerkt.');
|
||||
}
|
||||
|
||||
public function destroy(Education $education)
|
||||
{
|
||||
$education->clearMediaCollection('image');
|
||||
$education->delete();
|
||||
|
||||
return redirect()->route('educations.index')->with('success', 'Opleiding verwijderd.');
|
||||
}
|
||||
|
||||
protected function handleImageUpload(Request $request, Education $education, bool $replace = false): void
|
||||
{
|
||||
if ($request->hasFile('afbeelding')) {
|
||||
if ($replace) {
|
||||
$education->clearMediaCollection('image');
|
||||
}
|
||||
|
||||
$education->addMediaFromRequest('afbeelding')->toMediaCollection('image');
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -4,6 +4,7 @@ namespace App\Http\Controllers;
|
||||
|
||||
use App\Models\Personalia;
|
||||
use Illuminate\Http\Request;
|
||||
use App\Http\Requests\PersonaliaRequest;
|
||||
|
||||
class PersonaliaController extends Controller
|
||||
{
|
||||
@@ -19,14 +20,9 @@ class PersonaliaController extends Controller
|
||||
return view('personalia.create');
|
||||
}
|
||||
|
||||
public function store(Request $request)
|
||||
public function store(PersonaliaRequest $request)
|
||||
{
|
||||
$validated = $request->validate([
|
||||
'key' => 'required|string|max:255',
|
||||
'value' => 'required|string|max:255',
|
||||
'hidden' => 'nullable|boolean',
|
||||
'icon' => 'nullable|string|max:255',
|
||||
]);
|
||||
$validated = $request->validated();
|
||||
|
||||
Personalia::create([
|
||||
...$validated,
|
||||
@@ -44,18 +40,12 @@ class PersonaliaController extends Controller
|
||||
|
||||
public function update(Request $request, Personalia $personalium)
|
||||
{
|
||||
$validated = $request->validate([
|
||||
'key' => 'required|string|max:255',
|
||||
'value' => 'required|string|max:255',
|
||||
'hidden' => 'nullable|boolean',
|
||||
'icon' => 'nullable|string|max:255',
|
||||
]);
|
||||
$validated = $request->validated();
|
||||
|
||||
$personalium->update([
|
||||
...$validated,
|
||||
'hidden' => $request->boolean('hidden'),
|
||||
]);
|
||||
|
||||
return redirect()->route('personalia.index')->with('success', 'Persoonlijk item bijgewerkt.');
|
||||
}
|
||||
|
||||
|
||||
@@ -4,43 +4,25 @@ namespace App\Http\Controllers;
|
||||
|
||||
use App\Models\Skill;
|
||||
use Illuminate\Http\Request;
|
||||
use App\Http\Requests\SkillRequest;
|
||||
|
||||
|
||||
class SkillController extends Controller
|
||||
{
|
||||
/**
|
||||
* Display a listing of the resource.
|
||||
*/
|
||||
public function index()
|
||||
{
|
||||
$skills = Skill::latest()->get();
|
||||
|
||||
return view('skills.index', compact('skills'));
|
||||
}
|
||||
|
||||
/**
|
||||
* Show the form for creating a new resource.
|
||||
*/
|
||||
public function create()
|
||||
{
|
||||
return view('skills.create');
|
||||
}
|
||||
|
||||
/**
|
||||
* Store a newly created resource in storage.
|
||||
*/
|
||||
public function store(Request $request)
|
||||
public function store(SkillRequest $request)
|
||||
{
|
||||
|
||||
$validated = $request->validate([
|
||||
'title' => 'required|string|max:255',
|
||||
'description' => 'nullable|string',
|
||||
'rating' => 'required|numeric|min:1|max:10',
|
||||
'image' => 'nullable|image|max:2048',
|
||||
'type' => 'required|in:rating,tag,other',
|
||||
|
||||
]);
|
||||
|
||||
$skill = Skill::create($validated);
|
||||
$skill = Skill::create($request->validated());
|
||||
|
||||
if ($request->hasFile('image')) {
|
||||
$skill->addMediaFromRequest('image')->toMediaCollection('image', 'public');
|
||||
@@ -49,37 +31,19 @@ class SkillController extends Controller
|
||||
return redirect()->route('skills.index')->with('success', 'Vaardigheid toegevoegd.');
|
||||
}
|
||||
|
||||
/**
|
||||
* Display the specified resource.
|
||||
*/
|
||||
public function show(Skill $skill)
|
||||
{
|
||||
return view('skills.show', compact('skill'));
|
||||
}
|
||||
|
||||
/**
|
||||
* Show the form for editing the specified resource.
|
||||
*/
|
||||
public function edit(Skill $skill)
|
||||
{
|
||||
return view('skills.edit', compact('skill'));
|
||||
}
|
||||
|
||||
/**
|
||||
* Update the specified resource in storage.
|
||||
*/
|
||||
public function update(Request $request, Skill $skill)
|
||||
public function update(SkillRequest $request, Skill $skill)
|
||||
{
|
||||
$validated = $request->validate([
|
||||
'title' => 'required|string|max:255',
|
||||
'description' => 'nullable|string',
|
||||
'rating' => 'required|numeric|min:1|max:10',
|
||||
'image' => 'nullable|image|max:2048',
|
||||
'type' => 'required|in:rating,tag,other',
|
||||
|
||||
]);
|
||||
|
||||
$skill->update($validated);
|
||||
$skill->update($request->validated());
|
||||
|
||||
if ($request->hasFile('image')) {
|
||||
$skill->clearMediaCollection('image');
|
||||
@@ -89,9 +53,6 @@ class SkillController extends Controller
|
||||
return redirect()->route('skills.index')->with('success', 'Vaardigheid bijgewerkt.');
|
||||
}
|
||||
|
||||
/**
|
||||
* Remove the specified resource from storage.
|
||||
*/
|
||||
public function destroy(Skill $skill)
|
||||
{
|
||||
$skill->clearMediaCollection('image');
|
||||
|
||||
@@ -4,6 +4,8 @@ namespace App\Http\Controllers;
|
||||
|
||||
use App\Models\WorkExperience;
|
||||
use Illuminate\Http\Request;
|
||||
use App\Http\Requests\WorkExperienceRequest;
|
||||
|
||||
|
||||
class WorkExperienceController extends Controller
|
||||
{
|
||||
@@ -19,18 +21,9 @@ class WorkExperienceController extends Controller
|
||||
return view('work_experiences.create');
|
||||
}
|
||||
|
||||
public function store(Request $request)
|
||||
public function store(WorkExperienceRequest $request)
|
||||
{
|
||||
$data = $request->validate([
|
||||
'werkgever' => 'required|string|max:255',
|
||||
'functie' => 'required|string|max:255',
|
||||
'startdatum' => 'required|date',
|
||||
'einddatum' => 'nullable|date|after_or_equal:startdatum',
|
||||
'beschrijving' => 'nullable|string',
|
||||
'afbeelding' => 'nullable|image|max:2048',
|
||||
]);
|
||||
|
||||
$experience = WorkExperience::create($data);
|
||||
$experience = WorkExperience::create($request->validated());
|
||||
|
||||
if ($request->hasFile('afbeelding')) {
|
||||
$experience->addMediaFromRequest('afbeelding')->toMediaCollection('image');
|
||||
@@ -49,18 +42,9 @@ class WorkExperienceController extends Controller
|
||||
return view('work_experiences.edit', compact('workExperience'));
|
||||
}
|
||||
|
||||
public function update(Request $request, WorkExperience $workExperience)
|
||||
public function update(WorkExperienceRequest $request, WorkExperience $workExperience)
|
||||
{
|
||||
$data = $request->validate([
|
||||
'werkgever' => 'required|string|max:255',
|
||||
'functie' => 'required|string|max:255',
|
||||
'startdatum' => 'required|date',
|
||||
'einddatum' => 'nullable|date|after_or_equal:startdatum',
|
||||
'beschrijving' => 'nullable|string',
|
||||
'afbeelding' => 'nullable|image|max:2048',
|
||||
]);
|
||||
|
||||
$workExperience->update($data);
|
||||
$workExperience->update($request->validated());
|
||||
|
||||
if ($request->hasFile('afbeelding')) {
|
||||
$workExperience->clearMediaCollection('image');
|
||||
@@ -72,6 +56,7 @@ class WorkExperienceController extends Controller
|
||||
|
||||
public function destroy(WorkExperience $workExperience)
|
||||
{
|
||||
$workExperience->clearMediaCollection('image');
|
||||
$workExperience->delete();
|
||||
|
||||
return redirect()->route('work-experiences.index')->with('success', 'Ervaring verwijderd.');
|
||||
|
||||
49
app/Http/Requests/EducationRequest.php
Normal file
49
app/Http/Requests/EducationRequest.php
Normal file
@@ -0,0 +1,49 @@
|
||||
<?php
|
||||
|
||||
namespace App\Http\Requests;
|
||||
|
||||
use Illuminate\Foundation\Http\FormRequest;
|
||||
|
||||
class EducationRequest extends FormRequest
|
||||
{
|
||||
public function authorize(): bool
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
public function rules(): array
|
||||
{
|
||||
return [
|
||||
'opleiding' => ['required', 'string', 'max:255'],
|
||||
'instituut' => ['required', 'string', 'max:255'],
|
||||
'startdatum' => ['required', 'date'],
|
||||
'einddatum' => ['nullable', 'date', 'after_or_equal:startdatum'],
|
||||
'beschrijving' => ['nullable', 'string'],
|
||||
'afbeelding' => ['nullable', 'image', 'max:2048'],
|
||||
];
|
||||
}
|
||||
|
||||
public function messages(): array
|
||||
{
|
||||
return [
|
||||
'opleiding.required' => 'De naam van de opleiding is verplicht.',
|
||||
'opleiding.string' => 'De opleiding moet een geldige tekst zijn.',
|
||||
'opleiding.max' => 'De opleiding mag maximaal 255 tekens bevatten.',
|
||||
|
||||
'instituut.required' => 'Het instituut is verplicht.',
|
||||
'instituut.string' => 'Het instituut moet een geldige tekst zijn.',
|
||||
'instituut.max' => 'Het instituut mag maximaal 255 tekens bevatten.',
|
||||
|
||||
'startdatum.required' => 'De startdatum is verplicht.',
|
||||
'startdatum.date' => 'De startdatum moet een geldige datum zijn.',
|
||||
|
||||
'einddatum.date' => 'De einddatum moet een geldige datum zijn.',
|
||||
'einddatum.after_or_equal' => 'De einddatum mag niet vóór de startdatum liggen.',
|
||||
|
||||
'beschrijving.string' => 'De beschrijving moet een geldige tekst zijn.',
|
||||
|
||||
'afbeelding.image' => 'De geüploade afbeelding moet een geldig afbeeldingsbestand zijn.',
|
||||
'afbeelding.max' => 'De afbeelding mag niet groter zijn dan 2MB.',
|
||||
];
|
||||
}
|
||||
}
|
||||
32
app/Http/Requests/PersonaliaRequest.php
Normal file
32
app/Http/Requests/PersonaliaRequest.php
Normal file
@@ -0,0 +1,32 @@
|
||||
<?php
|
||||
|
||||
namespace App\Http\Requests;
|
||||
|
||||
use Illuminate\Foundation\Http\FormRequest;
|
||||
|
||||
class PersonaliaRequest extends FormRequest
|
||||
{
|
||||
public function authorize(): bool
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
public function rules(): array
|
||||
{
|
||||
return [
|
||||
'key' => ['required', 'string', 'max:255'],
|
||||
'value' => ['required', 'string', 'max:255'],
|
||||
'hidden' => ['nullable', 'boolean'],
|
||||
'icon' => ['nullable', 'string', 'max:255'],
|
||||
];
|
||||
}
|
||||
|
||||
public function messages(): array
|
||||
{
|
||||
return [
|
||||
'key.required' => 'Een sleutel is verplicht.',
|
||||
'value.required' => 'Een waarde is verplicht.',
|
||||
];
|
||||
}
|
||||
|
||||
}
|
||||
33
app/Http/Requests/SkillRequest.php
Normal file
33
app/Http/Requests/SkillRequest.php
Normal file
@@ -0,0 +1,33 @@
|
||||
<?php
|
||||
|
||||
namespace App\Http\Requests;
|
||||
|
||||
use Illuminate\Foundation\Http\FormRequest;
|
||||
|
||||
class SkillRequest extends FormRequest
|
||||
{
|
||||
public function authorize(): bool
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
public function rules(): array
|
||||
{
|
||||
return [
|
||||
'title' => ['required', 'string', 'max:255'],
|
||||
'description' => ['nullable', 'string'],
|
||||
'rating' => ['required', 'numeric', 'min:1', 'max:10'],
|
||||
'image' => ['nullable', 'image', 'max:2048'],
|
||||
'type' => ['required', 'in:rating,tag,other'],
|
||||
];
|
||||
}
|
||||
public function messages(): array
|
||||
{
|
||||
return [
|
||||
'title.required' => 'Een titel is verplicht.',
|
||||
'rating.required' => 'Geef een beoordeling tussen 1 en 10.',
|
||||
'type.in' => 'Het type moet rating, tag of other zijn.',
|
||||
];
|
||||
}
|
||||
|
||||
}
|
||||
49
app/Http/Requests/WorkExperienceRequest.php
Normal file
49
app/Http/Requests/WorkExperienceRequest.php
Normal file
@@ -0,0 +1,49 @@
|
||||
<?php
|
||||
|
||||
namespace App\Http\Requests;
|
||||
|
||||
use Illuminate\Foundation\Http\FormRequest;
|
||||
|
||||
class WorkExperienceRequest extends FormRequest
|
||||
{
|
||||
public function authorize(): bool
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
public function rules(): array
|
||||
{
|
||||
return [
|
||||
'werkgever' => ['required', 'string', 'max:255'],
|
||||
'functie' => ['required', 'string', 'max:255'],
|
||||
'startdatum' => ['required', 'date'],
|
||||
'einddatum' => ['nullable', 'date', 'after_or_equal:startdatum'],
|
||||
'beschrijving' => ['nullable', 'string'],
|
||||
'afbeelding' => ['nullable', 'image', 'max:2048'],
|
||||
];
|
||||
}
|
||||
|
||||
public function messages(): array
|
||||
{
|
||||
return [
|
||||
'werkgever.required' => 'De naam van de werkgever is verplicht.',
|
||||
'werkgever.string' => 'De werkgever moet een geldige tekst zijn.',
|
||||
'werkgever.max' => 'De werkgever mag maximaal 255 tekens bevatten.',
|
||||
|
||||
'functie.required' => 'De functietitel is verplicht.',
|
||||
'functie.string' => 'De functie moet een geldige tekst zijn.',
|
||||
'functie.max' => 'De functie mag maximaal 255 tekens bevatten.',
|
||||
|
||||
'startdatum.required' => 'De startdatum is verplicht.',
|
||||
'startdatum.date' => 'De startdatum moet een geldige datum zijn.',
|
||||
|
||||
'einddatum.date' => 'De einddatum moet een geldige datum zijn.',
|
||||
'einddatum.after_or_equal' => 'De einddatum mag niet vóór de startdatum liggen.',
|
||||
|
||||
'beschrijving.string' => 'De beschrijving moet een geldige tekst zijn.',
|
||||
|
||||
'afbeelding.image' => 'De afbeelding moet een geldig afbeeldingsbestand zijn.',
|
||||
'afbeelding.max' => 'De afbeelding mag niet groter zijn dan 2MB.',
|
||||
];
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user