Merge branch 'trunk'

feat: #8 - Added date to conditionnaly display/hide modal 'Terre d'action'

See merge request ldc-web/projets/tracabilite-loue!17

.env.example

@@ -3,6 +3,7 @@ APP_ENV=local
 APP_KEY=
 APP_DEBUG=true
 APP_URL=http://localhost
+APP_DOMAIN=
 
 LOG_CHANNEL=stack
 
@@ -37,7 +38,6 @@ CAFEL_PASSWORD=
 MAIL_INVALID_CAFEL_DATA=equipe.web@ldc.fr
 MAIL_INVALID_CAFEL_DATA_IMAGE=equipe.web@ldc.fr
 MAIL_INVALID_XML=equipe.web@ldc.fr
-MAIL_LIST_SERVICEWEB=equipe.web@ldc.fr
 
 ## LDC WEB STATUS CHECKER
 LDC_STATUS_CHECKER_API_KEY="MY_KEY"
@@ -45,6 +45,9 @@ LDC_STATUS_CHECKER_UUID="UUID_PROJECT"
 ## LDC WEB ADMIN SECURE
 LDC_WEB_API_KEY="MY_KEY"
 
-
 ## GOOGLE
 ANALYTICS_GOOGLE_ID=
+
+# TERRE D'ACTION MODAL (YYYY-MM-DD)
+TERRE_ACTION_START_DATE=
+TERRE_ACTION_END_DATE=

.gitignore

@@ -18,3 +18,4 @@ Homestead.json
 Homestead.yaml
 npm-debug.log
 yarn-error.log
+auth.json

.gitlab-ci.yml

@@ -1,46 +1,12 @@
-image: $CI_REGISTRY/service-web-lab/ldc-web-images-docker/ldcweb-qa:php7.3-1.0
+include:
+  - project: 'ldc-web/shared-ci'
+    ref: 'main'
+    file: 'lint/lint7.3.yml'
+  - project: 'ldc-web/shared-ci'
+    ref: 'main'
+    file: 'security/security7.3.yml'
+
 
 stages:
-    - Security
+    - lint
-    - CodingStandards
+    - security
-
-composer-security:
-    stage: Security
-    script:
-        - local-php-security-checker --format=json --path=./composer.lock > composer-security-checker-report.json
-    artifacts:
-        when: on_failure
-        expose_as: 'composer-security-checker'
-        paths:
-          - composer-security-checker-report.json
-    allow_failure: true
-
-npm-security:
-    stage: Security
-    script:
-        - audit-ci -p npm -o json > npm-security-checker-report.json
-    artifacts:
-        when: on_failure
-        expose_as: 'npm-security-checker'
-        paths:
-          - npm-security-checker-report.json
-    allow_failure: true
-
-phpcs:
-    stage: CodingStandards
-    before_script:
-    - composer config gitlab-token.gitlab.com $CI_DEPLOY_USER $CI_DEPLOY_PASSWORD
-    - composer install
-    cache:
-        paths:
-            - vendor/
-    script:
-        - vendor/bin/phpcs --report=junit --report-file=phpcs-report.xml
-    artifacts:
-      when: on_failure
-      expose_as: 'phpcs'
-      paths:
-          - phpcs-report.xml
-      reports:
-        junit: phpcs-report.xml
-    allow_failure: false

.gitlab/issue_templates/bug.md

@@ -0,0 +1,11 @@
+## Comportement constaté
+
+
+## Comportement attendu
+
+
+## Solution envisagée
+
+
+## Étapes pour la reproduction du bug
+* 

.gitlab/issue_templates/feature.md

@@ -0,0 +1,7 @@
+## Présentation du besoin
+
+
+## Implémentation
+
+
+## Maquettes, documentations...

app/Console/Commands/CafelPoultryMepCommand.php

@@ -0,0 +1,38 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Jobs\CafelMepPoultryJob;
+use Illuminate\Console\Command;
+
+class CafelPoultryMepCommand extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'cafel:mep_poultry';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Syncronisation manuelle Cafel (/api/ldc/mepvolailles)';
+
+    /**
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function handle()
+    {
+        $this->info('Running the Job, this could take some time.');
+
+        $job = new CafelMepPoultryJob();
+        $job->handle();
+
+        $this->info('Fin du traitement');
+    }
+}

app/Console/Kernel.php

@@ -30,11 +30,11 @@ class Kernel extends ConsoleKernel
     protected function schedule(Schedule $schedule)
     {
         // * Jobs cafel sur queue cafel
-        $schedule->job(CafelFoodJob::class, 'cafel')->onOneServer()->everyThreeHours();
+        $schedule->job(CafelFoodJob::class, 'cafel')->onOneServer()->dailyAt('22h30');
-        $schedule->job(CafelBeaVolJob::class, 'cafel')->onOneServer()->everyThreeHours();
+        $schedule->job(CafelBeaVolJob::class, 'cafel')->onOneServer()->dailyAt('22h45');
-        $schedule->job(CafelMepEggJob::class, 'cafel')->onOneServer()->everyThreeHours();
+        $schedule->job(CafelMepEggJob::class, 'cafel')->onOneServer()->dailyAt('23h00');
-        $schedule->job(CafelEggBreederJob::class, 'cafel')->onOneServer()->everyThreeHours();
+        $schedule->job(CafelEggBreederJob::class, 'cafel')->onOneServer()->dailyAt('23h15');
-        $schedule->job(CafelPoultryBreederJob::class, 'cafel')->onOneServer()->everyThreeHours();
+        $schedule->job(CafelPoultryBreederJob::class, 'cafel')->onOneServer()->dailyAt('23h30');
 
         $schedule->job(XmlFluxEggJob::class, 'tracea')->onOneServer()->dailyAt('02:00');
         $schedule->job(XmlFluxPoultryJob::class, 'tracea')->onOneServer()->dailyAt('22:00');

app/Exceptions/Handler.php

@@ -4,8 +4,8 @@ namespace App\Exceptions;
 
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Mail;
-use Throwable;
+use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
-use Kwaadpepper\ExceptionHandler\Exceptions\ExceptionHandler;
+use Sentry\Laravel\Integration;
 
 class Handler extends ExceptionHandler
 {
@@ -27,18 +27,19 @@ class Handler extends ExceptionHandler
     ];
 
     /**
-     * Report or log an exception.
+     * Register the exception handling callbacks for the application.
      *
-     * @param  \Throwable $exception
      * @return void
      */
-    public function report(Throwable $exception)
+    public function register()
     {
-        if ($exception instanceof CafelApiImageFetchException) {
+        $this->reportable(function (\Throwable $e) {
-            $this->reportCafelApiImageErrorException($exception);
+            if ($e instanceof CafelApiImageFetchException) {
-            return;
+                $this->reportCafelApiImageErrorException($e);
-        }
+                return;
-        parent::report($exception);
+            }
+            Integration::captureUnhandledException($e);
+        });
     }
 
     /**

app/Http/Controllers/Fo/EggController.php

@@ -27,7 +27,7 @@ class EggController extends Controller
         $month = $date[1];
 
         $moba = TraceaEgg::where('ede_code', '=', $code)
-            ->whereDate('dcr', Carbon::createFromDate(null, $month, $day)->toDate())
+            ->where('dcr', Carbon::createFromDate(null, $month, $day)->format('Y-m-d'))
             ->orderBy('box_code', 'DESC')->first();
 
         if (!$moba) {
@@ -49,7 +49,7 @@ class EggController extends Controller
         $mobas = TraceaEgg::where('box_code', $id)->orderBy('box_code', 'DESC')->first();
 
         if (!$mobas) {
-            return redirect('/search');
+            return redirect()->route('egg.search');
         }
 
         $edes = $mobas->code_edes;
@@ -84,8 +84,11 @@ class EggController extends Controller
 
         $inuavs = $eleveurs->pluck('inuavs')->flatten(1);
 
-        $mep = CafelEggMiseEnPlace::whereIn('inuav_code', $inuavs)
+        $mep = CafelEggMiseEnPlace::query();
-            ->where('transfert_date', '<', $datePonte)
+        collect($inuavs)->map(function ($inuav) use ($mep) {
+            $mep->where('inuav_codes', 'LIKE', "%{$inuav}%");
+        });
+        $mep = $mep->where('transfert_date', '<', $datePonte)
             ->orderBy('transfert_date', 'DESC')->first();
 
         if ($mep) {

app/Http/Controllers/Fo/TraceaPoultryController.php

@@ -3,8 +3,10 @@
 namespace App\Http\Controllers\Fo;
 
 use App\Http\Controllers\Controller;
+use App\Http\Requests\Fo\Ajax\GetDistributionRequest;
 use App\Http\Requests\Fo\SearchPoultryTraceaRequest;
 use App\Models\TraceaPoultry;
+use Illuminate\Http\JsonResponse;
 use Illuminate\Support\Carbon;
 use Illuminate\Support\Facades\File;
 use Illuminate\Support\Facades\Session;
@@ -68,14 +70,34 @@ class TraceaPoultryController extends Controller
             \redirect()->route('poultry.search')->throwResponse();
         }
 
-        $distributionPicture = $this->getDistributionPicture($traceaPoultry->sign);
+        // ! Test that breeder, food and mep are available
+        if (!$traceaPoultry->mep or !$traceaPoultry->food or !$traceaPoultry->breeder) {
+            return \view('front.poultry.unavailable');
+        }
 
         return view('front.poultry.show', compact(
-            'traceaPoultry',
+            'traceaPoultry'
-            'distributionPicture'
         ));
     }
 
+    /**
+     * Get Distribution Info
+     *
+     * @param \App\Http\Requests\Fo\Ajax\GetDistributionRequest $request
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function getDistribution(GetDistributionRequest $request): JsonResponse
+    {
+        /** @var \App\Models\TraceaPoultry */
+        $traceaPoultry = TraceaPoultry::where('order_num', $request->ordernum)
+            ->where('external_code_lot', $request->codelot)->firstOrFail();
+        return \response()->json([
+            'exp_date' => $traceaPoultry->exp_date,
+            'sign' => $traceaPoultry->sign,
+            'picture' => $this->getDistributionPicture($traceaPoultry->sign)
+        ]);
+    }
+
     /**
      * Get distribution sign picture name if exists.
      *

app/Http/Middleware/SecureHeaders.php

@@ -44,7 +44,7 @@ class SecureHeaders
             // phpcs:ignore Generic.Files.LineLength.TooLong
             "style-src 'self' $cssDev https://fonts.googleapis.com;",
             // phpcs:ignore Generic.Files.LineLength.TooLong
-            "script-src 'self' $jsDev https://fonts.googleapis.com;"
+            "script-src 'self' $jsDev https://fonts.googleapis.com https://www.googletagmanager.com;"
         ];
         $response->headers->set(
             'Content-Security-Policy',

app/Http/Middleware/TrustHosts.php

@@ -14,6 +14,7 @@ class TrustHosts extends Middleware
     public function hosts()
     {
         return [
+            \config('app.egg_domain'),
             $this->allSubdomainsOfApplicationUrl(),
         ];
     }

app/Http/Requests/Fo/Ajax/GetDistributionRequest.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace App\Http\Requests\Fo\Ajax;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class GetDistributionRequest extends FormRequest
+{
+    /**
+     * Determine if the user is authorized to make this request.
+     *
+     * @return boolean
+     */
+    public function authorize()
+    {
+        return true;
+    }
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array
+     */
+    public function rules()
+    {
+        return [
+            'codelot' => 'required|numeric|digits:10',
+            'ordernum' => 'required|numeric|digits:6',
+        ];
+    }
+}

app/Jobs/Arcadia/RemoveOldXmlEntries.php

@@ -23,7 +23,7 @@ class RemoveOldXmlEntries
         }
         try {
             $q = TraceaEgg::query();
-            $q->where('dcr', '<=', now()->subMonths(config('tracea.keepEggMonths', 12)))->destroy();
+            $q->where('dcr', '<=', now()->subMonths(config('tracea.keepEggMonths', 12)));
             $q->delete();
         } catch (\Exception $e) {
             report($e);

app/Jobs/Arcadia/XmlJobs.php

@@ -11,6 +11,7 @@ use Illuminate\Support\Facades\File;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Mail;
 use Illuminate\Support\Str;
+use Illuminate\Validation\ValidationException;
 
 abstract class XmlJobs extends XArcadiaFlux
 {
@@ -174,7 +175,25 @@ abstract class XmlJobs extends XArcadiaFlux
                     ),
                     LogType::critical()
                 );
-                $this->sendInvalidXmlEmail($filename, $e);
+                $this->sendInvalidXmlEmail(
+                    $filename,
+                    $e->getPrevious()->getMessage(),
+                    $e->getPrevious()
+                );
+                $this->moveToInvalid($filename);
+                continue;
+            } catch (ValidationException $e) {
+                $message = $e->getMessage();
+                $this->log(
+                    sprintf(
+                        'File %s could not be parsed => %s on line %d',
+                        $filename,
+                        $message,
+                        $e->getLine()
+                    ),
+                    LogType::critical()
+                );
+                $this->sendInvalidXmlEmail($filename, $e->getMessage(), $e);
                 $this->moveToInvalid($filename);
                 continue;
             } catch (AbortXmlImportException $e) {
@@ -187,6 +206,8 @@ abstract class XmlJobs extends XArcadiaFlux
                     ),
                     LogType::error()
                 );
+                $this->sendInvalidXmlEmail($filename, $e->getMessage(), $e);
+                $this->moveToInvalid($filename);
                 report($e);
                 continue;
                 // * ignore the file
@@ -365,12 +386,12 @@ abstract class XmlJobs extends XArcadiaFlux
      * Send invalid XML email
      *
      * @param string     $filename
+     * @param string     $message
      * @param \Throwable $e
      * @return void
      */
-    protected function sendInvalidXmlEmail(string $filename, \Throwable $e)
+    protected function sendInvalidXmlEmail(string $filename, string $message, \Throwable $e)
     {
-        $message = $e->getPrevious()->getMessage();
         Mail::send('mails.invalidxml', [
             'strError' => sprintf(
                 'File %s could not be parsed => %s on line %d',
@@ -379,7 +400,7 @@ abstract class XmlJobs extends XArcadiaFlux
                 $e->getLine()
             ),
             'filename' => $filename,
-            'exception' => $e->getPrevious()
+            'exception' => $e
         ], function ($m) {
             $m->to(
                 config('mail.contactsList.invalidXml'),

app/Jobs/CafelEggBreederJob.php

@@ -5,7 +5,9 @@ namespace App\Jobs;
 use App\Exceptions\CafelApiException;
 use App\Exceptions\CafelApiImageFetchException;
 use App\Lib\CafelApi\Models\CafelEggBreeder as ApiCafelEggBreeder;
+use App\Lib\ToolboxHelper;
 use App\Models\CafelEggBreeder;
+use Illuminate\Validation\ValidationException;
 
 class CafelEggBreederJob extends CafelJobs
 {
@@ -16,6 +18,16 @@ class CafelEggBreederJob extends CafelJobs
      */
     public function handle()
     {
+        // ! We have to remove all breeders to reimport them all in order to make sure
+        // ! to delete breeders that dont exists anymore (Api fetch constrain)
+        // ! vu avec Sylvain 27/10/2022
+        // * Destroy breeder one by one to trigger destroy event
+        /** @var \Illuminate\Database\Eloquent\Collection<\App\Models\CafelEggBreeder> */
+        $eggBreeders = CafelEggBreeder::all();
+        $eggBreeders->each(function (CafelEggBreeder $breeder) {
+            $breeder->deleteOrFail();
+        });
+
         $this->syncWithCafelApi(
             ApiCafelEggBreeder::class,
             'cafel.ldc.eleveursoeufs',
@@ -41,8 +53,23 @@ class CafelEggBreederJob extends CafelJobs
                     ) : null;
                 } catch (CafelApiImageFetchException | CafelApiException $e) {
                     report($e);
-                    $row['path_picture_1'] = null;
+                    $validationException = ValidationException::withMessages([
-                }
+                        'path_picture_1' => $e->getMessage()
+                    ]);
+
+                    ToolboxHelper::useReflectionToUpdateProperty(
+                        $validationException->validator,
+                        'data',
+                        ['path_picture_1' => $row['path_picture_1']]
+                    );
+                    ToolboxHelper::useReflectionToUpdateProperty(
+                        $validationException->validator,
+                        'failedRules',
+                        ['path_picture_1' => $e->getMessage()]
+                    );
+
+                    throw $validationException;
+                }//end try
                 try {
                     $row['path_picture_2'] = !empty($row['path_picture_2']) ?
                     ApiCafelEggBreeder::fetchPicture(
@@ -51,8 +78,23 @@ class CafelEggBreederJob extends CafelJobs
                     ) : null;
                 } catch (CafelApiImageFetchException | CafelApiException $e) {
                     report($e);
-                    $row['path_picture_2'] = null;
+                    $validationException = ValidationException::withMessages([
-                }
+                        'path_picture_2' => $e->getMessage()
+                    ]);
+
+                    ToolboxHelper::useReflectionToUpdateProperty(
+                        $validationException->validator,
+                        'data',
+                        ['path_picture_2' => $row['path_picture_2']]
+                    );
+                    ToolboxHelper::useReflectionToUpdateProperty(
+                        $validationException->validator,
+                        'failedRules',
+                        ['path_picture_2' => $e->getMessage()]
+                    );
+
+                    throw $validationException;
+                }//end try
 
                 foreach (['exploitation', 'aboutyou', 'vocation', 'likeinjob', 'loue_means'] as $fieldName) {
                     $row[$fieldName] = !empty($row[$fieldName]) ? $row[$fieldName] : null;

app/Jobs/CafelJobs.php

@@ -3,6 +3,8 @@
 namespace App\Jobs;
 
 use App\Lib\CafelApi\Models\CafelClientModel;
+use GuzzleHttp\Exception\ConnectException;
+use GuzzleHttp\Exception\RequestException;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
@@ -70,12 +72,26 @@ abstract class CafelJobs implements ShouldQueue
                 try {
                     $saveCallback($row);
                 } catch (ValidationException $e) {
+                    /** @var \Illuminate\Validation\Validator $validator */
+                    $validator = $e->validator;
+                    /** @var array<string,integer|string> */
+                    $failed              = $validator->invalid();
                     $this->invalidRows[] = collect($row)->put('validation_message', collect($e->errors())
-                        ->mapWithKeys(function (array $messages, string $attribute) {
+                        ->mapWithKeys(function (array $messages, string $attribute) use ($failed) {
-                            return [$attribute => collect($messages)->implode(', ')];
+                            $verifiedValue = '';
+                            if (array_key_exists($attribute, $failed)) {
+                                $verifiedValue = ' Valeur vérifiée : ' . \json_encode($failed[$attribute]);
+                            }
+                            return [
+                                $attribute => collect($messages)->implode(', ') . $verifiedValue
+                            ];
                         })->implode(' '))->all();
-                }
+                } catch (ConnectException | RequestException $e) {
-            }
+                    // ! Guzzle SSL Error connection failure
+                    \report($e);
+                    $this->invalidRows[] = collect($row)->put('validation_message', $e->getMessage())->all();
+                }//end try
+            }//end foreach
         } while (!empty($result));
     }
 

app/Jobs/CafelMepEggJob.php

@@ -23,6 +23,11 @@ class CafelMepEggJob extends CafelJobs
                 'dateFin' => now()->format('Y-m-d')
             ],
             function (array $row) {
+                // * Explode inuav
+                if (\array_key_exists('inuav_codes', $row)) {
+                    $row['inuav_codes'] = explode(',', $row['inuav_codes']);
+                }
+
                 // * Validate row data
                 CafelMepEgg::validateDataRow($row);
 

app/Jobs/CafelMepPoultryJob.php

@@ -0,0 +1,54 @@
+<?php
+
+namespace App\Jobs;
+
+use App\Lib\CafelApi\Models\CafelMepPoultry;
+use App\Models\CafelPoultryMiseEnPlace;
+
+class CafelMepPoultryJob extends CafelJobs
+{
+    /**
+     * Execute the job.
+     *
+     * @return void
+     */
+    public function handle()
+    {
+        $dateDebut = now()->subDays(config('cafel.mises_en_places_retain', 370));
+        $this->syncWithCafelApi(
+            CafelMepPoultry::class,
+            'cafel.ldc.mepvolailles',
+            [
+                'dateDebut' => $dateDebut->format('Y-m-d'),
+                'dateFin' => now()->format('Y-m-d')
+            ],
+            function (array $row) {
+                // * Explode inuav
+                if (\array_key_exists('inuav_codes', $row)) {
+                    $row['inuav_codes'] = explode(',', $row['inuav_codes']);
+                }
+
+                // * Validate row data
+                CafelMepPoultry::validateDataRow($row);
+
+                /** @var array Unique Key columns */
+                $uniqueColumnsKey = [];
+                foreach (CafelMepPoultry::UNIQUE_COLUMN_KEYS as $uField) {
+                    $uniqueColumnsKey[$uField] = $row[$uField];
+                }
+
+                forward_static_call_array(
+                    [CafelPoultryMiseEnPlace::class, 'updateOrCreate'],
+                    [$uniqueColumnsKey, $row]
+                );
+            }
+        );
+        $this->mailInvalidRows(CafelMepPoultry::UNIQUE_COLUMN_KEYS, CafelMepPoultry::class);
+
+        // * DeleteOld MEPs
+        // * Garder une interstice de X jours entre la suppression et ce qu'on récupère de CAFEL
+        CafelPoultryMiseEnPlace::whereDate('transfert_date', '<', $dateDebut->subDays(
+            config('cafel.mises_en_places_retain', 370)
+        ))->delete();
+    }
+}

app/Jobs/CafelPoultryBreederJob.php

@@ -5,7 +5,9 @@ namespace App\Jobs;
 use App\Exceptions\CafelApiException;
 use App\Exceptions\CafelApiImageFetchException;
 use App\Lib\CafelApi\Models\CafelPoultryBreeder as ApiCafelPoultryBreeder;
+use App\Lib\ToolboxHelper;
 use App\Models\CafelPoultryBreeder;
+use Illuminate\Validation\ValidationException;
 
 class CafelPoultryBreederJob extends CafelJobs
 {
@@ -16,6 +18,16 @@ class CafelPoultryBreederJob extends CafelJobs
      */
     public function handle()
     {
+        // ! We have to remove all breeders to reimport them all in order to make sure
+        // ! to delete breeders that dont exists anymore (Api fetch constrain)
+        // ! vu avec Sylvain 27/10/2022
+        // * Destroy breeder one by one to trigger destroy event
+        /** @var \Illuminate\Database\Eloquent\Collection<\App\Models\CafelEggBreeder> */
+        $poultryBreeders = CafelPoultryBreeder::all();
+        $poultryBreeders->each(function (CafelPoultryBreeder $breeder) {
+            $breeder->deleteOrFail();
+        });
+
         $this->syncWithCafelApi(
             ApiCafelPoultryBreeder::class,
             'cafel.ldc.eleveursvolailles',
@@ -41,8 +53,23 @@ class CafelPoultryBreederJob extends CafelJobs
                         ) : null;
                 } catch (CafelApiImageFetchException | CafelApiException $e) {
                     report($e);
-                    $row['path_picture_1'] = null;
+                    $validationException = ValidationException::withMessages([
-                }
+                        'path_picture_1' => $e->getMessage()
+                    ]);
+
+                    ToolboxHelper::useReflectionToUpdateProperty(
+                        $validationException->validator,
+                        'data',
+                        ['path_picture_1' => $row['path_picture_1']]
+                    );
+                    ToolboxHelper::useReflectionToUpdateProperty(
+                        $validationException->validator,
+                        'failedRules',
+                        ['path_picture_1' => $e->getMessage()]
+                    );
+
+                    throw $validationException;
+                }//end try
                 try {
                     $row['path_picture_2'] = !empty($row['path_picture_2']) ?
                         ApiCafelPoultryBreeder::fetchPicture(
@@ -51,8 +78,23 @@ class CafelPoultryBreederJob extends CafelJobs
                         ) : null;
                 } catch (CafelApiImageFetchException | CafelApiException $e) {
                     report($e);
-                    $row['path_picture_2'] = null;
+                    $validationException = ValidationException::withMessages([
-                }
+                        'path_picture_2' => $e->getMessage()
+                    ]);
+
+                    ToolboxHelper::useReflectionToUpdateProperty(
+                        $validationException->validator,
+                        'data',
+                        ['path_picture_2' => $row['path_picture_2']]
+                    );
+                    ToolboxHelper::useReflectionToUpdateProperty(
+                        $validationException->validator,
+                        'failedRules',
+                        ['path_picture_2' => $e->getMessage()]
+                    );
+
+                    throw $validationException;
+                }//end try
 
                 foreach (['issue_1', 'issue_2'] as $fieldName) {
                     $row[$fieldName] = !empty($row[$fieldName]) ? $row[$fieldName] : null;

app/Lib/CafelApi/Models/CafelBeaVol.php

@@ -25,7 +25,11 @@ abstract class CafelBeaVol extends CafelClientModel
         // Eg Score A .
         'bea_code' => 'required|string|min:2|max:10',
         // Eg 19377/0 .
-        'batch_code' => 'required|max:10|regex:/^[0-9A-Z]*\/\d$/',
+        'batch_code' => [
+            'required',
+            'max:10',
+            'regex:/^[0-9A-Z]+\/(?:\d|[A-Z])$/',
+        ],
         'last_audit_date' => 'required|date_format:Y-m-d'
     ];
 

app/Lib/CafelApi/Models/CafelClientModel.php

@@ -125,7 +125,7 @@ abstract class CafelClientModel implements \JsonSerializable
      * @return array
      * @throws \Illuminate\Validation\ValidationException If data does not validate.
      */
-    protected function validateData(array $data, array $rules): array
+    protected static function validateData(array $data, array $rules): array
     {
         return Validator::validate($data, $rules);
     }
@@ -228,15 +228,25 @@ abstract class CafelClientModel implements \JsonSerializable
         // * Filter Keys using intersection
         \extract(\array_intersect_key($response->body, ['Ext' => '', 'Name' => '', 'Data' => '']));
 
+        // * Create temp file and get its absolute path
+        if (!($tempFile = tmpfile())) {
+            new \RuntimeException('Could not create temp file');
+        }
 
-        return ToolboxHelper::storeImage(
+        $filePath = ToolboxHelper::storeImage(
             $folder,
             FileHelper::fromBase64(
+                $tempFile,
                 Str::lower($Name),
                 Str::lower($Ext),
                 $Data
             ),
             false
         );
+
+        // * Closing the file will cause to remove it from temp dir!
+        fclose($tempFile);
+
+        return $filePath;
     }
 }

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',

app/Lib/CafelApi/Models/CafelFood.php

@@ -28,7 +28,11 @@ abstract class CafelFood extends CafelClientModel
         // 1 Pondeuse ou 2 Poulet .
         'food_type' => ['required', [EnumIsValidRule::class, FoodType::class]],
         // Eg 19377/0 .
-        'batch_code' => 'required|max:10|regex:/^[0-9A-Z]*\/\d$/',
+        'batch_code' => [
+            'required',
+            'max:10',
+            'regex:/^[0-9A-Z]+\/(?:\d|[A-Z])$/',
+        ],
         'delivery_date' => 'required|date_format:Y-m-d'
     ];
 

app/Lib/CafelApi/Models/CafelMepEgg.php

@@ -22,10 +22,16 @@ abstract class CafelMepEgg extends CafelClientModel
      * @var array
      */
     protected static $validationRules = [
+        // Eg V072FXT (un seul ou plusieurs separe par une virgule).
+        'inuav_codes' => 'required|array',
         // Eg V072FXT (un seul par ligne).
-        'inuav_code' => 'required|string|regex:/^[A-Z]\d{3}[A-Z]{3}$/',
+        'inuav_codes.*' => 'required|string|regex:/^[A-Z]\d{3}[A-Z]{3}$/',
         // Eg 19377/0 .
-        'batch_code' => 'required|max:10|regex:/^[0-9A-Z]*\/\d$/',
+        'batch_code' => [
+            'required',
+            'max:10',
+            'regex:/^[0-9A-Z]+\/(?:\d|[A-Z])$/',
+        ],
         'transfert_date' => 'required|date_format:Y-m-d'
     ];
 
@@ -35,7 +41,7 @@ abstract class CafelMepEgg extends CafelClientModel
      * @var array
      */
     protected static $columnsTranslations = [
-        'Inuav_code' => 'inuav_code',
+        'Inuav_code' => 'inuav_codes',
         'Batch_code' => 'batch_code',
         'Transfert_date' => 'transfert_date'
     ];

app/Lib/CafelApi/Models/CafelMepPoultry.php

@@ -0,0 +1,48 @@
+<?php
+
+namespace App\Lib\CafelApi\Models;
+
+/**
+ * @author Jérémy Munsch <jeremy.munsch@ldc.fr>
+ */
+abstract class CafelMepPoultry extends CafelClientModel
+{
+    /**
+     * Unique columns key
+     *
+     * @var array
+     */
+    public const UNIQUE_COLUMN_KEYS = [
+        'batch_code'
+    ];
+
+    /**
+     * Validation rules from cafel Api
+     *
+     * @var array
+     */
+    protected static $validationRules = [
+        // Eg V072FXT (un seul ou plusieurs separe par une virgule).
+        'inuav_codes' => 'required|array',
+        // Eg V072FXT (un seul par ligne).
+        'inuav_codes.*' => 'required|string|regex:/^[A-Z]\d{3}[A-Z]{3}$/',
+        // Eg 19377/0 .
+        'batch_code' => [
+            'required',
+            'max:10',
+            'regex:/^[0-9A-Z]+\/(?:\d|[A-Z])$/',
+        ],
+        'transfert_date' => 'required|date_format:Y-m-d'
+    ];
+
+    /**
+     * Column translations
+     *
+     * @var array
+     */
+    protected static $columnsTranslations = [
+        'Inuav_code' => 'inuav_codes',
+        'Batch_code' => 'batch_code',
+        'Transfert_date' => 'transfert_date'
+    ];
+}

app/Lib/CafelApi/Transport/ApiInterface.php

@@ -105,7 +105,7 @@ class ApiInterface
      *
      * @param \App\Lib\CafelApi\Transport\Request $request
      * @return \App\Lib\CafelApi\Transport\Response
-     * @throws \App\Exceptions\CafelApiException If reponse status is KO.
+     * @throws \App\Exceptions\CafelApiException If reponse status is KO or not Json.
      */
     public function call(Request $request): Response
     {
@@ -122,8 +122,9 @@ class ApiInterface
     /**
      * Process request
      *
-     * @param Request $request
+     * @param \App\Lib\CafelApi\Transport\Request $request
-     * @return Response
+     * @return \App\Lib\CafelApi\Transport\Response
+     * @throws \App\Exceptions\CafelApiException If HTTP response body in not JSON.
      */
     private function processRequest(Request $request): Response
     {
@@ -136,13 +137,13 @@ class ApiInterface
         $status   = in_array($response->getStatusCode(), [200, 201]) ?
             ApiStatus::OK() : ApiStatus::KO();
 
-        return new Response($status, $response);
+        return new Response($status, $response, $request);
     }
 
     /**
      * Add spécific headers to the request
      *
-     * @param Request $request
+     * @param \App\Lib\CafelApi\Transport\Request $request
      * @return void
      */
     private function setHeaders(Request &$request): void

app/Lib/CafelApi/Transport/Response.php

@@ -56,9 +56,10 @@ class Response
      *
      * @param \App\Enums\ApiStatus                $status
      * @param \Psr\Http\Message\ResponseInterface $response
+     * @param \App\Lib\CafelApi\Transport\Request $request
      * @throws \App\Exceptions\CafelApiException If HTTP response body in not JSON.
      */
-    public function __construct(ApiStatus $status, ResponseInterface $response)
+    public function __construct(ApiStatus $status, ResponseInterface $response, Request $request)
     {
         $this->response = $response;
         $this->status   = $status;
@@ -74,9 +75,18 @@ class Response
         // * Body should be json data.
         if (($decodedJson = $this->tryDecodeJson($this->body->getContents())) === false) {
             if (in_array(config('app.env'), ['testing', 'local'])) {
-                dump((string)$this->body);
+                dump(
+                    'should have been json',
+                    $this->httpCode,
+                    $this->status,
+                    $this->headers,
+                    $request->uri,
+                    (string)$this->body
+                );
             }
-            throw new CafelApiException('The Api should have returned JSON data');
+            throw new CafelApiException(
+                "The Api should have returned JSON data '{$request->uri}'"
+            );
         }
         $this->body = $decodedJson;
 

app/Lib/ExceptionsHelper.php

@@ -0,0 +1,190 @@
+<?php
+
+namespace App\Lib;
+
+class ExceptionsHelper
+{
+    /**
+     * Handle sentry event
+     *
+     * @param \Sentry\Event $event
+     * @return null|\Sentry\Event
+     */
+    public static function sentryEventHandler(\Sentry\Event $event): ?\Sentry\Event
+    {
+        // Remove unwanted reports.
+        $event->setModules([]);
+        $event->setOsContext(null);
+
+        /** @var \Sentry\ExceptionDataBag[] */
+        $exceptionBag = [];
+        foreach ($event->getExceptions() as $exceptionDataBag) {
+            $exceptionBag[] = self::getAnonymizedSentryException($exceptionDataBag);
+        }
+        $event->setExceptions($exceptionBag);
+        return $event;
+    }
+
+    /**
+     * Anonimize Sentry Exception bag
+     *
+     * @param \Sentry\ExceptionDataBag $exceptionDataBag
+     * @return \Sentry\ExceptionDataBag
+     */
+    private static function getAnonymizedSentryException(
+        \Sentry\ExceptionDataBag $exceptionDataBag
+    ): \Sentry\ExceptionDataBag {
+        $exceptionDataBag->setValue(self::getAnonymizedMessage($exceptionDataBag->getValue()));
+        if ($stackTrace = $exceptionDataBag->getStacktrace()) {
+            $exceptionDataBag->setStacktrace(self::getAnonymizedSentryStackTrace($stackTrace));
+        }
+        return $exceptionDataBag;
+    }
+
+    /**
+     * Anonymise sentry stacktrace
+     *
+     * @param \Sentry\Stacktrace $stackTrace
+     * @return \Sentry\Stacktrace
+     */
+    private static function getAnonymizedSentryStackTrace(\Sentry\Stacktrace $stackTrace): \Sentry\Stacktrace
+    {
+        /** @var \Sentry\Frame[] */
+        $frames = \array_reverse($stackTrace->getFrames(), true);
+        $i      = \count($frames) - 1;
+        // * Remove all but keep first (index.php).
+        while ($i-- > 0) {
+            $stackTrace->removeFrame(count($stackTrace->getFrames()) - 1);
+        }
+        foreach ($frames as $index => $frame) {
+            $frame->setPostContext([]);
+            $frame->setPreContext([]);
+            $frame->setContextLine('');
+            $frame->setVars(self::getAnonymizedSentryParams($frame->getVars()));
+            $stackTrace->addFrame($frame);
+            if ($index === 0) {
+                $stackTrace->removeFrame(count($stackTrace->getFrames()) - 1);
+            }
+        }
+        return $stackTrace;
+    }
+
+    /**
+     * Get anonymized sentry params
+     *
+     * @param mixed[] $params
+     * @return string[]
+     */
+    private static function getAnonymizedSentryParams(array $params): array
+    {
+        foreach ($params as &$param) {
+            $type = \strtolower(\gettype($param));
+            if (\is_string($param)) {
+                $type = \explode(' ', \trim($param))[0] ?? null;
+            }
+            switch ($type) {
+                case 'Lambda':
+                case 'Object':
+                    continue 2;
+                case 'array':
+                    $param = sprintf('Array(%d)', \count($param));
+                    continue 2;
+                default:
+                    if (\is_numeric($param)) {
+                        $param = \ucfirst($type);
+                        continue 2;
+                    }
+                    if (\is_string($param)) {
+                        $param = sprintf('String(%d)', \strlen($param));
+                        continue 2;
+                    }
+            } //end switch
+        } //end foreach
+        return $params;
+    }
+
+
+    /**
+     * Anonymize at least Sql queries
+     *
+     * @param string $message
+     * @return string
+     */
+    public static function getAnonymizedMessage(string $message): string
+    {
+        $message = \preg_replace('/^(.*)( \(SQL:.*\))$/', '$1', $message) ?? $message;
+        if ($sqlPos = \strpos($message, 'to use near')) {
+            $message = \mb_strcut($message, 0, $sqlPos);
+        }
+        return $message;
+    }
+
+    /**
+     * Anonymize stack trace
+     *
+     * @param \Throwable $e
+     * @return string
+     */
+    public static function getAnonymizedStackTrace(\Throwable $e): string
+    {
+        $projectPath   = \realpath(\sprintf('%s/../', \app_path()));
+        $traceStack    = $e->getTrace();
+        $traceStr      = '';
+        $maxStackStage = 0;
+        foreach ($traceStack as $stackStage => $stack) {
+            $maxStackStage = $stackStage;
+            $traceStr     .= \sprintf(
+                '#%s %s(%d): ',
+                $stackStage,
+                str_replace($projectPath, '', $stack['file'] ?? ''),
+                $stack['line'] ?? ''
+            );
+            if (isset($stack['class'])) {
+                $traceStr .= "{$stack['class']}->{$stack['function']}(";
+                if (isset($stack['args'])) {
+                    $traceStr .= self::handleArgs($stack);
+                }
+                $traceStr .= ")\n";
+            } elseif (isset($stack['function'])) {
+                $traceStr .= "{$stack['function']}(";
+                if (isset($stack['args'])) {
+                    $traceStr .= self::handleArgs($stack);
+                }
+                $traceStr .= ")\n";
+            }
+        } //end foreach
+        $maxStackStage++;
+        $traceStr .= "#$maxStackStage {main}";
+        return $traceStr;
+    }
+
+    /**
+     * Handle Args
+     *
+     * @param array $stack
+     * @return string
+     */
+    public static function handleArgs(array $stack): string
+    {
+        $traceArgs = '';
+        $argsCount = count($stack['args']);
+        for ($i = 0; $i < $argsCount; $i++) {
+            $type = \gettype($stack['args'][$i]);
+            switch ($type) {
+                case 'object':
+                    $traceArgs .= sprintf('Object(%s)', \get_class($stack['args'][$i]));
+                    break;
+                case 'array':
+                    $traceArgs .= sprintf('Array(%d)', \count($stack['args'][$i]));
+                    break;
+                case 'string':
+                    $traceArgs .= sprintf('String(%d)', \strlen($stack['args'][$i]));
+                    break;
+                default:
+                    $traceArgs .= \gettype($stack['args'][$i]);
+            }
+            $traceArgs .= ($i !== ($argsCount - 1) ? ',' : '');
+        }
+        return $traceArgs;
+    }
+}

app/Lib/FileHelper.php

@@ -51,21 +51,18 @@ class FileHelper
     }
 
     /**
-     * Generate from blob
+     * Generate from base64 blob
      *
-     * @param string $fileName
+     * @param resource $tempFile     A temp file where to store data.
-     * @param string $extension
+     * @param string   $fileName     The target filename.
-     * @param string $base64String
+     * @param string   $extension    The file extension to use.
+     * @param string   $base64String The base64 encode picture.
      * @return SplFileInfo
      * @throws \ErrorException If writing to temp file failed.
      * @throws \App\Exceptions\CafelApiImageFetchException If invalid image was given or ext could not be confirmed.
      */
-    public static function fromBase64(string $fileName, string $extension, string $base64String): SplFileInfo
+    public static function fromBase64($tempFile, string $fileName, string $extension, string $base64String): SplFileInfo
     {
-        // * Create temp file and get its absolute path
-        if (!($tempFile = tmpfile())) {
-            new \ErrorException('Could not create temp file');
-        }
         $tempFilePath = stream_get_meta_data($tempFile)['uri'];
 
         if (!($blob = \base64_decode($base64String, true))) {
@@ -93,12 +90,6 @@ class FileHelper
             throw new \ErrorException('Could not write on temp file');
         }
 
-        // Close this file after response is sent.
-        // Closing the file will cause to remove it from temp director!
-        app()->terminating(function () use ($tempFile) {
-            fclose($tempFile);
-        });
-
         return new SplFileInfo(\storage_path("tmp/$filePath.$extension"));
     }
 }

app/Lib/ToolboxHelper.php

@@ -12,6 +12,23 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 abstract class ToolboxHelper
 {
+    /**
+     * Update any prop using reflexion
+     *
+     * @param object $object
+     * @param string $property
+     * @param mixed  $value
+     * @return void
+     * @throws \ReflectionException If the class or property does not exist.
+     */
+    public static function useReflectionToUpdateProperty(object &$object, string $property, $value)
+    {
+        $refProperty = new \ReflectionProperty(\get_class($object), $property);
+        $refProperty->setAccessible(true);
+        $refProperty->setValue($object, $value);
+        $refProperty->setAccessible(false);
+    }
+
     /**
      * Store an image of different types
      *

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;
 
@@ -97,7 +99,8 @@ class CafelEggBreeder extends Model
     {
         // * EVENT CLOSURES.
         static::creating(function (self $model) {
-            return self::areInuavCodesUniques($model);
+            self::areInuavCodesUniques($model);
+            self::isEdeCodeUnique($model);
         });
         static::updating(function (self $model) {
             if ($model->getRawOriginal('path_picture_1') !== $model->path_picture_1) {
@@ -106,7 +109,16 @@ class CafelEggBreeder extends Model
             if ($model->getRawOriginal('path_picture_2') !== $model->path_picture_2) {
                 Storage::delete(\public_path($model->getRawOriginal('path_picture_2')));
             }
-            return self::areInuavCodesUniques($model);
+            self::areInuavCodesUniques($model);
+            self::isEdeCodeUnique($model);
+        });
+        static::deleting(function (self $model) {
+            if ($model->getRawOriginal('path_picture_1')) {
+                Storage::delete(\public_path($model->getRawOriginal('path_picture_1')));
+            }
+            if ($model->getRawOriginal('path_picture_2')) {
+                Storage::delete(\public_path($model->getRawOriginal('path_picture_2')));
+            }
         });
     }
 
@@ -137,26 +149,44 @@ 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) {
+        $q->where(function ($q) use ($breeder) {
-            foreach ($eleveur->inuavs as $inuav) {
+            foreach ($breeder->inuavs as $inuav) {
-                $q->orWhere('inuavs', 'LIKE', "%$inuav%");
+                $q->orWhere('inuavs', '=', $inuav);
             }
         });
-        if ($eleveur->cafel_code) {
+        if ($breeder->cafel_code) {
-            $q->where('cafel_code', '!=', $eleveur->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;
     }
+
+    /**
+     * 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;
+    }
 }

app/Models/CafelEggMiseEnPlace.php

@@ -33,7 +33,8 @@ class CafelEggMiseEnPlace extends Model
      * @var array
      */
     protected $casts = [
-        'transfert_date' => 'date'
+        'transfert_date' => 'date',
+        'inuav_codes' => 'array'
     ];
 
     /**
@@ -43,7 +44,7 @@ class CafelEggMiseEnPlace extends Model
      */
     protected $fillable = [
         'batch_code',
-        'inuav_code',
+        'inuav_codes',
         'transfert_date'
     ];
 }

app/Models/CafelPoultryBreeder.php

@@ -94,6 +94,14 @@ class CafelPoultryBreeder extends Model
             }
             return self::areInuavCodesUniques($model);
         });
+        static::deleting(function (self $model) {
+            if ($model->getRawOriginal('path_picture_1')) {
+                Storage::delete(\public_path($model->getRawOriginal('path_picture_1')));
+            }
+            if ($model->getRawOriginal('path_picture_2')) {
+                Storage::delete(\public_path($model->getRawOriginal('path_picture_2')));
+            }
+        });
     }
 
     // * METHODS
@@ -119,7 +127,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;

app/Models/CafelPoultryMiseEnPlace.php

@@ -0,0 +1,70 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Facades\Cache;
+
+class CafelPoultryMiseEnPlace extends Model
+{
+    /**
+     * The primary key for the model.
+     *
+     * @var string
+     */
+    protected $primaryKey = 'batch_code';
+
+    /**
+     * Indicates if the IDs are auto-incrementing.
+     *
+     * @var boolean
+     */
+    public $incrementing = false;
+
+    /**
+     * Indicates if the model should be timestamped.
+     *
+     * @var boolean
+     */
+    public $timestamps = false;
+
+    /**
+     * The attributes that should be cast.
+     *
+     * @var array
+     */
+    protected $casts = [
+        'transfert_date' => 'date',
+        'inuav_codes' => 'array'
+    ];
+
+    /**
+     * The attributes that are mass assignable.
+     *
+     * @var array
+     */
+    protected $fillable = [
+        'batch_code',
+        'inuav_codes',
+        'transfert_date'
+    ];
+
+    // * METHODS
+
+    /**
+     * Get Mep using cafel lot code
+     *
+     * @param integer $codeLotCafel
+     * @return self|null
+     */
+    public static function whereCodeLotCafel(int $codeLotCafel): ?self
+    {
+        return Cache::remember("poultryMep$codeLotCafel", 5, function () use ($codeLotCafel) {
+            return self::where(
+                'batch_code',
+                'LIKE',
+                '%' . \filter_var($codeLotCafel, \FILTER_SANITIZE_STRING) . '/%'
+            )->first();
+        });
+    }
+}

app/Models/PoultryPackshot.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+
+class PoultryPackshot extends Model
+{
+    use HasFactory;
+}

app/Models/TraceaPoultry.php

@@ -8,6 +8,7 @@ use App\Traits\HasCompositePrimaryKey;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Str;
+use Illuminate\Validation\ValidationException;
 
 class TraceaPoultry extends Model
 {
@@ -70,6 +71,22 @@ class TraceaPoultry extends Model
         'prep_date' => 'date'
     ];
 
+    /**
+     * Perform any actions required after the model boots.
+     *
+     * @return void
+     */
+    protected static function booted()
+    {
+        // * EVENT CLOSURES.
+        static::creating(function (self $model) {
+            self::hasAtLeastOneBarCode($model);
+        });
+        static::updating(function (self $model) {
+            self::hasAtLeastOneBarCode($model);
+        });
+    }
+
     // * METHODS
 
     /**
@@ -81,10 +98,10 @@ class TraceaPoultry extends Model
     {
         $family = Str::upper($this->getAttributeFromArray('family'));
         switch (true) {
-            case \strpos($family, 'LABEL') !== false:
+            case \strpos($family, 'LOUE') !== false:
                 return PoultryLabelType::labelRouge();
             case \strpos($family, 'BIO') !== false:
-                return PoultryLabelType::labelRouge();
+                return PoultryLabelType::bio();
             default:
                 return PoultryLabelType::unkown();
         }
@@ -98,6 +115,7 @@ class TraceaPoultry extends Model
     public function getBreederAttribute(): ?CafelPoultryBreeder
     {
         $matches = [];
+
         preg_match('/(?P<inuav>V\d{3}[A-Z]{3})/', \strval($this->breeder_code), $matches);
         if (!\array_key_exists('inuav', $matches)) {
             return collect();
@@ -153,4 +171,53 @@ class TraceaPoultry extends Model
         // * On utilise code lot_opa vue que son explication de merde est inversée ... Uu
         return CafelFood::whereCodeLotCafel(FoodType::chicken(), \intval($this->opa_lot));
     }
+
+    /**
+     * * Get Bea
+     *
+     * L'explication du batch code est un non sens.... putin de merde
+     *
+     * Comment faisons-nous pour lier notre lot à une note BEA ?
+     *   (code lot sous ce format : XXXXX/0 pour les données BEA) -> Code lot CAFEL / Code OPA
+     * Comment faisons-nous pour lier notre lot à son alimentation ?
+     *   (code lot sous ce format : XXXXX/0 pour les données alimentation) -> Code lot CAFEL / Code OPA
+     * Pour ces questions, peux-tu nous dire avec les informations que nous recevons du flux Sablé
+     * les règles que nous devons utiliser stp ? *   -> @Mathilde Hervier peux-tu répondre à cette question ?
+     *    Le 6e champ reçu dans le fichier xml est le code lot OPA qui sert donc à faire le lien avec la CAFEL
+     *
+     * @return \App\Models\CafelPoultryMiseEnPlace|null
+     */
+    public function getMepAttribute(): ?CafelPoultryMiseEnPlace
+    {
+        // * On utilise code lot_opa vue que son explication de merde est inversée ... Uu
+        return CafelPoultryMiseEnPlace::whereCodeLotCafel(\intval($this->opa_lot));
+    }
+
+    /**
+     * Assert has at least one barcode
+     *
+     * @param self $tracea
+     * @return boolean
+     * @throws \Illuminate\Validation\ValidationException If inuav code is already used.
+     */
+    protected static function hasAtLeastOneBarCode(self $tracea): bool
+    {
+        if (empty($tracea->barcode_price) and empty($tracea->barcode_weight)) {
+            throw ValidationException::withMessages([
+                'barcode_price' => "Il faut au moins un code barre pour faire la recherche '{$tracea->barcode_price}'",
+                'barcode_weight' => "Il faut au moins un code barre pour faire la recherche '{$tracea->barcode_weight}'"
+            ]);
+        }
+        return true;
+    }
+
+    /**
+     * Get Packshot
+     *
+     * @return \App\Models\PoultryPackshot|null
+     */
+    public function getPackshotAttribute(): ?PoultryPackshot
+    {
+        return PoultryPackshot::whereItemCode($this->item_code)->first();
+    }
 }

app/Providers/ViewServiceProvider.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace App\Providers;
+
+use Carbon\Carbon;
+use Illuminate\Support\Facades\View;
+use Illuminate\Support\ServiceProvider;
+
+class ViewServiceProvider extends ServiceProvider
+{
+    /**
+     * Bootstrap any application services.
+     *
+     * @return void
+     */
+    public function boot(): void
+    {
+        if (!app()->runningInConsole()) {
+            View::share('isDisplayedTAModal', (function () {
+                $now = now();
+                return $now->greaterThanOrEqualTo(new Carbon(config('modal.terreActionStartDate'))) &&
+                    $now->lessThanOrEqualTo(new Carbon(config('modal.terreActionEndDate')));
+            })());
+        }
+    }
+}

auth.json

@@ -1,5 +0,0 @@
-{
-    "gitlab-token": {
-        "gitlab.com": "glpat-gbNVMUd6T2kaB5eii7TZ"
-    }
-}

composer.json

@@ -17,16 +17,16 @@
         "fideloper/proxy": "^4.0",
         "guzzlehttp/guzzle": "^7.4",
         "kwaadpepper/enum": "^2.1",
-        "kwaadpepper/exception-handler": "^0.0.6",
         "kwaadpepper/refresh-sitemap": "^1.0",
         "laravel/framework": "^8.0",
         "laravel/tinker": "^2.0",
         "laravel/ui": "^3.0",
         "laravelcollective/html": "^6.0",
-        "ldc/web-admin-secure-laravel": "1.0.1",
+        "ldc/web-admin-secure-laravel": "^1.0",
         "ldc/web-status-checker-laravel": "^1.0",
         "mews/purifier": "^3.3",
         "nesbot/carbon": "^2.29",
+        "sentry/sentry-laravel": "^3.1",
         "spatie/laravel-mix-preload": "^1.3"
     },
     "require-dev": {
@@ -45,7 +45,10 @@
         "sort-packages": true,
         "allow-plugins": {
             "dealerdirect/phpcodesniffer-composer-installer": true
-        }
+        },
+        "gitlab-domains": [
+            "lab.s-web.fr"
+        ]
     },
     "extra": {
         "laravel": {
@@ -79,9 +82,9 @@
         ]
     },
     "repositories": {
-        "gitlab.com/16669037": {
+        "lab.s-web.fr": {
             "type": "composer",
-            "url": "https://gitlab.com/api/v4/group/16669037/-/packages/composer/packages.json"
+            "url": "https://lab.s-web.fr/api/v4/group/23/-/packages/composer/packages.json"
         }
     }
 }

config/app.php

@@ -53,6 +53,8 @@ return [
     */
 
     'url' => env('APP_URL', 'http://localhost'),
+    'domain' => env('APP_DOMAIN', 'tracabilite.loue.fr'),
+    'egg_domain' => env('APP_EGG_DOMAIN', 'bo.gt'),
 
     'asset_url' => env('ASSET_URL', null),
 
@@ -175,6 +177,7 @@ return [
         App\Providers\AuthServiceProvider::class,
         App\Providers\EventServiceProvider::class,
         App\Providers\RouteServiceProvider::class,
+        App\Providers\ViewServiceProvider::class,
 
     ],
 
@@ -234,7 +237,4 @@ return [
         'CafelPoultryBreeder' => \App\Models\CafelPoultryBreeder::class,
 
     ],
-
-    'project_uuid' => env('PROJECT_UUID'),
-
 ];

config/cafel.php

@@ -1,8 +1,9 @@
 <?php
 
 return [
+    // ! Food et MEp sont requis pour afficher un resultat traca volaille
     // * How many days should we retain Aliment
-    'food_retain' => 30,
+    'food_retain' => 370,
     // * How many days should we retain MEP (egg)
     'mises_en_places_retain' => 370,
     'client_version' => '1.0',
@@ -51,6 +52,12 @@ return [
             'methods' => [
                 'GET'
             ]
+        ],
+        'cafel.ldc.mepvolailles' => [
+            'uri' => 'api/ldc/mepvolailles',
+            'methods' => [
+                'GET'
+            ]
         ]
     ]
 ];

config/exception-handler.php

@@ -1,15 +0,0 @@
-<?php
-
-return [
-    /**
-     * Send mail when app debug is turn off
-     * so you can be warned if an unhandled exception occurs
-     */
-    'enableMaiLog' => !config('app.debug'),
-
-    /**
-     * Put a developper secured mailbox in here
-     * so you can receive email if things go mad
-     */
-    'contactsList' => explode(',', env('MAIL_LIST_SERVICEWEB', 'equipe.web@ldc.fr')),
-];

config/mail.php

@@ -62,9 +62,12 @@ return [
 
     // * Contacts List
     'contactsList' => [
-        'invalidXml' => explode(',', env('MAIL_INVALID_XML', 'equipe.web@ldc.fr')),
+        'invalidXml' => preg_split('/(\s*,*\s*)*,+(\s*,*\s*)*/', env('MAIL_INVALID_XML', 'equipe.web@ldc.fr')),
-        'invalidCafel' => explode(',', env('MAIL_INVALID_CAFEL_DATA', 'equipe.web@ldc.fr')),
+        'invalidCafel' => preg_split('/(\s*,*\s*)*,+(\s*,*\s*)*/', env('MAIL_INVALID_CAFEL_DATA', 'equipe.web@ldc.fr')),
-        'invalidCafelImage' => explode(',', env('MAIL_INVALID_CAFEL_DATA_IMAGE', 'equipe.web@ldc.fr')),
+        'invalidCafelImage' => preg_split('/(\s*,*\s*)*,+(\s*,*\s*)*/', env(
+            'MAIL_INVALID_CAFEL_DATA_IMAGE',
+            'equipe.web@ldc.fr'
+        )),
     ],
 
     /*

config/modal.php

@@ -0,0 +1,6 @@
+<?php
+
+return [
+    'terreActionStartDate' => env('TERRE_ACTION_START_DATE'),
+    'terreActionEndDate' => env('TERRE_ACTION_END_DATE')
+];

config/sentry.php

@@ -0,0 +1,62 @@
+<?php
+
+return [
+
+    'dsn' => env('SENTRY_LARAVEL_DSN', env('SENTRY_DSN')),
+
+    // The release version of your application
+    // Example with dynamic git hash: trim(exec('git --git-dir ' . base_path('.git') . ' log --pretty="%h" -n1 HEAD')).
+    'release' => env('SENTRY_RELEASE'),
+
+    // When left empty or `null` the Laravel environment will be used.
+    'environment' => env('SENTRY_ENVIRONMENT'),
+
+    'breadcrumbs' => [
+        // Capture Laravel logs in breadcrumbs.
+        'logs' => true,
+
+        // Capture SQL queries in breadcrumbs.
+        'sql_queries' => true,
+
+        // Capture bindings on SQL queries logged in breadcrumbs.
+        'sql_bindings' => true,
+
+        // Capture queue job information in breadcrumbs.
+        'queue_info' => true,
+
+        // Capture command information in breadcrumbs.
+        'command_info' => true,
+    ],
+
+    'tracing' => [
+        // Trace queue jobs as their own transactions.
+        'queue_job_transactions' => env('SENTRY_TRACE_QUEUE_ENABLED', false),
+
+        // Capture queue jobs as spans when executed on the sync driver.
+        'queue_jobs' => true,
+
+        // Capture SQL queries as spans.
+        'sql_queries' => true,
+
+        // Try to find out where the SQL query originated from and add it to the query spans.
+        'sql_origin' => true,
+
+        // Capture views as spans.
+        'views' => true,
+
+        // Indicates if the tracing integrations supplied by Sentry should be loaded.
+        'default_integrations' => true,
+
+        // Indicates that requests without a matching route should be traced.
+        'missing_routes' => false,
+    ],
+
+    // @see: https://docs.sentry.io/platforms/php/guides/laravel/configuration/options/#send-default-pii
+    'send_default_pii' => env('SENTRY_SEND_DEFAULT_PII', false),
+
+    // @see: https://docs.sentry.io/platforms/php/guides/laravel/configuration/options/#traces-sample-rate
+    'traces_sample_rate' => env('SENTRY_TRACES_SAMPLE_RATE') === null ? null : (float)env('SENTRY_TRACES_SAMPLE_RATE'),
+
+    'before_send' => [\App\Lib\ExceptionsHelper::class, 'sentryEventHandler'],
+
+];

database/migrations/2022_09_30_154855_create_cafel_poultry_mise_en_places_table.php

@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateCafelPoultryMiseEnPlacesTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('cafel_poultry_mise_en_places', function (Blueprint $table) {
+            $table->string('batch_code', 10)->unique();
+            $table->string('inuav_code', 100);
+            $table->date('transfert_date');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('cafel_poultry_mise_en_places');
+    }
+}

database/migrations/2022_10_21_111840_add_indexes_on_traca_egg.php

@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddIndexesOnTracaEgg extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('tracea_eggs', function (Blueprint $table) {
+            $table->index(['ede_code']);
+            $table->index(['dcr']);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('tracea_eggs', function (Blueprint $table) {
+            $table->dropIndex(['ede_code']);
+            $table->dropIndex(['dcr']);
+        });
+    }
+}

database/migrations/2022_10_27_152412_add_unique_on_ede_egg_breeders.php

@@ -0,0 +1,42 @@
+<?php
+
+use App\Models\CafelEggBreeder;
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Facades\Schema;
+
+class AddUniqueOnEdeEggBreeders extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        // * Destroy breeder one by one to trigger destroy event
+        /** @var \Illuminate\Database\Eloquent\Collection<\App\Models\CafelEggBreeder> */
+        $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']);
+        });
+    }
+}

database/migrations/2022_10_27_171315_make_mises_en_place_handle_multiple_inuav.php

@@ -0,0 +1,81 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Schema;
+
+class MakeMisesEnPlaceHandleMultipleInuav extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('cafel_egg_mise_en_places', function (Blueprint $table) {
+            $table->renameColumn('inuav_code', 'inuav_codes');
+        });
+        Schema::table('cafel_poultry_mise_en_places', function (Blueprint $table) {
+            $table->renameColumn('inuav_code', 'inuav_codes');
+        });
+        Schema::table('cafel_egg_mise_en_places', function (Blueprint $table) {
+            $table->string('inuav_codes', 400)->change();
+        });
+        Schema::table('cafel_poultry_mise_en_places', function (Blueprint $table) {
+            $table->string('inuav_codes', 400)->change();
+        });
+        DB::table('cafel_egg_mise_en_places')->get()
+            ->each(function (object $eggMep) {
+                DB::table('cafel_egg_mise_en_places')
+                    ->where('batch_code', $eggMep->batch_code)
+                    ->update(['inuav_codes' => collect(
+                        explode(',', $eggMep->inuav_codes)
+                    )->filter()->jsonSerialize()]);
+            });
+        DB::table('cafel_poultry_mise_en_places')->get()
+            ->each(function (object $poultryMep) {
+                DB::table('cafel_poultry_mise_en_places')
+                    ->where('batch_code', $poultryMep->batch_code)
+                    ->update(['inuav_codes' => collect(
+                        explode(',', $poultryMep->inuav_codes)
+                    )->filter()->jsonSerialize()]);
+            });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        DB::table('cafel_egg_mise_en_places')->get()
+            ->each(function (object $eggMep) {
+                DB::table('cafel_egg_mise_en_places')
+                    ->where('batch_code', $eggMep->batch_code)
+                    ->update(['inuav_codes' => collect(json_decode($eggMep->inuav_codes))->filter()
+                        ->first()]);
+            });
+        DB::table('cafel_poultry_mise_en_places')->get()
+            ->each(function (object $poultryMep) {
+                DB::table('cafel_poultry_mise_en_places')
+                    ->where('batch_code', $poultryMep->batch_code)
+                    ->update(['inuav_codes' => collect(json_decode($poultryMep->inuav_codes))->filter()
+                        ->first()]);
+            });
+        Schema::table('cafel_egg_mise_en_places', function (Blueprint $table) {
+            $table->string('inuav_codes', 100)->change();
+        });
+        Schema::table('cafel_poultry_mise_en_places', function (Blueprint $table) {
+            $table->string('inuav_codes', 100)->change();
+        });
+        Schema::table('cafel_egg_mise_en_places', function (Blueprint $table) {
+            $table->renameColumn('inuav_codes', 'inuav_code');
+        });
+        Schema::table('cafel_poultry_mise_en_places', function (Blueprint $table) {
+            $table->renameColumn('inuav_codes', 'inuav_code');
+        });
+    }
+}

database/migrations/2022_11_23_151056_create_poultry_packshots_table.php

@@ -0,0 +1,33 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreatePoultryPackshotsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('poultry_packshots', function (Blueprint $table) {
+            $table->id();
+            $table->string('item_code', 14)->comment("Item Code = tracea_poultries.item_code");
+            $table->string('ean', 13)->comment("Ean 13");
+            $table->string('packshot_name')->comment("Packshot picture name");
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('poultry_packshots');
+    }
+}

database/seeders/DatabaseSeeder.php

@@ -13,5 +13,6 @@ class DatabaseSeeder extends Seeder
      */
     public function run()
     {
+        $this->call(PoultryPackshotsTableSeeder::class);
     }
 }

package.json

@@ -25,10 +25,8 @@
         "resolve-url-loader": "^5.0.0",
         "sass": "1.32.13",
         "sass-loader": "^8.0.2",
+        "sweetalert2": "^11.4.35",
         "vue": "^2.6.14",
         "vue-template-compiler": "^2.6.14"
-    },
-    "dependencies": {
-        "sweetalert2": "^11.4.20"
     }
 }