Improve xml reports

This commit is contained in:
Jérémy Munsch 2022-10-28 15:15:09 +02:00
parent 5c618533a2
commit c3a1a38cfe
No known key found for this signature in database
GPG key ID: 18361AF3BFEC0FEC
5 changed files with 70 additions and 7 deletions

View file

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

View file

@ -52,6 +52,7 @@ class CafelEggBreederJob extends CafelJobs
$row['path_picture_1']
) : null;
} catch (CafelApiImageFetchException | CafelApiException $e) {
report($e);
$validationException = ValidationException::withMessages([
'path_picture_1' => $e->getMessage()
]);
@ -76,6 +77,7 @@ class CafelEggBreederJob extends CafelJobs
$row['path_picture_2']
) : null;
} catch (CafelApiImageFetchException | CafelApiException $e) {
report($e);
$validationException = ValidationException::withMessages([
'path_picture_2' => $e->getMessage()
]);

View file

@ -52,6 +52,7 @@ class CafelPoultryBreederJob extends CafelJobs
$row['path_picture_1']
) : null;
} catch (CafelApiImageFetchException | CafelApiException $e) {
report($e);
$validationException = ValidationException::withMessages([
'path_picture_1' => $e->getMessage()
]);
@ -76,6 +77,7 @@ class CafelPoultryBreederJob extends CafelJobs
$row['path_picture_2']
) : null;
} catch (CafelApiImageFetchException | CafelApiException $e) {
report($e);
$validationException = ValidationException::withMessages([
'path_picture_2' => $e->getMessage()
]);

View file

@ -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
/**
@ -175,4 +192,22 @@ class TraceaPoultry extends Model
// * 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;
}
}

View file

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