Merge branch 'develop' into trunk

app/Console/Commands/LDCWebStatusChecker.php

@@ -45,7 +45,7 @@ class LDCWebStatusChecker extends Command
     public function handle()
     {
         $data = [];
-        $data['uuid'] = env('PROJECT_UUID');
+        $data['uuid'] = config('ldcweb.project_uuid');
 
         // Sitemap.xml ?
         if (file_exists(public_path() . '/sitemap.xml')) {

app/Console/Kernel.php

@@ -2,6 +2,7 @@
 
 namespace App\Console;
 
+use App\Jobs\XmlIncoReader as JobsXmlIncoReader;
 use Illuminate\Console\Scheduling\Schedule;
 use Illuminate\Foundation\Console\Kernel as ConsoleKernel;
 
@@ -25,7 +26,8 @@ class Kernel extends ConsoleKernel
     protected function schedule(Schedule $schedule)
     {
         $schedule->command('sitemap:refresh')->dailyAt('16:13');
-        $schedule->command('ldcweb:statuschecker')->everySixHours();
+        $schedule->command('ldcweb:statuschecker')->everyFifteenMinutes();
+        $schedule->job(JobsXmlIncoReader::class)->name('xml-inco-reader')->onOneServer()->dailyAt('15:00');
         //$schedule->job(new XmlIncoReader)->weeklyOn(1, '8:00');
     }
 

app/Jobs/XmlIncoReader.php

@@ -61,6 +61,7 @@ class XmlIncoReader extends XmlJobs
 
 
         'INCO_COMPO' => 'inco_compo', // Consider this sub array
+        'INCO_COMPO.NOM' => 'nom',
         'INCO_COMPO.TAILLE_REF' => 'taille_ref',
         'INCO_COMPO.VAL_ENERG_KJ_NUT' => 'val_energ_kj_nut',
         'INCO_COMPO.VAL_ENERG_KJ_R' => 'val_energ_kj_r',  //_R apports de la taille_ref
@@ -168,7 +169,7 @@ class XmlIncoReader extends XmlJobs
         'allegations',
         'astuces', 'arg_vente',
         'pds_moy_theo',
-        'lib_conso', 'lst_ing',
+        'lib_conso', 'lst_ing', 'lst_allergene',
         'allegat_sante', 'allegat_nutrit', 'allegat_autre',
         'inco_compo',
         'inco_compo.nom',

app/Models/XmlInco.php

@@ -16,6 +16,7 @@ class XmlInco extends Model
     protected $fillable = [
         'id',
         'no_art',
+        'nom',
         'prod_saison',
         'allegations',
         'conseil_prepa',

config/ldcweb.php

@@ -0,0 +1,5 @@
+<?php
+
+return [
+    'project_uuid' => env('PROJECT_UUID')
+];

database/migrations/2022_03_12_115802_add_nom_to_xml_incos_table.php

@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddNomToXmlIncosTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('xml_incos', function (Blueprint $table) {
+            $table->string('nom')->nullable()->after('id');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('xml_incos', function (Blueprint $table) {
+            $table->dropColumn('nom');
+        });
+    }
+}