Merge branch 'develop' into trunk

This commit is contained in:
Jérémy Munsch 2022-10-27 14:10:46 +02:00
commit 746cc4d8eb
No known key found for this signature in database
GPG key ID: 18361AF3BFEC0FEC
2 changed files with 10 additions and 9 deletions

View file

@ -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;

View file

@ -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;