Rework Tracea Egg à causes de mauvaises informations (encore ...)
This commit is contained in:
parent
efe0140542
commit
e031475ad9
5 changed files with 22 additions and 37 deletions
|
|
@ -36,8 +36,8 @@ class Kernel extends ConsoleKernel
|
|||
$schedule->job(CafelEggBreederJob::class, 'cafel')->onOneServer()->everyThreeHours();
|
||||
$schedule->job(CafelPoultryBreederJob::class, 'cafel')->onOneServer()->everyThreeHours();
|
||||
|
||||
$schedule->job(XmlFluxEggJob::class, 'tracea')->dailyAt('02:00')->onOneServer();
|
||||
$schedule->job(XmlFluxPoultryJob::class, 'tracea')->dailyAt('22:00')->onOneServer();
|
||||
$schedule->job(XmlFluxEggJob::class, 'tracea')->onOneServer()->dailyAt('02:00');
|
||||
$schedule->job(XmlFluxPoultryJob::class, 'tracea')->onOneServer()->dailyAt('22:00');
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -48,9 +48,7 @@ class XmlFluxEggJob extends XmlJobs
|
|||
*
|
||||
* @var array
|
||||
*/
|
||||
protected $uniqueKeyField = [
|
||||
'box_code'
|
||||
];
|
||||
protected $uniqueKeyField = [];
|
||||
|
||||
/**
|
||||
* Execute the job.
|
||||
|
|
@ -59,6 +57,9 @@ class XmlFluxEggJob extends XmlJobs
|
|||
*/
|
||||
public function handle()
|
||||
{
|
||||
$this->parseData('ML', TraceaEgg::class);
|
||||
// phpcs:ignore Generic.CodeAnalysis.UnusedFunctionParameter.FoundInExtendedClassBeforeLastUsed
|
||||
$this->parseData('ML', TraceaEgg::class, null, function ($uniqueColumnsKey, $line) {
|
||||
TraceaEgg::insert($line);
|
||||
});
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -61,6 +61,7 @@ abstract class XmlJobs extends XArcadiaFlux
|
|||
* @param callable $afterSaveCallback After save is done.
|
||||
* @return void
|
||||
* @throws InvalidXmlException If xml file is not valid.
|
||||
* @throws \ErrorException If no unique columns nor $saveCallback are provided.
|
||||
* @phpcs:disable Generic.Metrics.CyclomaticComplexity.MaxExceeded
|
||||
*/
|
||||
protected function parseData(
|
||||
|
|
@ -145,18 +146,21 @@ abstract class XmlJobs extends XArcadiaFlux
|
|||
foreach ($this->uniqueKeyField as $uField) {
|
||||
$uniqueColumnsKey[$uField] = $line[$uField];
|
||||
}
|
||||
if (count($uniqueColumnsKey)) {
|
||||
if ($saveCallback) {
|
||||
$saveCallback($uniqueColumnsKey, $line);
|
||||
} else {
|
||||
forward_static_call_array(
|
||||
[$modelClass, 'updateOrCreate'],
|
||||
[$uniqueColumnsKey, $line]
|
||||
);
|
||||
}
|
||||
if ($saveCallback) {
|
||||
$saveCallback($uniqueColumnsKey, $line);
|
||||
if ($afterSaveCallback) {
|
||||
$afterSaveCallback($xmlContent, $line);
|
||||
}
|
||||
} elseif (count($uniqueColumnsKey)) {
|
||||
forward_static_call_array(
|
||||
[$modelClass, 'updateOrCreate'],
|
||||
[$uniqueColumnsKey, $line]
|
||||
);
|
||||
if ($afterSaveCallback) {
|
||||
$afterSaveCallback($xmlContent, $line);
|
||||
}
|
||||
} else {
|
||||
throw new \ErrorException('Data not saved');
|
||||
}
|
||||
} //end foreach
|
||||
} catch (InvalidXmlException $e) {
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ class TraceaEgg extends Model
|
|||
*
|
||||
* @var string
|
||||
*/
|
||||
protected $primaryKey = 'box_code';
|
||||
protected $primaryKey = null;
|
||||
|
||||
/**
|
||||
* Indicates if the IDs are auto-incrementing.
|
||||
|
|
|
|||
|
|
@ -1,9 +1,7 @@
|
|||
<?php
|
||||
|
||||
use App\Models\TraceaEgg;
|
||||
use Illuminate\Database\Migrations\Migration;
|
||||
use Illuminate\Database\Schema\Blueprint;
|
||||
use Illuminate\Support\Collection;
|
||||
use Illuminate\Support\Facades\DB;
|
||||
use Illuminate\Support\Facades\Schema;
|
||||
|
||||
|
|
@ -23,7 +21,6 @@ class CreateTraceaEggsTable extends Migration
|
|||
Schema::create('tracea_eggs', function (Blueprint $table) {
|
||||
$table->id();
|
||||
$table->unsignedBigInteger('box_code')
|
||||
->unique()
|
||||
->comment('Le code de la boite d\'oeufs xs:integer [0-9]{9}|[0-9]{10}');
|
||||
$table->string('ede_code', 10)
|
||||
->index()
|
||||
|
|
@ -90,26 +87,9 @@ class CreateTraceaEggsTable extends Migration
|
|||
->comment('Le code de la boite d\'oeufs xs:integer [0-9]{9}|[0-9]{10}')
|
||||
->change();
|
||||
});
|
||||
collect(DB::select(
|
||||
'select box_code from tracea_eggs group by box_code having count(box_code) > 1'
|
||||
))->chunk(8000)->map(function (Collection $collection) {
|
||||
// * Remove duplicate code_boite but keep latest
|
||||
// ! MASS DELETE
|
||||
TraceaEgg::whereIn(
|
||||
'id',
|
||||
TraceaEgg::select(['id', 'box_code'])->whereIn(
|
||||
'box_code',
|
||||
$collection->pluck('box_code')->all()
|
||||
)->get()->groupBy('box_code')->map(function (Collection $codeBoiteGroup) {
|
||||
// * Remove last entry
|
||||
$codeBoiteGroup->pop();
|
||||
return $codeBoiteGroup;
|
||||
})->flatten(1)->pluck('id')->all()
|
||||
)->delete();
|
||||
});
|
||||
Schema::table('tracea_eggs', function (Blueprint $table) {
|
||||
$table->unsignedBigInteger('box_code')
|
||||
->unique()
|
||||
->index()
|
||||
->comment('Le code de la boite d\'oeufs xs:integer [0-9]{9}|[0-9]{10}')
|
||||
->change();
|
||||
$table->dropColumn(['id']);
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue