diff --git a/app/Jobs/CafelFoodJob.php b/app/Jobs/CafelFoodJob.php index 77647aa..83e9fa8 100644 --- a/app/Jobs/CafelFoodJob.php +++ b/app/Jobs/CafelFoodJob.php @@ -14,7 +14,7 @@ class CafelFoodJob extends CafelJobs */ public function handle() { - $dateDebut = now()->subDays(config('cafel.aliments_retain', 30)); + $dateDebut = now()->subDays(config('cafel.food_retain', 30)); $this->syncWithCafelApi( ApiModelCafelFood::class, 'cafel.ldc.aliments', @@ -41,8 +41,8 @@ class CafelFoodJob extends CafelJobs $this->mailInvalidRows(ApiModelCafelFood::UNIQUE_COLUMN_KEYS, ApiModelCafelFood::class); // * DeleteOld Food - // * Garder une interstice de 7 jours entre la suppression et ce qu'on récupère de CAFEL - CafelFood::whereDate('delivery_date', '<', $dateDebut->subDays(7)) + // * Garder une interstice de X jours entre la suppression et ce qu'on récupère de CAFEL + CafelFood::whereDate('delivery_date', '<', $dateDebut->subDays(config('cafel.food_retain', 30))) ->delete(); } } diff --git a/app/Jobs/CafelMepEggJob.php b/app/Jobs/CafelMepEggJob.php index 13f37c6..d286e12 100644 --- a/app/Jobs/CafelMepEggJob.php +++ b/app/Jobs/CafelMepEggJob.php @@ -41,8 +41,9 @@ class CafelMepEggJob extends CafelJobs $this->mailInvalidRows(CafelMepEgg::UNIQUE_COLUMN_KEYS, CafelMepEgg::class); // * DeleteOld MEPs - // * Garder une interstice de 7 jours entre la suppression et ce qu'on récupère de CAFEL - CafelEggMiseEnPlace::whereDate('transfert_date', '<', $dateDebut->subDays(7)) - ->delete(); + // * Garder une interstice de X jours entre la suppression et ce qu'on récupère de CAFEL + CafelEggMiseEnPlace::whereDate('transfert_date', '<', $dateDebut->subDays( + config('cafel.mises_en_places_retain', 370) + ))->delete(); } } diff --git a/app/Lib/CafelApi/Models/CafelFood.php b/app/Lib/CafelApi/Models/CafelFood.php index ea694bb..85ce7b7 100644 --- a/app/Lib/CafelApi/Models/CafelFood.php +++ b/app/Lib/CafelApi/Models/CafelFood.php @@ -16,7 +16,7 @@ abstract class CafelFood extends CafelClientModel * @var array */ public const UNIQUE_COLUMN_KEYS = [ - 'batch_code' + 'batch_code', 'delivery_date' ]; /** diff --git a/config/cafel.php b/config/cafel.php index 6b842ac..4a7e51d 100644 --- a/config/cafel.php +++ b/config/cafel.php @@ -2,7 +2,7 @@ return [ // * How many days should we retain Aliment - 'aliments_retain' => 30, + 'food_retain' => 30, // * How many days should we retain MEP (egg) 'mises_en_places_retain' => 370, 'client_version' => '1.0', diff --git a/database/migrations/2022_03_08_100744_create_cafel_egg_breeders_table.php b/database/migrations/2022_03_08_100744_create_cafel_egg_breeders_table.php index 69b193d..f78b80a 100644 --- a/database/migrations/2022_03_08_100744_create_cafel_egg_breeders_table.php +++ b/database/migrations/2022_03_08_100744_create_cafel_egg_breeders_table.php @@ -29,7 +29,8 @@ class CreateCafelEggBreedersTable extends Migration Schema::table('cafel_egg_breeders', function (Blueprint $table) { $table->unsignedBigInteger('code_cafel')->unique()->nullable(false) ->comment('Code CAFEL de l\'éleveur')->change(); - $table->string('code_ede', 100)->unique() + // Enlevé unique car l'api retourne de la merde ... + $table->string('code_ede', 100) ->comment('Code EDE de l\'éleveur')->change(); $table->string('nom') @@ -143,7 +144,8 @@ class CreateCafelEggBreedersTable extends Migration Schema::create('cafel_egg_breeders', function (Blueprint $table) { $table->unsignedBigInteger('cafel_code')->unique()->nullable(false) ->comment('Code CAFEL de l\'éleveur'); - $table->string('ede_code', 100)->unique() + // Enlevé unique car l'api retourne de la merde ... + $table->string('ede_code', 100) ->comment('Code EDE de l\'éleveur'); $table->unsignedTinyInteger('civility')->default(0) diff --git a/database/migrations/2022_04_06_110037_create_cafel_food_table.php b/database/migrations/2022_04_06_110037_create_cafel_food_table.php index 4cde3e9..09498cb 100644 --- a/database/migrations/2022_04_06_110037_create_cafel_food_table.php +++ b/database/migrations/2022_04_06_110037_create_cafel_food_table.php @@ -14,9 +14,10 @@ class CreateCafelFoodTable extends Migration public function up() { Schema::create('cafel_food', function (Blueprint $table) { - $table->string('batch_code', 10)->unique(); + $table->string('batch_code', 10); $table->unsignedTinyInteger('food_type'); $table->date('delivery_date'); + $table->unique(['batch_code', 'delivery_date']); }); }