From e2b6aa1d30b056f2157c056db0b25b38fe0910ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Munsch?= Date: Thu, 27 Oct 2022 14:10:13 +0200 Subject: [PATCH] Get in message inuav code failling unique assertion --- app/Models/CafelEggBreeder.php | 17 +++++++++-------- app/Models/CafelPoultryBreeder.php | 2 +- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/app/Models/CafelEggBreeder.php b/app/Models/CafelEggBreeder.php index 26aab08..1b67bdf 100644 --- a/app/Models/CafelEggBreeder.php +++ b/app/Models/CafelEggBreeder.php @@ -137,24 +137,25 @@ class CafelEggBreeder extends Model /** * Check if inuav codes are unique * - * @param self $eleveur + * @param self $breeder * @return boolean * @throws \Illuminate\Validation\ValidationException If inuav code is already used. */ - protected static function areInuavCodesUniques(self $eleveur): bool + protected static function areInuavCodesUniques(self $breeder): bool { $q = self::query(); // * Update condition - $q->where(function ($q) use ($eleveur) { - foreach ($eleveur->inuavs as $inuav) { - $q->orWhere('inuavs', 'LIKE', "%$inuav%"); + $q->where(function ($q) use ($breeder) { + foreach ($breeder->inuavs as $inuav) { + $q->orWhere('inuavs', '=', $inuav); } }); - if ($eleveur->cafel_code) { - $q->where('cafel_code', '!=', $eleveur->cafel_code); + if ($breeder->cafel_code) { + $q->where('cafel_code', '!=', $breeder->cafel_code); } if ($q->count()) { - throw ValidationException::withMessages(['inuavs' => 'Les codes INUAVS doinvent être uniques' + throw ValidationException::withMessages([ + 'inuavs' => 'Les codes INUAVS doinvent être uniques : ' . collect($breeder->inuavs)->implode(',') ]); } return true; diff --git a/app/Models/CafelPoultryBreeder.php b/app/Models/CafelPoultryBreeder.php index 2106140..bf6ec62 100644 --- a/app/Models/CafelPoultryBreeder.php +++ b/app/Models/CafelPoultryBreeder.php @@ -119,7 +119,7 @@ class CafelPoultryBreeder extends Model } if ($q->count()) { throw ValidationException::withMessages([ - 'inuavs' => 'Les codes INUAVS doinvent être uniques' + 'inuavs' => 'Les codes INUAVS doinvent être uniques : ' . collect($breeder->inuavs)->implode(',') ]); } return true;