feat : expose IpBGetInventaire via BovinApi::getInventory
This commit is contained in:
@@ -6,8 +6,11 @@ use Malio\EdnotifBundle\Auth\TokenProvider;
|
|||||||
use Malio\EdnotifBundle\Bovin\Api\BovinApi;
|
use Malio\EdnotifBundle\Bovin\Api\BovinApi;
|
||||||
use Malio\EdnotifBundle\Bovin\Api\BovinApiInterface;
|
use Malio\EdnotifBundle\Bovin\Api\BovinApiInterface;
|
||||||
use Malio\EdnotifBundle\Bovin\Mapper\AnimalFileMapper;
|
use Malio\EdnotifBundle\Bovin\Mapper\AnimalFileMapper;
|
||||||
|
use Malio\EdnotifBundle\Bovin\Mapper\AnimalSummaryMapper;
|
||||||
|
use Malio\EdnotifBundle\Bovin\Mapper\InventoryMapper;
|
||||||
use Malio\EdnotifBundle\Shared\Mapper\StandardResponseMapper;
|
use Malio\EdnotifBundle\Shared\Mapper\StandardResponseMapper;
|
||||||
use Malio\EdnotifBundle\Shared\Soap\SoapClientFactory;
|
use Malio\EdnotifBundle\Shared\Soap\SoapClientFactory;
|
||||||
|
use Malio\EdnotifBundle\Shared\Soap\ZipMessageDecoder;
|
||||||
use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
|
use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
|
||||||
|
|
||||||
use function Symfony\Component\DependencyInjection\Loader\Configurator\service;
|
use function Symfony\Component\DependencyInjection\Loader\Configurator\service;
|
||||||
@@ -37,6 +40,15 @@ return static function (ContainerConfigurator $container): void {
|
|||||||
|
|
||||||
$services->set(AnimalFileMapper::class)->args([service(StandardResponseMapper::class)]);
|
$services->set(AnimalFileMapper::class)->args([service(StandardResponseMapper::class)]);
|
||||||
|
|
||||||
|
$services->set(ZipMessageDecoder::class);
|
||||||
|
$services->set(AnimalSummaryMapper::class);
|
||||||
|
$services->set(InventoryMapper::class)
|
||||||
|
->args([
|
||||||
|
service(AnimalSummaryMapper::class),
|
||||||
|
service(StandardResponseMapper::class),
|
||||||
|
])
|
||||||
|
;
|
||||||
|
|
||||||
$services->set(TokenProvider::class)
|
$services->set(TokenProvider::class)
|
||||||
->args([
|
->args([
|
||||||
service('ednotif.soap.guichet'),
|
service('ednotif.soap.guichet'),
|
||||||
@@ -55,6 +67,8 @@ return static function (ContainerConfigurator $container): void {
|
|||||||
service(TokenProvider::class),
|
service(TokenProvider::class),
|
||||||
service('ednotif.soap.business'),
|
service('ednotif.soap.business'),
|
||||||
service(AnimalFileMapper::class),
|
service(AnimalFileMapper::class),
|
||||||
|
service(InventoryMapper::class),
|
||||||
|
service(ZipMessageDecoder::class),
|
||||||
'%ednotif.exploitation_country_code%',
|
'%ednotif.exploitation_country_code%',
|
||||||
'%ednotif.exploitation_number%',
|
'%ednotif.exploitation_number%',
|
||||||
])
|
])
|
||||||
|
|||||||
@@ -4,10 +4,14 @@ declare(strict_types=1);
|
|||||||
|
|
||||||
namespace Malio\EdnotifBundle\Bovin\Api;
|
namespace Malio\EdnotifBundle\Bovin\Api;
|
||||||
|
|
||||||
|
use DateTimeInterface;
|
||||||
use Malio\EdnotifBundle\Auth\TokenProvider;
|
use Malio\EdnotifBundle\Auth\TokenProvider;
|
||||||
use Malio\EdnotifBundle\Bovin\Dto\AnimalFileDto;
|
use Malio\EdnotifBundle\Bovin\Dto\AnimalFileDto;
|
||||||
|
use Malio\EdnotifBundle\Bovin\Dto\InventoryDto;
|
||||||
use Malio\EdnotifBundle\Bovin\Mapper\AnimalFileMapper;
|
use Malio\EdnotifBundle\Bovin\Mapper\AnimalFileMapper;
|
||||||
|
use Malio\EdnotifBundle\Bovin\Mapper\InventoryMapper;
|
||||||
use Malio\EdnotifBundle\Shared\Exception\EdnotifException;
|
use Malio\EdnotifBundle\Shared\Exception\EdnotifException;
|
||||||
|
use Malio\EdnotifBundle\Shared\Soap\ZipMessageDecoder;
|
||||||
use RuntimeException;
|
use RuntimeException;
|
||||||
use SoapClient;
|
use SoapClient;
|
||||||
use SoapFault;
|
use SoapFault;
|
||||||
@@ -18,6 +22,8 @@ final readonly class BovinApi implements BovinApiInterface
|
|||||||
private TokenProvider $tokenProvider,
|
private TokenProvider $tokenProvider,
|
||||||
private SoapClient $businessClient,
|
private SoapClient $businessClient,
|
||||||
private AnimalFileMapper $bovinDossierMapper,
|
private AnimalFileMapper $bovinDossierMapper,
|
||||||
|
private InventoryMapper $inventoryMapper,
|
||||||
|
private ZipMessageDecoder $zipMessageDecoder,
|
||||||
private string $exploitationCountryCode,
|
private string $exploitationCountryCode,
|
||||||
private string $exploitationNumber,
|
private string $exploitationNumber,
|
||||||
) {}
|
) {}
|
||||||
@@ -45,20 +51,63 @@ final readonly class BovinApi implements BovinApiInterface
|
|||||||
throw new RuntimeException('SOAP Fault on IpBGetDossierAnimal: '.$soapFault->getMessage(), 0, $soapFault);
|
throw new RuntimeException('SOAP Fault on IpBGetDossierAnimal: '.$soapFault->getMessage(), 0, $soapFault);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Throw uniquement si Resultat=false (erreur métier)
|
$this->assertSuccessfulResponse($soapResponse, 'IpBGetDossierAnimal');
|
||||||
$standardResponseNode = $soapResponse->ReponseStandard ?? null;
|
|
||||||
$isOk = is_object($standardResponseNode) && (($standardResponseNode->Resultat ?? false) === true);
|
|
||||||
|
|
||||||
if (!$isOk) {
|
|
||||||
$anomalyNode = is_object($standardResponseNode) ? ($standardResponseNode->Anomalie ?? null) : null;
|
|
||||||
|
|
||||||
throw new EdnotifException(
|
|
||||||
codeAnomalie: (string) ($anomalyNode->Code ?? 'UNKNOWN'),
|
|
||||||
severite: (int) ($anomalyNode->Severite ?? 1),
|
|
||||||
message: (string) ($anomalyNode->Message ?? 'EDNOTIF error')
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
return $this->bovinDossierMapper->map($soapResponse);
|
return $this->bovinDossierMapper->map($soapResponse);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function getInventory(
|
||||||
|
DateTimeInterface $startDate,
|
||||||
|
?DateTimeInterface $endDate = null,
|
||||||
|
bool $includeEarTagStock = false,
|
||||||
|
): InventoryDto {
|
||||||
|
$token = $this->tokenProvider->getToken();
|
||||||
|
|
||||||
|
$payload = [
|
||||||
|
'JetonAuthentification' => $token,
|
||||||
|
'Exploitation' => [
|
||||||
|
'CodePays' => $this->exploitationCountryCode,
|
||||||
|
'NumeroExploitation' => $this->exploitationNumber,
|
||||||
|
],
|
||||||
|
'DateDebut' => $startDate->format('Y-m-d'),
|
||||||
|
'StockBoucles' => $includeEarTagStock,
|
||||||
|
];
|
||||||
|
if (null !== $endDate) {
|
||||||
|
$payload['DateFin'] = $endDate->format('Y-m-d');
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
/** @var object $soapResponse */
|
||||||
|
$soapResponse = $this->businessClient->__soapCall('IpBGetInventaire', [$payload]);
|
||||||
|
} catch (SoapFault $soapFault) {
|
||||||
|
throw new RuntimeException('SOAP Fault on IpBGetInventaire: '.$soapFault->getMessage(), 0, $soapFault);
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->assertSuccessfulResponse($soapResponse, 'IpBGetInventaire');
|
||||||
|
|
||||||
|
$messageZip = $soapResponse->ReponseSpecifique->MessageZip ?? null;
|
||||||
|
$unzippedMessage = is_string($messageZip) && '' !== $messageZip
|
||||||
|
? $this->zipMessageDecoder->decode($messageZip)
|
||||||
|
: null;
|
||||||
|
|
||||||
|
return $this->inventoryMapper->map($soapResponse, $unzippedMessage);
|
||||||
|
}
|
||||||
|
|
||||||
|
private function assertSuccessfulResponse(object $soapResponse, string $operation): void
|
||||||
|
{
|
||||||
|
$standardResponseNode = $soapResponse->ReponseStandard ?? null;
|
||||||
|
$isOk = is_object($standardResponseNode) && (($standardResponseNode->Resultat ?? false) === true);
|
||||||
|
|
||||||
|
if ($isOk) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
$anomalyNode = is_object($standardResponseNode) ? ($standardResponseNode->Anomalie ?? null) : null;
|
||||||
|
|
||||||
|
throw new EdnotifException(
|
||||||
|
codeAnomalie: (string) ($anomalyNode->Code ?? 'UNKNOWN'),
|
||||||
|
severite: (int) ($anomalyNode->Severite ?? 1),
|
||||||
|
message: (string) ($anomalyNode->Message ?? $operation.' : EDNOTIF error')
|
||||||
|
);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,9 +4,17 @@ declare(strict_types=1);
|
|||||||
|
|
||||||
namespace Malio\EdnotifBundle\Bovin\Api;
|
namespace Malio\EdnotifBundle\Bovin\Api;
|
||||||
|
|
||||||
|
use DateTimeInterface;
|
||||||
use Malio\EdnotifBundle\Bovin\Dto\AnimalFileDto;
|
use Malio\EdnotifBundle\Bovin\Dto\AnimalFileDto;
|
||||||
|
use Malio\EdnotifBundle\Bovin\Dto\InventoryDto;
|
||||||
|
|
||||||
interface BovinApiInterface
|
interface BovinApiInterface
|
||||||
{
|
{
|
||||||
public function getAnimalFile(string $nationalNumber, string $countryCode = 'FR'): AnimalFileDto;
|
public function getAnimalFile(string $nationalNumber, string $countryCode = 'FR'): AnimalFileDto;
|
||||||
|
|
||||||
|
public function getInventory(
|
||||||
|
DateTimeInterface $startDate,
|
||||||
|
?DateTimeInterface $endDate = null,
|
||||||
|
bool $includeEarTagStock = false,
|
||||||
|
): InventoryDto;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user