From 9cce21d0807f398ad0e67da4ae646ecd8d0ffb56 Mon Sep 17 00:00:00 2001 From: Roberto Guagliardo Date: Wed, 23 Jul 2025 20:41:26 +0200 Subject: [PATCH] refactor controllers to use form requests for validation --- README.md | 2 +- app/Http/Controllers/EducationController.php | 49 +++++++----------- app/Http/Controllers/PersonaliaController.php | 18 ++----- app/Http/Controllers/SkillController.php | 51 +++---------------- .../Controllers/WorkExperienceController.php | 29 +++-------- app/Http/Requests/EducationRequest.php | 49 ++++++++++++++++++ app/Http/Requests/PersonaliaRequest.php | 32 ++++++++++++ app/Http/Requests/SkillRequest.php | 33 ++++++++++++ app/Http/Requests/WorkExperienceRequest.php | 49 ++++++++++++++++++ .../NotifyTelegramAboutPersonaliaClick.php | 2 +- app/Models/User.php | 16 ------ app/Models/WorkExperience.php | 2 - 12 files changed, 201 insertions(+), 131 deletions(-) create mode 100644 app/Http/Requests/EducationRequest.php create mode 100644 app/Http/Requests/PersonaliaRequest.php create mode 100644 app/Http/Requests/SkillRequest.php create mode 100644 app/Http/Requests/WorkExperienceRequest.php diff --git a/README.md b/README.md index cf97ff8..a65fe98 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ zien — inclusief slimme automatisering, logging en Telegram-notificaties voor ## 🧰 Techniek & Stack -- **Framework:** Laravel 11 +- **Framework:** Laravel 12 - **Frontend:** Tailwind CSS, Blade - **DevOps-integraties:** Telegram alerts, Healthchecks, custom logging - **CI/CD-ready:** Ondersteuning voor deploy hooks en jobs diff --git a/app/Http/Controllers/EducationController.php b/app/Http/Controllers/EducationController.php index a0570ca..fa454c6 100644 --- a/app/Http/Controllers/EducationController.php +++ b/app/Http/Controllers/EducationController.php @@ -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'); + } + } } diff --git a/app/Http/Controllers/PersonaliaController.php b/app/Http/Controllers/PersonaliaController.php index 4cb6e3b..9f3cb6b 100644 --- a/app/Http/Controllers/PersonaliaController.php +++ b/app/Http/Controllers/PersonaliaController.php @@ -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.'); } diff --git a/app/Http/Controllers/SkillController.php b/app/Http/Controllers/SkillController.php index a7d9bd7..6a647bb 100644 --- a/app/Http/Controllers/SkillController.php +++ b/app/Http/Controllers/SkillController.php @@ -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'); diff --git a/app/Http/Controllers/WorkExperienceController.php b/app/Http/Controllers/WorkExperienceController.php index 371c122..e6d03b5 100644 --- a/app/Http/Controllers/WorkExperienceController.php +++ b/app/Http/Controllers/WorkExperienceController.php @@ -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.'); diff --git a/app/Http/Requests/EducationRequest.php b/app/Http/Requests/EducationRequest.php new file mode 100644 index 0000000..df4b70a --- /dev/null +++ b/app/Http/Requests/EducationRequest.php @@ -0,0 +1,49 @@ + ['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.', + ]; + } +} diff --git a/app/Http/Requests/PersonaliaRequest.php b/app/Http/Requests/PersonaliaRequest.php new file mode 100644 index 0000000..a7d8e34 --- /dev/null +++ b/app/Http/Requests/PersonaliaRequest.php @@ -0,0 +1,32 @@ + ['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.', + ]; + } + +} diff --git a/app/Http/Requests/SkillRequest.php b/app/Http/Requests/SkillRequest.php new file mode 100644 index 0000000..c60e055 --- /dev/null +++ b/app/Http/Requests/SkillRequest.php @@ -0,0 +1,33 @@ + ['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.', + ]; + } + +} diff --git a/app/Http/Requests/WorkExperienceRequest.php b/app/Http/Requests/WorkExperienceRequest.php new file mode 100644 index 0000000..8ccdc2f --- /dev/null +++ b/app/Http/Requests/WorkExperienceRequest.php @@ -0,0 +1,49 @@ + ['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.', + ]; + } +} diff --git a/app/Jobs/NotifyTelegramAboutPersonaliaClick.php b/app/Jobs/NotifyTelegramAboutPersonaliaClick.php index 14e4f20..8d12ae3 100644 --- a/app/Jobs/NotifyTelegramAboutPersonaliaClick.php +++ b/app/Jobs/NotifyTelegramAboutPersonaliaClick.php @@ -36,7 +36,7 @@ Naam: {$this->personalia->value} IP: {$this->ip} User Agent: `{$this->userAgent}` -📅 Tijdstip: *{$this->personalia->updated_at->format('d-m-Y H:i')}* +📅 Tijdstip: *{now()->format('d-m-Y H:i')}* TEXT; Http::post('https://api.telegram.org/bot'.config('services.telegram.bot_token').'/sendMessage', [ diff --git a/app/Models/User.php b/app/Models/User.php index 749c7b7..250e80d 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -2,7 +2,6 @@ namespace App\Models; -// use Illuminate\Contracts\Auth\MustVerifyEmail; use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Foundation\Auth\User as Authenticatable; use Illuminate\Notifications\Notifiable; @@ -12,32 +11,17 @@ class User extends Authenticatable /** @use HasFactory<\Database\Factories\UserFactory> */ use HasFactory, Notifiable; - /** - * The attributes that are mass assignable. - * - * @var list - */ protected $fillable = [ 'name', 'email', 'password', ]; - /** - * The attributes that should be hidden for serialization. - * - * @var list - */ protected $hidden = [ 'password', 'remember_token', ]; - /** - * Get the attributes that should be cast. - * - * @return array - */ protected function casts(): array { return [ diff --git a/app/Models/WorkExperience.php b/app/Models/WorkExperience.php index 8705a41..968912c 100644 --- a/app/Models/WorkExperience.php +++ b/app/Models/WorkExperience.php @@ -27,6 +27,4 @@ class WorkExperience extends Model implements HasMedia { return $this->image() ? $this->image()->getUrl() : null; } - - // Als je mediaconversies of image handling wil: hier kun je die later toevoegen }