From cb6778adb39a077d0a71d1e0b95731df4e26fb93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Munsch?= Date: Thu, 27 Oct 2022 15:30:43 +0200 Subject: [PATCH] Validate Ede_Code as unique on Egg breeder Cafel Add unique on Egg breeders code ede --- app/Lib/CafelApi/Models/CafelEggBreeder.php | 4 +- app/Models/CafelEggBreeder.php | 21 ++++++++++ ..._152412_add_unique_on_ede_egg_breeders.php | 42 +++++++++++++++++++ 3 files changed, 65 insertions(+), 2 deletions(-) create mode 100644 database/migrations/2022_10_27_152412_add_unique_on_ede_egg_breeders.php diff --git a/app/Lib/CafelApi/Models/CafelEggBreeder.php b/app/Lib/CafelApi/Models/CafelEggBreeder.php index cba2bf8..da69eb0 100644 --- a/app/Lib/CafelApi/Models/CafelEggBreeder.php +++ b/app/Lib/CafelApi/Models/CafelEggBreeder.php @@ -17,7 +17,7 @@ abstract class CafelEggBreeder extends CafelClientModel * @var array */ public const UNIQUE_COLUMN_KEYS = [ - 'cafel_code' + 'cafel_code', 'ede_code' ]; /** @@ -43,7 +43,7 @@ abstract class CafelEggBreeder extends CafelClientModel * 2 chiffres qui représentent le numéro d’ordre de chaque atelier dans une même exploitation * eg : 1FRZFC01 */ - 'ede_code' => 'required|regex:/[0-3][A-Z]{5}\d\d/', + 'ede_code' => 'required|regex:/^[0-3][A-Z]{5}\d\d$/', // Valeurs possibles pour civility : 1 M, 2 MME, 3 EUX, 4 ELLES . 'civility' => ['required', [EnumIsValidRule::class, BreederCivilty::class]], 'lastname' => 'required|string|min:1|max:255', diff --git a/app/Models/CafelEggBreeder.php b/app/Models/CafelEggBreeder.php index 1b67bdf..d7ee50f 100644 --- a/app/Models/CafelEggBreeder.php +++ b/app/Models/CafelEggBreeder.php @@ -5,6 +5,8 @@ namespace App\Models; use App\Enums\BreederCivilty; use Illuminate\Database\Eloquent\Model; use Illuminate\Support\Facades\Storage; +use Illuminate\Support\Facades\Validator; +use Illuminate\Validation\Rule; use Illuminate\Validation\ValidationException; use Kwaadpepper\Enum\Traits\CastsEnums; @@ -98,6 +100,7 @@ class CafelEggBreeder extends Model // * EVENT CLOSURES. static::creating(function (self $model) { return self::areInuavCodesUniques($model); + return self::isEdeCodeUnique($model); }); static::updating(function (self $model) { if ($model->getRawOriginal('path_picture_1') !== $model->path_picture_1) { @@ -107,6 +110,7 @@ class CafelEggBreeder extends Model Storage::delete(\public_path($model->getRawOriginal('path_picture_2'))); } return self::areInuavCodesUniques($model); + return self::isEdeCodeUnique($model); }); } @@ -160,4 +164,21 @@ class CafelEggBreeder extends Model } return true; } + + /** + * Check if ede code is unique + * + * @param self $breeder + * @return boolean + * @throws \Illuminate\Validation\ValidationException If ede code is already used. + */ + protected static function isEdeCodeUnique(self $breeder): bool + { + Validator::make([ + 'ede_code' => $breeder->ede_code + ], ['ede_code' => [ + Rule::unique($breeder->getTable(), 'ede_code')->ignore($breeder->id) + ]])->validate(); + return true; + } } diff --git a/database/migrations/2022_10_27_152412_add_unique_on_ede_egg_breeders.php b/database/migrations/2022_10_27_152412_add_unique_on_ede_egg_breeders.php new file mode 100644 index 0000000..2cc7514 --- /dev/null +++ b/database/migrations/2022_10_27_152412_add_unique_on_ede_egg_breeders.php @@ -0,0 +1,42 @@ + */ + $eggBreeders = CafelEggBreeder::all(); + $eggBreeders->each(function (CafelEggBreeder $breeder) { + $breeder->deleteOrFail(); + }); + + Schema::table('cafel_egg_breeders', function (Blueprint $table) { + $table->unique(['ede_code']); + }); + Log::alert('Please reimport all egg breeders'); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('cafel_egg_breeders', function (Blueprint $table) { + $table->dropUnique(['ede_code']); + }); + } +}