Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 7075f0f95d | |||
| caa558f582 | |||
| 0800ed99cf | |||
| 0aa97b5975 |
@@ -0,0 +1,131 @@
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace App\Module\Catalog\Application\Filter;
|
||||
|
||||
use App\Module\Catalog\Domain\Entity\Storage;
|
||||
|
||||
use function in_array;
|
||||
use function is_array;
|
||||
use function is_int;
|
||||
use function is_string;
|
||||
|
||||
/**
|
||||
* Filtres de liste des stockages : SOURCE UNIQUE de verite du parsing des parametres
|
||||
* de requete (?search sur numero, ?siteId[], ?storageTypeId, ?state). Partagee par le
|
||||
* StorageProvider (liste paginee) et le StorageExportController (export XLSX) pour
|
||||
* garantir que l'export reflete EXACTEMENT ce que l'utilisateur voit a l'ecran.
|
||||
*
|
||||
* Sans cette factorisation, les deux endpoints parsaient les memes filtres avec des
|
||||
* regles subtilement differentes (numero litteral « 0 » coerce a null cote export,
|
||||
* id non positif accepte cote liste mais ignore cote export, parametre tableau
|
||||
* jetant un 400 cote export) : autant de divergences liste/export. Une seule
|
||||
* implementation -> zero drift, chaque nouveau filtre se branche en un seul endroit.
|
||||
*/
|
||||
final readonly class StorageListFilters
|
||||
{
|
||||
/** Etats valides du filtre ?state= (enum borne, RG-7.04). */
|
||||
private const array VALID_STATES = [
|
||||
Storage::STATE_RECEPTION,
|
||||
Storage::STATE_PRODUCTION,
|
||||
Storage::STATE_TRIAGE,
|
||||
];
|
||||
|
||||
/**
|
||||
* @param list<int> $siteIds
|
||||
*/
|
||||
private function __construct(
|
||||
public ?string $search,
|
||||
public array $siteIds,
|
||||
public ?int $storageTypeId,
|
||||
public ?string $state,
|
||||
) {}
|
||||
|
||||
/**
|
||||
* Construit les filtres depuis une source brute : le `$context['filters']`
|
||||
* d'API Platform cote provider, ou `$request->query->all()` cote controller
|
||||
* d'export. Tolere scalaire ou tableau, ignore les entrees invalides — jamais
|
||||
* d'exception sur une saisie malformee (ex: `?search[]=x`).
|
||||
*
|
||||
* @param array<string, mixed> $query
|
||||
*/
|
||||
public static function fromQuery(array $query): self
|
||||
{
|
||||
return new self(
|
||||
self::readSearch($query['search'] ?? null),
|
||||
self::readSiteIds($query['siteId'] ?? null),
|
||||
self::readPositiveInt($query['storageTypeId'] ?? null),
|
||||
self::readState($query['state'] ?? null),
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* Recherche partielle sur numero : valeur trimmee, ou null si absente / vide.
|
||||
* La chaine « 0 » est un numero valide (VARCHAR) et N'EST PAS coercee a null.
|
||||
*/
|
||||
private static function readSearch(mixed $raw): ?string
|
||||
{
|
||||
if (!is_string($raw)) {
|
||||
return null;
|
||||
}
|
||||
|
||||
$raw = trim($raw);
|
||||
|
||||
return '' === $raw ? null : $raw;
|
||||
}
|
||||
|
||||
/**
|
||||
* Liste d'identifiants de sites (OR). Tolere une valeur scalaire unique
|
||||
* (`?siteId=1`) ou un tableau (`?siteId[]=1&siteId[]=2`), dedup, ordre stable.
|
||||
*
|
||||
* @return list<int>
|
||||
*/
|
||||
private static function readSiteIds(mixed $raw): array
|
||||
{
|
||||
if (null === $raw) {
|
||||
return [];
|
||||
}
|
||||
|
||||
$values = is_array($raw) ? $raw : [$raw];
|
||||
|
||||
$ids = [];
|
||||
foreach ($values as $value) {
|
||||
$id = self::readPositiveInt($value);
|
||||
if (null !== $id) {
|
||||
$ids[] = $id;
|
||||
}
|
||||
}
|
||||
|
||||
return array_values(array_unique($ids));
|
||||
}
|
||||
|
||||
/**
|
||||
* Identifiant entier STRICTEMENT POSITIF (un id metier l'est toujours) ou null.
|
||||
* Un 0 ou un negatif est traite comme « pas de filtre », jamais comme un id
|
||||
* impossible (qui renverrait une liste vide cote provider mais tout cote export).
|
||||
*/
|
||||
private static function readPositiveInt(mixed $raw): ?int
|
||||
{
|
||||
if (is_int($raw)) {
|
||||
return $raw > 0 ? $raw : null;
|
||||
}
|
||||
|
||||
return is_string($raw) && ctype_digit($raw) && (int) $raw > 0 ? (int) $raw : null;
|
||||
}
|
||||
|
||||
/**
|
||||
* Filtre ?state= : normalise en majuscules, n'accepte qu'une valeur de l'enum
|
||||
* borne {RECEPTION, PRODUCTION, TRIAGE} ; toute autre valeur est ignoree (null).
|
||||
*/
|
||||
private static function readState(mixed $raw): ?string
|
||||
{
|
||||
if (!is_string($raw) || '' === trim($raw)) {
|
||||
return null;
|
||||
}
|
||||
|
||||
$state = mb_strtoupper(trim($raw), 'UTF-8');
|
||||
|
||||
return in_array($state, self::VALID_STATES, true) ? $state : null;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,35 @@
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace App\Module\Catalog\Application\Service;
|
||||
|
||||
/**
|
||||
* Normalisation serveur des champs texte d'un Storage, appliquee par le
|
||||
* StorageProcessor AVANT l'unicite metier et la persistance (RG-7.06). Jumeau du
|
||||
* ProductFieldNormalizer (M6), recentre sur l'unique champ texte du stockage.
|
||||
*
|
||||
* - numero : trim simple, SANS changement de casse (HP-M7-05 : pas d'UPPER par
|
||||
* defaut, contrairement au code produit). Le numero est saisi tel quel et sert
|
||||
* l'unicite metier (site, type, numero) parmi les actifs (RG-7.01).
|
||||
*
|
||||
* La methode est null-safe et trim l'entree ; une chaine vide apres trim devient
|
||||
* null (c'est l'Assert\NotBlank de l'entite qui rejette le vide, pas le normalizer).
|
||||
*/
|
||||
final class StorageFieldNormalizer
|
||||
{
|
||||
/**
|
||||
* Numero de stockage trimme (RG-7.06), sans changement de casse (HP-M7-05).
|
||||
* Conserve null tel quel ; une chaine vide apres trim devient null.
|
||||
*/
|
||||
public function normalizeNumero(?string $value): ?string
|
||||
{
|
||||
if (null === $value) {
|
||||
return null;
|
||||
}
|
||||
|
||||
$value = trim($value);
|
||||
|
||||
return '' === $value ? null : $value;
|
||||
}
|
||||
}
|
||||
@@ -158,6 +158,7 @@ class Storage implements TimestampableInterface, BlamableInterface
|
||||
// qui casse le CHECK et fait echouer make test-db-setup (cf. Product::states).
|
||||
#[ORM\Column(type: 'json', options: ['jsonb' => true])]
|
||||
#[Assert\Count(min: 1, minMessage: 'Sélectionnez au moins un état.')]
|
||||
#[Assert\Unique(message: 'Chaque état ne peut être sélectionné qu\'une seule fois.')]
|
||||
#[Assert\Choice(
|
||||
choices: [self::STATE_RECEPTION, self::STATE_PRODUCTION, self::STATE_TRIAGE],
|
||||
multiple: true,
|
||||
@@ -230,7 +231,12 @@ class Storage implements TimestampableInterface, BlamableInterface
|
||||
*/
|
||||
public function setStates(array $states): static
|
||||
{
|
||||
$this->states = $states;
|
||||
// `array_values` reseque toujours un tableau SEQUENTIEL : une saisie cliente
|
||||
// malformee (objet JSON `{"x":"RECEPTION"}` denormalise en tableau associatif)
|
||||
// ne peut plus etre persistee comme un objet JSONB, ce qui ferait echouer le
|
||||
// CHECK chk_storage_states_not_empty (jsonb_array_length sur non-tableau) en
|
||||
// 500. Les doublons eventuels restent rejetes en 422 par Assert\Unique.
|
||||
$this->states = array_values($states);
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
||||
@@ -5,10 +5,44 @@ declare(strict_types=1);
|
||||
namespace App\Module\Catalog\Domain\Repository;
|
||||
|
||||
use App\Module\Catalog\Domain\Entity\Storage;
|
||||
use Doctrine\ORM\QueryBuilder;
|
||||
|
||||
interface StorageRepositoryInterface
|
||||
{
|
||||
public function findById(int $id): ?Storage;
|
||||
|
||||
public function save(Storage $storage): void;
|
||||
|
||||
/**
|
||||
* Vrai si un stockage actif (deleted_at IS NULL) porte deja le triplet
|
||||
* (site, storageType, numero). `$excludeId` exclut un stockage precis du test
|
||||
* (cas PATCH). Garantit l'unicite metier parmi les actifs (RG-7.01, index
|
||||
* partiel uq_storage_site_type_numero_active). Un numero redevient disponible
|
||||
* apres soft-delete (le test ignore les supprimes).
|
||||
*/
|
||||
public function existsActiveBySiteTypeNumero(
|
||||
int $siteId,
|
||||
int $storageTypeId,
|
||||
string $numero,
|
||||
?int $excludeId = null,
|
||||
): bool;
|
||||
|
||||
/**
|
||||
* QueryBuilder de la liste stockages (consomme par le StorageProvider) : exclut
|
||||
* par defaut les soft-deleted (RG-7.07), trie par site.code ASC, storageType.label
|
||||
* ASC, numero ASC (defaut spec § 4.1) et applique les filtres optionnels :
|
||||
* - `$search` : recherche partielle case-insensitive sur `numero`.
|
||||
* - `$siteIds` : stockage rattache a AU MOINS UN des sites passes.
|
||||
* - `$storageTypeId` : restreint a un type de stockage precis (par id).
|
||||
* - `$state` : appartenance a la colonne JSONB `states` (RECEPTION|PRODUCTION|TRIAGE).
|
||||
*
|
||||
* @param list<int> $siteIds
|
||||
*/
|
||||
public function createListQueryBuilder(
|
||||
bool $includeDeleted = false,
|
||||
?string $search = null,
|
||||
array $siteIds = [],
|
||||
?int $storageTypeId = null,
|
||||
?string $state = null,
|
||||
): QueryBuilder;
|
||||
}
|
||||
|
||||
@@ -0,0 +1,112 @@
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace App\Module\Catalog\Infrastructure\ApiPlatform\State\Processor;
|
||||
|
||||
use ApiPlatform\Metadata\Operation;
|
||||
use ApiPlatform\State\ProcessorInterface;
|
||||
use App\Module\Catalog\Application\Service\StorageFieldNormalizer;
|
||||
use App\Module\Catalog\Domain\Entity\Storage;
|
||||
use App\Module\Catalog\Domain\Repository\StorageRepositoryInterface;
|
||||
use Doctrine\DBAL\Exception\UniqueConstraintViolationException;
|
||||
use Symfony\Component\DependencyInjection\Attribute\Autowire;
|
||||
use Symfony\Component\HttpKernel\Exception\ConflictHttpException;
|
||||
use Throwable;
|
||||
|
||||
use function sprintf;
|
||||
|
||||
/**
|
||||
* Processor d'ecriture du stockage (M7, POST / PATCH). Cf. spec-back M7 § 4.3 /
|
||||
* § 4.4 + RG-7.01 / RG-7.06. Jumeau du ProductProcessor (normalisation serveur +
|
||||
* 409 doublon).
|
||||
*
|
||||
* Sequence (POST / PATCH) :
|
||||
* 1. Normalisation serveur (RG-7.06) via StorageFieldNormalizer : numero trim
|
||||
* (pas d'UPPER — HP-M7-05). Jouee AVANT l'unicite et la persistance ; la
|
||||
* validation (NotNull site/type, NotBlank/Length numero, Count/Choice states
|
||||
* RG-7.04) a deja joue cote API Platform sur la saisie brute.
|
||||
* 2. RG-7.01 : unicite metier du triplet (site, storageType, numero) parmi les
|
||||
* actifs. Pre-check deterministe (excluant le stockage courant en PATCH) -> 409 ;
|
||||
* l'index partiel uq_storage_site_type_numero_active reste le filet anti-race
|
||||
* au flush.
|
||||
* 3. Persistance via le persist_processor Doctrine ORM.
|
||||
*
|
||||
* RG-7.03 (« le type doit etre disponible sur le site choisi ») n'est PAS portee :
|
||||
* le concept type<->site a ete retire du modele en M6 (StorageType rendu plat,
|
||||
* jointure storage_type_site droppee — migration Version20260626100000). C'est
|
||||
* desormais l'entite Storage (1 site + 1 type) qui materialise cette disponibilite ;
|
||||
* il n'existe plus de referentiel a interroger. A reclarifier cote spec (signale).
|
||||
*
|
||||
* Mode strict PATCH (RETEX M1) : la security d'operation exige `catalog.storages.manage`
|
||||
* pour TOUS les champs ecrivables (un seul niveau de permission au M7 — admin-only).
|
||||
* Aucun champ « hors-permission » a re-gater finement ici : le 403 global est porte
|
||||
* par la security d'operation.
|
||||
*
|
||||
* @implements ProcessorInterface<Storage, Storage>
|
||||
*/
|
||||
final class StorageProcessor implements ProcessorInterface
|
||||
{
|
||||
public function __construct(
|
||||
#[Autowire(service: 'api_platform.doctrine.orm.state.persist_processor')]
|
||||
private readonly ProcessorInterface $persistProcessor,
|
||||
private readonly StorageFieldNormalizer $normalizer,
|
||||
#[Autowire(service: 'App\Module\Catalog\Infrastructure\Doctrine\DoctrineStorageRepository')]
|
||||
private readonly StorageRepositoryInterface $repository,
|
||||
) {}
|
||||
|
||||
public function process(mixed $data, Operation $operation, array $uriVariables = [], array $context = []): mixed
|
||||
{
|
||||
if (!$data instanceof Storage) {
|
||||
return $this->persistProcessor->process($data, $operation, $uriVariables, $context);
|
||||
}
|
||||
|
||||
// 1. RG-7.06 : normalisation serveur (numero trim, pas d'UPPER).
|
||||
$this->normalize($data);
|
||||
|
||||
// 2. RG-7.01 : unicite metier (site, storageType, numero) parmi les actifs
|
||||
// (exclut le stockage courant en PATCH). Pre-check explicite -> 409
|
||||
// deterministe. Le NotNull site/type + NotBlank numero ont deja joue.
|
||||
$siteId = $data->getSite()?->getId();
|
||||
$typeId = $data->getStorageType()?->getId();
|
||||
$numero = (string) $data->getNumero();
|
||||
if (null !== $siteId && null !== $typeId && '' !== $numero
|
||||
&& $this->repository->existsActiveBySiteTypeNumero($siteId, $typeId, $numero, $data->getId())) {
|
||||
throw $this->duplicateConflict($numero);
|
||||
}
|
||||
|
||||
// 3. Persistance, avec filet anti-race sur l'index partiel.
|
||||
try {
|
||||
return $this->persistProcessor->process($data, $operation, $uriVariables, $context);
|
||||
} catch (UniqueConstraintViolationException $e) {
|
||||
// Insertion concurrente du meme triplet entre le pre-check et le flush
|
||||
// (collision sur uq_storage_site_type_numero_active).
|
||||
throw $this->duplicateConflict($numero, $e);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Normalisation serveur du stockage (RG-7.06). Le setter n'est touche que si une
|
||||
* valeur est presente, pour ne jamais ecraser l'existant lors d'un PATCH partiel.
|
||||
* Le cast (string) est sur : NotBlank a deja rejete le vide en amont.
|
||||
*/
|
||||
private function normalize(Storage $data): void
|
||||
{
|
||||
if (null !== $data->getNumero()) {
|
||||
$data->setNumero((string) $this->normalizer->normalizeNumero($data->getNumero()));
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* RG-7.01 : 409 sur doublon (site, type, numero). Le front mappe ce conflit sur
|
||||
* le champ `numero` (setError('numero', ...) + toast — convention useFormErrors
|
||||
* ERP-101) : le propertyPath exploitable est `numero`.
|
||||
*/
|
||||
private function duplicateConflict(string $numero, ?Throwable $previous = null): ConflictHttpException
|
||||
{
|
||||
return new ConflictHttpException(
|
||||
sprintf('Un stockage portant le numéro « %s » existe déjà pour ce site et ce type de stockage.', $numero),
|
||||
$previous,
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,93 @@
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace App\Module\Catalog\Infrastructure\ApiPlatform\State\Provider;
|
||||
|
||||
use ApiPlatform\Doctrine\Orm\Paginator;
|
||||
use ApiPlatform\Metadata\CollectionOperationInterface;
|
||||
use ApiPlatform\Metadata\Operation;
|
||||
use ApiPlatform\State\Pagination\Pagination;
|
||||
use ApiPlatform\State\ProviderInterface;
|
||||
use App\Module\Catalog\Application\Filter\StorageListFilters;
|
||||
use App\Module\Catalog\Domain\Entity\Storage;
|
||||
use App\Module\Catalog\Domain\Repository\StorageRepositoryInterface;
|
||||
use Doctrine\ORM\Tools\Pagination\Paginator as DoctrinePaginator;
|
||||
use Symfony\Component\DependencyInjection\Attribute\Autowire;
|
||||
|
||||
use function is_int;
|
||||
use function is_string;
|
||||
|
||||
/**
|
||||
* Provider Storage (lecture, ERP-213) :
|
||||
* - LISTE : exclut par defaut les stockages soft-deleted (RG-7.07), trie par
|
||||
* site.code ASC, storageType.label ASC, numero ASC (defaut spec § 4.1), applique
|
||||
* les filtres (?search sur numero, ?siteId[], ?storageTypeId, ?state — parses par
|
||||
* {@see StorageListFilters}, source partagee avec l'export) et renvoie une
|
||||
* collection PAGINEE Hydra (regle ABSOLUE n°13 : jamais d'array brut sur une
|
||||
* operation de collection — on enveloppe le QueryBuilder dans le Paginator ORM).
|
||||
* Echappatoire ?pagination=false respectee (alimentation d'un select).
|
||||
* - ITEM : recharge le stockage puis renvoie null (404) s'il est soft-deleted — le
|
||||
* soft-delete n'est jamais expose (§ 2.8), aucun flag includeDeleted.
|
||||
*
|
||||
* @implements ProviderInterface<Storage>
|
||||
*/
|
||||
final class StorageProvider implements ProviderInterface
|
||||
{
|
||||
public function __construct(
|
||||
#[Autowire(service: 'App\Module\Catalog\Infrastructure\Doctrine\DoctrineStorageRepository')]
|
||||
private readonly StorageRepositoryInterface $repository,
|
||||
private readonly Pagination $pagination,
|
||||
) {}
|
||||
|
||||
public function provide(Operation $operation, array $uriVariables = [], array $context = []): iterable|Paginator|Storage|null
|
||||
{
|
||||
if ($operation instanceof CollectionOperationInterface) {
|
||||
// Filtres parses par la source partagee avec l'export (parite garantie).
|
||||
$filters = StorageListFilters::fromQuery($context['filters'] ?? []);
|
||||
|
||||
// includeDeleted toujours false : le soft-delete n'est pas expose (§ 2.8).
|
||||
$qb = $this->repository->createListQueryBuilder(
|
||||
false,
|
||||
$filters->search,
|
||||
$filters->siteIds,
|
||||
$filters->storageTypeId,
|
||||
$filters->state,
|
||||
);
|
||||
|
||||
// Echappatoire ?pagination=false : collection complete sans Paginator.
|
||||
if (!$this->pagination->isEnabled($operation, $context)) {
|
||||
return $qb->getQuery()->getResult();
|
||||
}
|
||||
|
||||
// Branche paginee standard : offset/limit via Pagination, enveloppe dans le
|
||||
// Paginator ORM. Les jointures site/storageType sont to-ONE (ManyToOne) :
|
||||
// pas de duplication de lignes, le comptage reste exact.
|
||||
$limit = $this->pagination->getLimit($operation, $context);
|
||||
$page = max(1, $this->pagination->getPage($context));
|
||||
$offset = ($page - 1) * $limit;
|
||||
|
||||
$qb->setFirstResult($offset)->setMaxResults($limit);
|
||||
|
||||
return new Paginator(new DoctrinePaginator($qb->getQuery()));
|
||||
}
|
||||
|
||||
// Get unitaire : recharger l'entite, puis appliquer le filtre soft-delete.
|
||||
$id = $uriVariables['id'] ?? null;
|
||||
if (!is_int($id) && !(is_string($id) && ctype_digit($id))) {
|
||||
return null;
|
||||
}
|
||||
|
||||
$storage = $this->repository->findById((int) $id);
|
||||
if (null === $storage) {
|
||||
return null;
|
||||
}
|
||||
|
||||
// § 2.8 : un stockage soft-deleted n'est jamais expose (404).
|
||||
if (null !== $storage->getDeletedAt()) {
|
||||
return null;
|
||||
}
|
||||
|
||||
return $storage;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,202 @@
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace App\Module\Catalog\Infrastructure\Controller;
|
||||
|
||||
use App\Module\Catalog\Application\Filter\StorageListFilters;
|
||||
use App\Module\Catalog\Domain\Entity\Storage;
|
||||
use App\Module\Catalog\Domain\Repository\StorageRepositoryInterface;
|
||||
use App\Module\Sites\Domain\Entity\Site;
|
||||
use App\Shared\Domain\Contract\SpreadsheetExporterInterface;
|
||||
use DateTimeImmutable;
|
||||
use Doctrine\ORM\EntityManagerInterface;
|
||||
use Symfony\Component\DependencyInjection\Attribute\Autowire;
|
||||
use Symfony\Component\HttpFoundation\Request;
|
||||
use Symfony\Component\HttpFoundation\Response;
|
||||
use Symfony\Component\HttpKernel\Attribute\AsController;
|
||||
use Symfony\Component\Routing\Attribute\Route;
|
||||
use Symfony\Component\Security\Http\Attribute\IsGranted;
|
||||
|
||||
use function in_array;
|
||||
|
||||
/**
|
||||
* Export XLSX de la liste des stockages (M7, spec-back § 4.5). Jumeau du
|
||||
* ProductExportController (M6) — reference en prose volontairement (pas de {@see}
|
||||
* inter-module).
|
||||
*
|
||||
* Controller Symfony custom (et non operation API Platform) car il produit un
|
||||
* binaire de fichier, pas une representation Hydra. `priority: 1` est OBLIGATOIRE
|
||||
* sur la route : sans cela API Platform capterait `/api/storages/export.xlsx`
|
||||
* comme l'item `GET /api/storages/{id}.{_format}` (id="export", _format="xlsx")
|
||||
* — cf. CLAUDE.md « controller custom sous /api ». Etant un controller (et non un
|
||||
* #[ApiResource]), il n'est PAS scanne par CollectionsArePaginatedTest : aucune
|
||||
* entree EXCLUDED necessaire (comme ProductExportController).
|
||||
*
|
||||
* Separation des responsabilites :
|
||||
* - le COMMENT (generation du fichier) est delegue au service Shared
|
||||
* {@see SpreadsheetExporterInterface} — generique, reutilisable, sans metier ;
|
||||
* - le QUOI vit ICI : selection des stockages (MEMES filtres que
|
||||
* `GET /api/storages` via le StorageProvider, deleguee a
|
||||
* {@see StorageRepositoryInterface::createListQueryBuilder()} — l'export reflete
|
||||
* exactement ce que l'utilisateur voit a l'ecran) et mapping metier des colonnes.
|
||||
* Les stockages soft-deleted (RG-7.07) sont toujours exclus, comme en liste (le
|
||||
* soft-delete n'est jamais expose, § 2.8).
|
||||
*/
|
||||
#[AsController]
|
||||
final class StorageExportController
|
||||
{
|
||||
/**
|
||||
* Libelles FR des etats (RG-7.04) pour la colonne « États ». L'ordre des cles
|
||||
* fixe l'ordre d'affichage (Réception, Production, Triage) independamment de
|
||||
* l'ordre de stockage en base.
|
||||
*/
|
||||
private const array STATE_LABELS = [
|
||||
Storage::STATE_RECEPTION => 'Réception',
|
||||
Storage::STATE_PRODUCTION => 'Production',
|
||||
Storage::STATE_TRIAGE => 'Triage',
|
||||
];
|
||||
|
||||
/**
|
||||
* Taille du lot avant `EntityManager::clear()` pendant le streaming des lignes :
|
||||
* borne la memoire (identity map) sur un gros export sans tout materialiser.
|
||||
*/
|
||||
private const int EXPORT_BATCH_SIZE = 200;
|
||||
|
||||
public function __construct(
|
||||
#[Autowire(service: 'App\Module\Catalog\Infrastructure\Doctrine\DoctrineStorageRepository')]
|
||||
private readonly StorageRepositoryInterface $repository,
|
||||
private readonly SpreadsheetExporterInterface $exporter,
|
||||
private readonly EntityManagerInterface $em,
|
||||
) {}
|
||||
|
||||
#[Route('/api/storages/export.xlsx', name: 'catalog_storages_export_xlsx', methods: ['GET'], priority: 1)]
|
||||
#[IsGranted('catalog.storages.view')]
|
||||
public function __invoke(Request $request): Response
|
||||
{
|
||||
// Memes filtres que la vue liste (StorageProvider) pour que l'export reflete
|
||||
// exactement ce que l'utilisateur voit a l'ecran : recherche (?search sur
|
||||
// numero), sites (?siteId[]), type (?storageTypeId), etat (?state). Parses par
|
||||
// la MEME source que le provider ({@see StorageListFilters}) -> aucune
|
||||
// divergence possible (numero « 0 », parametre tableau, id non positif).
|
||||
// includeDeleted reste false : le soft-delete n'est jamais expose (§ 2.8).
|
||||
$filters = StorageListFilters::fromQuery($request->query->all());
|
||||
|
||||
// Streaming via toIterable() : on ne materialise pas toute la table en memoire
|
||||
// (cf. buildRows + EXPORT_BATCH_SIZE) avant de construire le classeur.
|
||||
$storages = $this->repository
|
||||
->createListQueryBuilder(false, $filters->search, $filters->siteIds, $filters->storageTypeId, $filters->state)
|
||||
->getQuery()
|
||||
->toIterable()
|
||||
;
|
||||
|
||||
$binary = $this->exporter->export(
|
||||
'Stockages',
|
||||
$this->buildHeaders(),
|
||||
$this->buildRows($storages),
|
||||
);
|
||||
|
||||
return $this->buildResponse($binary);
|
||||
}
|
||||
|
||||
/**
|
||||
* Colonnes de l'export (spec § 4.5).
|
||||
*
|
||||
* @return list<string>
|
||||
*/
|
||||
private function buildHeaders(): array
|
||||
{
|
||||
return [
|
||||
'Nom',
|
||||
'Site',
|
||||
'Type de stockage',
|
||||
'Numéro',
|
||||
'États',
|
||||
'Créé le',
|
||||
'Modifié le',
|
||||
];
|
||||
}
|
||||
|
||||
/**
|
||||
* Mappe chaque stockage en ligne d'export, en consommant un iterable paresseux
|
||||
* (Doctrine `toIterable()`). Toutes les N lignes (EXPORT_BATCH_SIZE), on vide
|
||||
* l'identity map (`clear()`) pour borner la memoire sur un gros export — sans
|
||||
* danger ici, le controller ne fait que lire.
|
||||
*
|
||||
* @param iterable<Storage> $storages
|
||||
*
|
||||
* @return iterable<list<null|scalar>>
|
||||
*/
|
||||
private function buildRows(iterable $storages): iterable
|
||||
{
|
||||
$count = 0;
|
||||
foreach ($storages as $storage) {
|
||||
yield [
|
||||
$storage->getDisplayName(),
|
||||
$this->formatSite($storage->getSite()),
|
||||
$storage->getStorageType()?->getLabel(),
|
||||
$storage->getNumero(),
|
||||
$this->formatStates($storage),
|
||||
$this->formatDate($storage->getCreatedAt()),
|
||||
$this->formatDate($storage->getUpdatedAt()),
|
||||
];
|
||||
|
||||
if (0 === ++$count % self::EXPORT_BATCH_SIZE) {
|
||||
$this->em->clear();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Libelle du site « Nom (Code) » (ex. « Chatellerault (86) »). Le code peut
|
||||
* etre absent : on retombe alors sur le seul nom.
|
||||
*/
|
||||
private function formatSite(?Site $site): string
|
||||
{
|
||||
if (null === $site) {
|
||||
return '';
|
||||
}
|
||||
|
||||
$name = (string) $site->getName();
|
||||
$code = $site->getCode();
|
||||
|
||||
return null !== $code && '' !== $code ? sprintf('%s (%s)', $name, $code) : $name;
|
||||
}
|
||||
|
||||
/**
|
||||
* Libelles FR des etats du stockage, dans l'ordre canonique (Réception,
|
||||
* Production, Triage), joints par virgule. Une valeur inattendue est ignoree.
|
||||
*/
|
||||
private function formatStates(Storage $storage): string
|
||||
{
|
||||
$states = $storage->getStates();
|
||||
|
||||
$labels = [];
|
||||
foreach (self::STATE_LABELS as $code => $label) {
|
||||
if (in_array($code, $states, true)) {
|
||||
$labels[] = $label;
|
||||
}
|
||||
}
|
||||
|
||||
return implode(', ', $labels);
|
||||
}
|
||||
|
||||
/**
|
||||
* Formate un horodatage en « jj/mm/aaaa hh:mm » (vide si null).
|
||||
*/
|
||||
private function formatDate(?DateTimeImmutable $date): string
|
||||
{
|
||||
return $date?->format('d/m/Y H:i') ?? '';
|
||||
}
|
||||
|
||||
private function buildResponse(string $binary): Response
|
||||
{
|
||||
$filename = sprintf('stockages-%s.xlsx', new DateTimeImmutable()->format('Ymd'));
|
||||
|
||||
$response = new Response($binary);
|
||||
$response->headers->set('Content-Type', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet');
|
||||
$response->headers->set('Content-Disposition', sprintf('attachment; filename="%s"', $filename));
|
||||
|
||||
return $response;
|
||||
}
|
||||
}
|
||||
@@ -7,6 +7,7 @@ namespace App\Module\Catalog\Infrastructure\Doctrine;
|
||||
use App\Module\Catalog\Domain\Entity\Storage;
|
||||
use App\Module\Catalog\Domain\Repository\StorageRepositoryInterface;
|
||||
use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
|
||||
use Doctrine\ORM\QueryBuilder;
|
||||
use Doctrine\Persistence\ManagerRegistry;
|
||||
|
||||
/**
|
||||
@@ -29,4 +30,110 @@ class DoctrineStorageRepository extends ServiceEntityRepository implements Stora
|
||||
$this->getEntityManager()->persist($storage);
|
||||
$this->getEntityManager()->flush();
|
||||
}
|
||||
|
||||
public function existsActiveBySiteTypeNumero(
|
||||
int $siteId,
|
||||
int $storageTypeId,
|
||||
string $numero,
|
||||
?int $excludeId = null,
|
||||
): bool {
|
||||
$qb = $this->createQueryBuilder('s')
|
||||
->select('1')
|
||||
->andWhere('s.site = :siteId')
|
||||
->andWhere('s.storageType = :storageTypeId')
|
||||
->andWhere('s.numero = :numero')
|
||||
->andWhere('s.deletedAt IS NULL')
|
||||
->setParameter('siteId', $siteId)
|
||||
->setParameter('storageTypeId', $storageTypeId)
|
||||
->setParameter('numero', $numero)
|
||||
->setMaxResults(1)
|
||||
;
|
||||
|
||||
if (null !== $excludeId) {
|
||||
$qb->andWhere('s.id != :excludeId')->setParameter('excludeId', $excludeId);
|
||||
}
|
||||
|
||||
return [] !== $qb->getQuery()->getResult();
|
||||
}
|
||||
|
||||
public function createListQueryBuilder(
|
||||
bool $includeDeleted = false,
|
||||
?string $search = null,
|
||||
array $siteIds = [],
|
||||
?int $storageTypeId = null,
|
||||
?string $state = null,
|
||||
): QueryBuilder {
|
||||
// Eager-load des relations embarquees en liste (storage:read) pour eviter un
|
||||
// N+1 par stockage : site et storageType sont des ManyToOne (to-ONE, sures —
|
||||
// pas de duplication de lignes, contrairement aux ManyToMany du Product). Les
|
||||
// jointures servent aussi le tri (site.code, storageType.label).
|
||||
$qb = $this->createQueryBuilder('s')
|
||||
->leftJoin('s.site', 'site')->addSelect('site')
|
||||
->leftJoin('s.storageType', 'st')->addSelect('st')
|
||||
->orderBy('site.code', 'ASC')
|
||||
->addOrderBy('st.label', 'ASC')
|
||||
->addOrderBy('s.numero', 'ASC')
|
||||
;
|
||||
|
||||
// RG-7.07 : la liste exclut par defaut les stockages soft-deleted.
|
||||
if (!$includeDeleted) {
|
||||
$qb->andWhere('s.deletedAt IS NULL');
|
||||
}
|
||||
|
||||
// ?search= : recherche partielle case-insensitive sur numero. Les
|
||||
// metacaracteres LIKE (%, _, \) sont echappes pour rester litteraux.
|
||||
if (null !== $search && '' !== trim($search)) {
|
||||
$escaped = str_replace(['\\', '%', '_'], ['\\\\', '\%', '\_'], trim($search));
|
||||
$pattern = '%'.mb_strtolower($escaped, 'UTF-8').'%';
|
||||
$qb->andWhere('LOWER(s.numero) LIKE :search')->setParameter('search', $pattern);
|
||||
}
|
||||
|
||||
// ?siteId[]= : stockage rattache a AU MOINS UN des sites passes (OR). site est
|
||||
// un ManyToOne (to-one) -> filtre direct sur la jointure, sans sous-requete
|
||||
// EXISTS ni risque de masquer une collection (≠ Product.sites M2M).
|
||||
if ([] !== $siteIds) {
|
||||
$qb->andWhere('site.id IN (:siteIds)')->setParameter('siteIds', $siteIds);
|
||||
}
|
||||
|
||||
// ?storageTypeId= : filtre par type de stockage precis (id).
|
||||
if (null !== $storageTypeId) {
|
||||
$qb->andWhere('st.id = :storageTypeId')->setParameter('storageTypeId', $storageTypeId);
|
||||
}
|
||||
|
||||
// ?state= : appartenance a la colonne JSONB `states`. DQL ne sait pas exprimer
|
||||
// la containment jsonb -> on resout les ids matchant en SQL natif (operateur
|
||||
// @>), puis on contraint le QueryBuilder. Ids vides -> condition toujours
|
||||
// fausse (aucun stockage), sans casser le reste de la requete.
|
||||
if (null !== $state) {
|
||||
$stateIds = $this->matchingStateIds($state);
|
||||
if ([] === $stateIds) {
|
||||
$qb->andWhere('1 = 0');
|
||||
} else {
|
||||
$qb->andWhere('s.id IN (:stateIds)')->setParameter('stateIds', $stateIds);
|
||||
}
|
||||
}
|
||||
|
||||
return $qb;
|
||||
}
|
||||
|
||||
/**
|
||||
* Ids des stockages dont la colonne JSONB `states` contient l'etat donne, via
|
||||
* l'operateur de containment Postgres `@>`. L'etat est borne a l'enum
|
||||
* {RECEPTION, PRODUCTION, TRIAGE} en amont (StorageProvider) — pas de saisie
|
||||
* libre ici.
|
||||
*
|
||||
* @return list<int>
|
||||
*/
|
||||
private function matchingStateIds(string $state): array
|
||||
{
|
||||
$rows = $this->getEntityManager()->getConnection()
|
||||
->executeQuery(
|
||||
'SELECT id FROM storage WHERE states @> CAST(:state AS JSONB)',
|
||||
['state' => (string) json_encode([$state])],
|
||||
)
|
||||
->fetchFirstColumn()
|
||||
;
|
||||
|
||||
return array_map(static fn (mixed $id): int => (int) $id, $rows);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -5,10 +5,15 @@ declare(strict_types=1);
|
||||
namespace App\Shared\Infrastructure\Export;
|
||||
|
||||
use App\Shared\Domain\Contract\SpreadsheetExporterInterface;
|
||||
use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
|
||||
use PhpOffice\PhpSpreadsheet\Cell\DataType;
|
||||
use PhpOffice\PhpSpreadsheet\Spreadsheet;
|
||||
use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
|
||||
use PhpOffice\PhpSpreadsheet\Writer\Xlsx;
|
||||
use RuntimeException;
|
||||
|
||||
use function is_string;
|
||||
|
||||
/**
|
||||
* Implementation XLSX du contrat d'export via la librairie PhpSpreadsheet.
|
||||
*
|
||||
@@ -31,19 +36,45 @@ final class PhpSpreadsheetExporter implements SpreadsheetExporterInterface
|
||||
$sheet->setTitle($this->sanitizeSheetTitle($sheetTitle));
|
||||
|
||||
// Ligne 1 : en-tete.
|
||||
$sheet->fromArray($headers, null, 'A1');
|
||||
$this->writeRow($sheet, $headers, 1);
|
||||
|
||||
// Lignes 2..n : donnees. Iteration manuelle pour supporter un iterable
|
||||
// paresseux (generator) sans tout materialiser en memoire.
|
||||
$rowNumber = 2;
|
||||
foreach ($rows as $row) {
|
||||
$sheet->fromArray($row, null, 'A'.$rowNumber);
|
||||
$this->writeRow($sheet, $row, $rowNumber);
|
||||
++$rowNumber;
|
||||
}
|
||||
|
||||
return $this->toBinary($spreadsheet);
|
||||
}
|
||||
|
||||
/**
|
||||
* Ecrit une ligne cellule par cellule. Toute valeur CHAINE est ecrite en type
|
||||
* STRING explicite (jamais interpretee comme formule), ce qui neutralise
|
||||
* l'injection de formules / DDE (« CSV / Formula injection ») : une cellule dont
|
||||
* la valeur commence par `=` `+` `-` `@` (saisie utilisateur, ex. un numero) n'est
|
||||
* pas evaluee a l'ouverture du fichier, et ce SANS apostrophe visible. Les valeurs
|
||||
* non-chaines (int / float / null) gardent leur type naturel.
|
||||
*
|
||||
* @param list<null|scalar> $row
|
||||
*/
|
||||
private function writeRow(Worksheet $sheet, array $row, int $rowNumber): void
|
||||
{
|
||||
$column = 1;
|
||||
foreach ($row as $value) {
|
||||
$coordinate = Coordinate::stringFromColumnIndex($column).$rowNumber;
|
||||
|
||||
if (is_string($value)) {
|
||||
$sheet->setCellValueExplicit($coordinate, $value, DataType::TYPE_STRING);
|
||||
} else {
|
||||
$sheet->setCellValue($coordinate, $value);
|
||||
}
|
||||
|
||||
++$column;
|
||||
}
|
||||
}
|
||||
|
||||
private function toBinary(Spreadsheet $spreadsheet): string
|
||||
{
|
||||
$writer = new Xlsx($spreadsheet);
|
||||
|
||||
@@ -92,6 +92,7 @@ final class EntityConstraintsHaveFrenchMessageTest extends TestCase
|
||||
Assert\NotNull::class,
|
||||
Assert\Email::class,
|
||||
Assert\Choice::class,
|
||||
Assert\Unique::class,
|
||||
Assert\Regex::class,
|
||||
Assert\Bic::class,
|
||||
Assert\Iban::class,
|
||||
|
||||
@@ -0,0 +1,202 @@
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace App\Tests\Module\Catalog\Api;
|
||||
|
||||
use ApiPlatform\Symfony\Bundle\Test\Client;
|
||||
use App\Module\Catalog\Domain\Entity\Storage;
|
||||
use App\Module\Catalog\Domain\Entity\StorageType;
|
||||
use App\Module\Sites\Domain\Entity\Site;
|
||||
use DateTimeImmutable;
|
||||
use Symfony\Contracts\HttpClient\ResponseInterface;
|
||||
|
||||
/**
|
||||
* Classe de base des tests fonctionnels de l'entite Storage (M7, module Catalog).
|
||||
*
|
||||
* Etend la base Catalog (helpers d'auth + personas metier) et ajoute ce qu'il faut
|
||||
* pour exercer l'API stockage de bout en bout :
|
||||
* - `seedStorageType()` : type de stockage de test (code prefixe pour cleanup).
|
||||
* - `firstSite()` / `siteByCode()` : sites fixtures (86 / 17 / 82).
|
||||
* - `authView()` : user non-admin portant la permission `catalog.storages.view`.
|
||||
* - `validStoragePayload()` : payload POST de reference (IRIs site / storageType),
|
||||
* surchargeable par cle.
|
||||
* - `seedStorageEntity()` : seede un stockage via l'EM (id existant, soft-deleted).
|
||||
* - `iri()` / `memberById()` / `violationPaths()` : utilitaires Hydra.
|
||||
*
|
||||
* Cleanup : on purge les stockages (toute la table — aucune fixture stockage en env
|
||||
* test) AVANT le parent, car storage reference site / storage_type en FK ON DELETE
|
||||
* RESTRICT. Les types de stockage de test (prefixe code) sont purges dans la foulee.
|
||||
*
|
||||
* @internal
|
||||
*/
|
||||
abstract class AbstractStorageApiTestCase extends AbstractCatalogApiTestCase
|
||||
{
|
||||
protected const string LD = 'application/ld+json';
|
||||
protected const string MERGE = 'application/merge-patch+json';
|
||||
|
||||
/** Prefixe des codes de StorageType seedes par ces tests (purge ciblee). */
|
||||
protected const string TEST_STORAGE_TYPE_PREFIX = 'TESTSTO';
|
||||
|
||||
protected function tearDown(): void
|
||||
{
|
||||
$em = $this->getEm();
|
||||
|
||||
// Stockages d'abord : ils referencent site / storage_type en FK RESTRICT.
|
||||
$em->createQuery('DELETE FROM '.Storage::class)->execute();
|
||||
|
||||
// Types de stockage de test (prefixe code).
|
||||
$em->createQuery('DELETE FROM '.StorageType::class.' s WHERE s.code LIKE :prefix')
|
||||
->setParameter('prefix', self::TEST_STORAGE_TYPE_PREFIX.'%')
|
||||
->execute()
|
||||
;
|
||||
|
||||
parent::tearDown();
|
||||
}
|
||||
|
||||
/**
|
||||
* Cree un type de stockage de test (code prefixe TESTSTO pour le cleanup).
|
||||
*/
|
||||
protected function seedStorageType(string $label = 'Cellule test'): StorageType
|
||||
{
|
||||
$em = $this->getEm();
|
||||
|
||||
$storageType = new StorageType();
|
||||
$storageType->setCode($this->uniqueCode(self::TEST_STORAGE_TYPE_PREFIX));
|
||||
$storageType->setLabel($label);
|
||||
|
||||
$em->persist($storageType);
|
||||
$em->flush();
|
||||
|
||||
return $storageType;
|
||||
}
|
||||
|
||||
protected function siteByCode(string $code): Site
|
||||
{
|
||||
$site = $this->getEm()->getRepository(Site::class)->findOneBy(['code' => $code]);
|
||||
self::assertInstanceOf(Site::class, $site, sprintf('Le site de code "%s" doit etre seede.', $code));
|
||||
|
||||
return $site;
|
||||
}
|
||||
|
||||
protected function firstSite(): Site
|
||||
{
|
||||
$site = $this->getEm()->getRepository(Site::class)->findOneBy([]);
|
||||
self::assertInstanceOf(Site::class, $site, 'Un site fixture est requis (SitesFixtures).');
|
||||
|
||||
return $site;
|
||||
}
|
||||
|
||||
/**
|
||||
* Client non-admin portant seulement `catalog.storages.view`.
|
||||
*/
|
||||
protected function authView(): Client
|
||||
{
|
||||
$creds = $this->createUserWithPermission('catalog.storages.view');
|
||||
|
||||
return $this->authenticatedClient($creds['username'], $creds['password']);
|
||||
}
|
||||
|
||||
/**
|
||||
* Payload POST de reference : un stockage valide (1 site, 1 type, 1 numero,
|
||||
* 1 etat). Surchargeable par cle via $overrides (ex: ['numero' => 'A1']).
|
||||
*
|
||||
* @param array<string, mixed> $overrides
|
||||
*
|
||||
* @return array<string, mixed>
|
||||
*/
|
||||
protected function validStoragePayload(array $overrides = []): array
|
||||
{
|
||||
$site = $this->firstSite();
|
||||
$storageType = $this->seedStorageType();
|
||||
|
||||
$base = [
|
||||
'site' => $this->iri('sites', (int) $site->getId()),
|
||||
'storageType' => $this->iri('storage_types', (int) $storageType->getId()),
|
||||
'numero' => $this->uniqueCode('NUM'),
|
||||
'states' => [Storage::STATE_RECEPTION],
|
||||
];
|
||||
|
||||
return array_replace($base, $overrides);
|
||||
}
|
||||
|
||||
/**
|
||||
* Seede un stockage directement via l'EM (bypass Processor/Validator). Utile pour
|
||||
* disposer d'un id existant (RBAC item, PATCH) ou d'un stockage soft-deleted
|
||||
* (reutilisation du triplet — RG-7.01). Le site / le type manquants sont crees
|
||||
* a la volee.
|
||||
*
|
||||
* @param list<string> $states
|
||||
*/
|
||||
protected function seedStorageEntity(
|
||||
?string $numero = null,
|
||||
array $states = [Storage::STATE_RECEPTION],
|
||||
?DateTimeImmutable $deletedAt = null,
|
||||
?Site $site = null,
|
||||
?StorageType $storageType = null,
|
||||
): Storage {
|
||||
$em = $this->getEm();
|
||||
$site ??= $this->firstSite();
|
||||
|
||||
$storage = new Storage();
|
||||
$storage->setSite($em->getReference(Site::class, (int) $site->getId()));
|
||||
$storage->setStorageType($storageType ?? $this->seedStorageType('Seed'));
|
||||
$storage->setNumero($numero ?? $this->uniqueCode('NUM'));
|
||||
$storage->setStates($states);
|
||||
$storage->setDeletedAt($deletedAt);
|
||||
|
||||
$em->persist($storage);
|
||||
$em->flush();
|
||||
|
||||
return $storage;
|
||||
}
|
||||
|
||||
/**
|
||||
* Construit un IRI API Platform (`/api/{resource}/{id}`).
|
||||
*/
|
||||
protected function iri(string $resource, int $id): string
|
||||
{
|
||||
return sprintf('/api/%s/%d', $resource, $id);
|
||||
}
|
||||
|
||||
/**
|
||||
* Identifiant unique de test (prefixe + nonce), deja en MAJUSCULE.
|
||||
*/
|
||||
protected function uniqueCode(string $prefix): string
|
||||
{
|
||||
return $prefix.'_'.strtoupper(substr(bin2hex(random_bytes(5)), 0, 10));
|
||||
}
|
||||
|
||||
/**
|
||||
* Extrait les `propertyPath` des violations d'une reponse 422.
|
||||
*
|
||||
* @return list<string>
|
||||
*/
|
||||
protected function violationPaths(ResponseInterface $response): array
|
||||
{
|
||||
$body = $response->toArray(false);
|
||||
|
||||
return array_values(array_map(
|
||||
static fn (array $violation): string => (string) ($violation['propertyPath'] ?? ''),
|
||||
$body['violations'] ?? [],
|
||||
));
|
||||
}
|
||||
|
||||
/**
|
||||
* Retrouve un membre d'une collection Hydra par son id (ou null).
|
||||
*
|
||||
* @param array<string, mixed> $list
|
||||
*
|
||||
* @return null|array<string, mixed>
|
||||
*/
|
||||
protected function memberById(array $list, int $id): ?array
|
||||
{
|
||||
foreach ($list['member'] ?? [] as $member) {
|
||||
if (($member['id'] ?? null) === $id) {
|
||||
return $member;
|
||||
}
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,39 @@
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace App\Tests\Module\Catalog\Api;
|
||||
|
||||
use App\Module\Catalog\Domain\Entity\Storage;
|
||||
|
||||
/**
|
||||
* RG-7.05 : `displayName` (getter virtuel, non persiste) = « <label du type> <numero> ».
|
||||
*
|
||||
* On asserte sur le CORPS JSON reel renvoye par l'API (pas sur le getter PHP), pour
|
||||
* figer le contrat consomme par le front.
|
||||
*
|
||||
* @internal
|
||||
*/
|
||||
final class StorageDisplayNameTest extends AbstractStorageApiTestCase
|
||||
{
|
||||
public function testDisplayNameConcatenatesLabelAndNumero(): void
|
||||
{
|
||||
$site = $this->firstSite();
|
||||
$type = $this->seedStorageType('Boisseau');
|
||||
$numero = $this->uniqueCode('NUM');
|
||||
|
||||
$client = $this->createAdminClient();
|
||||
$created = $client->request('POST', '/api/storages', [
|
||||
'headers' => ['Content-Type' => self::LD],
|
||||
'json' => [
|
||||
'site' => $this->iri('sites', (int) $site->getId()),
|
||||
'storageType' => $this->iri('storage_types', (int) $type->getId()),
|
||||
'numero' => $numero,
|
||||
'states' => [Storage::STATE_RECEPTION],
|
||||
],
|
||||
])->toArray();
|
||||
|
||||
self::assertResponseStatusCodeSame(201);
|
||||
self::assertSame('Boisseau '.$numero, $created['displayName'] ?? null);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,248 @@
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace App\Tests\Module\Catalog\Api;
|
||||
|
||||
use App\Module\Catalog\Domain\Entity\Storage;
|
||||
use DateTimeImmutable;
|
||||
use PhpOffice\PhpSpreadsheet\IOFactory;
|
||||
|
||||
/**
|
||||
* Tests fonctionnels de l'export XLSX des stockages (M7, § 4.5) — ERP-214.
|
||||
*
|
||||
* Couvre : reponse 200 (Content-Type + Content-Disposition + en-tetes de colonnes),
|
||||
* exclusion des stockages soft-deleted par defaut (RG-7.07), respect des filtres
|
||||
* ?search (numero) / ?storageTypeId / ?state, peuplement des colonnes metier
|
||||
* (displayName, site « Nom (Code) », type, numero, etats joints, dates), 403 sans
|
||||
* catalog.storages.view, 401 anonyme.
|
||||
*
|
||||
* @internal
|
||||
*/
|
||||
final class StorageExportControllerTest extends AbstractStorageApiTestCase
|
||||
{
|
||||
private const string XLSX_MIME = 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet';
|
||||
private const string EXPORT_URL = '/api/storages/export.xlsx';
|
||||
|
||||
public function testExportReturnsXlsxResponseWithHeaderRow(): void
|
||||
{
|
||||
$client = $this->createAdminClient();
|
||||
$this->seedStorageEntity('NUM-A');
|
||||
|
||||
$response = $client->request('GET', self::EXPORT_URL);
|
||||
|
||||
self::assertResponseIsSuccessful();
|
||||
$headers = $response->getHeaders(false);
|
||||
self::assertStringContainsString(self::XLSX_MIME, $headers['content-type'][0] ?? '');
|
||||
|
||||
$disposition = $headers['content-disposition'][0] ?? '';
|
||||
self::assertStringContainsString('attachment; filename="stockages-', $disposition);
|
||||
self::assertMatchesRegularExpression('/filename="stockages-\d{8}\.xlsx"/', $disposition);
|
||||
|
||||
// Le binaire est un XLSX relisible dont la 1re ligne porte les en-tetes (§ 4.5).
|
||||
$headerCells = $this->gridFromResponse($response->getContent())[0];
|
||||
self::assertSame('Nom', $headerCells[0]);
|
||||
self::assertSame('Site', $headerCells[1]);
|
||||
self::assertSame('Type de stockage', $headerCells[2]);
|
||||
self::assertSame('Numéro', $headerCells[3]);
|
||||
self::assertSame('États', $headerCells[4]);
|
||||
self::assertSame('Créé le', $headerCells[5]);
|
||||
self::assertSame('Modifié le', $headerCells[6]);
|
||||
|
||||
// Au moins une ligne de donnees (le stockage seede) reperee par son numero.
|
||||
self::assertContains('NUM-A', $this->numeros($response->getContent()));
|
||||
}
|
||||
|
||||
public function testExportExcludesSoftDeletedByDefault(): void
|
||||
{
|
||||
$client = $this->createAdminClient();
|
||||
$this->seedStorageEntity('NUM-ACTIVE');
|
||||
$this->seedStorageEntity('NUM-DELETED', deletedAt: new DateTimeImmutable());
|
||||
|
||||
$numeros = $this->numeros($client->request('GET', self::EXPORT_URL)->getContent());
|
||||
|
||||
self::assertContains('NUM-ACTIVE', $numeros);
|
||||
self::assertNotContains('NUM-DELETED', $numeros);
|
||||
}
|
||||
|
||||
public function testExportRespectsSearchFilter(): void
|
||||
{
|
||||
$client = $this->createAdminClient();
|
||||
$this->seedStorageEntity('ALPHA-1');
|
||||
$this->seedStorageEntity('BETA-2');
|
||||
|
||||
$numeros = $this->numeros(
|
||||
$client->request('GET', self::EXPORT_URL.'?search=alpha')->getContent(),
|
||||
);
|
||||
|
||||
self::assertContains('ALPHA-1', $numeros);
|
||||
self::assertNotContains('BETA-2', $numeros);
|
||||
}
|
||||
|
||||
public function testExportRespectsStorageTypeFilter(): void
|
||||
{
|
||||
$client = $this->createAdminClient();
|
||||
|
||||
$typeA = $this->seedStorageType('Cellule A');
|
||||
$typeB = $this->seedStorageType('Cellule B');
|
||||
$this->seedStorageEntity('TYPE-A', storageType: $typeA);
|
||||
$this->seedStorageEntity('TYPE-B', storageType: $typeB);
|
||||
|
||||
$numeros = $this->numeros(
|
||||
$client->request('GET', self::EXPORT_URL.'?storageTypeId='.$typeA->getId())->getContent(),
|
||||
);
|
||||
|
||||
self::assertContains('TYPE-A', $numeros);
|
||||
self::assertNotContains('TYPE-B', $numeros);
|
||||
}
|
||||
|
||||
public function testExportRespectsStateFilter(): void
|
||||
{
|
||||
$client = $this->createAdminClient();
|
||||
$this->seedStorageEntity('STATE-PROD', [Storage::STATE_PRODUCTION]);
|
||||
$this->seedStorageEntity('STATE-RECEP', [Storage::STATE_RECEPTION]);
|
||||
|
||||
$numeros = $this->numeros(
|
||||
$client->request('GET', self::EXPORT_URL.'?state=PRODUCTION')->getContent(),
|
||||
);
|
||||
|
||||
self::assertContains('STATE-PROD', $numeros);
|
||||
self::assertNotContains('STATE-RECEP', $numeros);
|
||||
}
|
||||
|
||||
public function testExportPopulatesAllBusinessColumns(): void
|
||||
{
|
||||
$client = $this->createAdminClient();
|
||||
|
||||
$site = $this->firstSite();
|
||||
$type = $this->seedStorageType('Cellule');
|
||||
$this->seedStorageEntity(
|
||||
'C3',
|
||||
[Storage::STATE_RECEPTION, Storage::STATE_TRIAGE],
|
||||
site: $site,
|
||||
storageType: $type,
|
||||
);
|
||||
|
||||
$row = $this->rowForNumero($client->request('GET', self::EXPORT_URL)->getContent(), 'C3');
|
||||
self::assertNotNull($row, 'Le stockage seede est absent de l\'export.');
|
||||
|
||||
// 0 Nom | 1 Site | 2 Type | 3 Numéro | 4 États | 5 Créé le | 6 Modifié le
|
||||
self::assertSame('Cellule C3', $row[0]);
|
||||
self::assertSame(sprintf('%s (%s)', $site->getName(), $site->getCode()), $row[1]);
|
||||
self::assertSame('Cellule', $row[2]);
|
||||
self::assertSame('C3', $row[3]);
|
||||
// Ordre canonique (Réception avant Triage) independamment de l'ordre en base.
|
||||
self::assertSame('Réception, Triage', $row[4]);
|
||||
// Dates renseignees (Timestampable) au format jj/mm/aaaa hh:mm.
|
||||
self::assertMatchesRegularExpression('#^\d{2}/\d{2}/\d{4} \d{2}:\d{2}$#', (string) $row[5]);
|
||||
self::assertMatchesRegularExpression('#^\d{2}/\d{2}/\d{4} \d{2}:\d{2}$#', (string) $row[6]);
|
||||
}
|
||||
|
||||
public function testFormulaInjectionIsNeutralized(): void
|
||||
{
|
||||
$client = $this->createAdminClient();
|
||||
|
||||
// Numero malicieux commencant par « = » (injection de formule / DDE). Seede en
|
||||
// direct (le numero contournerait de toute facon le normalizer, qui ne fait
|
||||
// qu'un trim). L'export doit le restituer comme TEXTE litteral, jamais comme
|
||||
// une formule evaluee : si la cellule etait une formule, IOFactory::load la
|
||||
// calculerait (resultat 3 ou erreur) et « =1+2 » serait absent de la colonne.
|
||||
$this->seedStorageEntity('=1+2');
|
||||
|
||||
$numeros = $this->numeros($client->request('GET', self::EXPORT_URL)->getContent());
|
||||
|
||||
self::assertContains('=1+2', $numeros, 'Le numero « =1+2 » doit etre stocke en texte, pas evalue.');
|
||||
}
|
||||
|
||||
public function testExportKeepsSearchTermZero(): void
|
||||
{
|
||||
$client = $this->createAdminClient();
|
||||
$this->seedStorageEntity('0');
|
||||
$this->seedStorageEntity('X1');
|
||||
|
||||
// « 0 » est un numero valide : le filtre ?search=0 NE DOIT PAS etre coerce a
|
||||
// null (parite stricte avec la liste a l'ecran via StorageListFilters).
|
||||
$numeros = $this->numeros($client->request('GET', self::EXPORT_URL.'?search=0')->getContent());
|
||||
|
||||
self::assertContains('0', $numeros);
|
||||
self::assertNotContains('X1', $numeros);
|
||||
}
|
||||
|
||||
public function testExportToleratesArrayShapedScalarParam(): void
|
||||
{
|
||||
$client = $this->createAdminClient();
|
||||
$this->seedStorageEntity('NUM-ARR');
|
||||
|
||||
// ?search[]=foo : parametre tableau la ou un scalaire est attendu. L'export ne
|
||||
// doit pas planter en 400 (la liste le tolere) : la valeur est simplement
|
||||
// ignoree -> 200 avec tous les stockages.
|
||||
$response = $client->request('GET', self::EXPORT_URL.'?search[]=foo');
|
||||
|
||||
self::assertResponseIsSuccessful();
|
||||
self::assertContains('NUM-ARR', $this->numeros($response->getContent()));
|
||||
}
|
||||
|
||||
public function testForbiddenWithoutStoragesViewPermission(): void
|
||||
{
|
||||
$creds = $this->createUserWithPermission('core.users.view');
|
||||
$client = $this->authenticatedClient($creds['username'], $creds['password']);
|
||||
|
||||
$client->request('GET', self::EXPORT_URL);
|
||||
|
||||
self::assertResponseStatusCodeSame(403);
|
||||
}
|
||||
|
||||
public function testUnauthorizedWhenAnonymous(): void
|
||||
{
|
||||
$client = self::createClient();
|
||||
$client->request('GET', self::EXPORT_URL);
|
||||
|
||||
self::assertResponseStatusCodeSame(401);
|
||||
}
|
||||
|
||||
/**
|
||||
* Relit le binaire XLSX d'une reponse et renvoie la grille de cellules.
|
||||
*
|
||||
* @return array<int, array<int, mixed>>
|
||||
*/
|
||||
private function gridFromResponse(string $binary): array
|
||||
{
|
||||
$tmp = tempnam(sys_get_temp_dir(), 'xlsx_storage_export_test_');
|
||||
self::assertIsString($tmp);
|
||||
file_put_contents($tmp, $binary);
|
||||
|
||||
try {
|
||||
return IOFactory::load($tmp)->getActiveSheet()->toArray();
|
||||
} finally {
|
||||
@unlink($tmp);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Extrait la colonne « Numéro » (4e colonne, index 3) des lignes de donnees.
|
||||
*
|
||||
* @return list<string>
|
||||
*/
|
||||
private function numeros(string $binary): array
|
||||
{
|
||||
$rows = array_slice($this->gridFromResponse($binary), 1); // saute l'en-tete
|
||||
|
||||
return array_values(array_map(static fn (array $row): string => (string) ($row[3] ?? ''), $rows));
|
||||
}
|
||||
|
||||
/**
|
||||
* Renvoie la ligne de donnees dont la colonne « Numéro » vaut $numero, ou null.
|
||||
*
|
||||
* @return null|array<int, mixed>
|
||||
*/
|
||||
private function rowForNumero(string $binary, string $numero): ?array
|
||||
{
|
||||
foreach (array_slice($this->gridFromResponse($binary), 1) as $row) {
|
||||
if ((string) ($row[3] ?? '') === $numero) {
|
||||
return $row;
|
||||
}
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,90 @@
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace App\Tests\Module\Catalog\Api;
|
||||
|
||||
/**
|
||||
* RBAC du stockage (M7, ERP-210 — admin-only). Jumeau du ProductRBACMatrixTest.
|
||||
*
|
||||
* La matrice est volontairement tres restrictive : seul l'Admin porte
|
||||
* `catalog.storages.view` / `.manage`. Les 4 personas metier MALIO (Bureau, Compta,
|
||||
* Commerciale, Usine) n'ont AUCUNE permission stockage -> 403 partout. Un porteur de
|
||||
* `view` lit (200) mais ne peut pas creer (403). Anonyme -> 401.
|
||||
*
|
||||
* @internal
|
||||
*/
|
||||
final class StorageRBACMatrixTest extends AbstractStorageApiTestCase
|
||||
{
|
||||
/** Personas metier sans permission stockage (admin-only). */
|
||||
private const array PERSONAS = ['Bureau', 'Compta', 'Commerciale', 'Usine'];
|
||||
|
||||
public function testAdminHasFullAccess(): void
|
||||
{
|
||||
$client = $this->createAdminClient();
|
||||
|
||||
$client->request('GET', '/api/storages', ['headers' => ['Accept' => self::LD]]);
|
||||
self::assertResponseStatusCodeSame(200);
|
||||
|
||||
$client->request('POST', '/api/storages', [
|
||||
'headers' => ['Content-Type' => self::LD],
|
||||
'json' => $this->validStoragePayload(),
|
||||
]);
|
||||
self::assertResponseStatusCodeSame(201);
|
||||
}
|
||||
|
||||
public function testBusinessPersonasAreForbiddenEverywhere(): void
|
||||
{
|
||||
$storage = $this->seedStorageEntity();
|
||||
$id = (int) $storage->getId();
|
||||
|
||||
foreach (self::PERSONAS as $persona) {
|
||||
$client = $this->createPersonaClient($persona);
|
||||
|
||||
$client->request('GET', '/api/storages', ['headers' => ['Accept' => self::LD]]);
|
||||
self::assertResponseStatusCodeSame(403, $persona.' ne doit pas lister les stockages.');
|
||||
|
||||
$client->request('GET', '/api/storages/'.$id, ['headers' => ['Accept' => self::LD]]);
|
||||
self::assertResponseStatusCodeSame(403, $persona.' ne doit pas consulter un stockage.');
|
||||
|
||||
$client->request('POST', '/api/storages', [
|
||||
'headers' => ['Content-Type' => self::LD],
|
||||
'json' => $this->validStoragePayload(),
|
||||
]);
|
||||
self::assertResponseStatusCodeSame(403, $persona.' ne doit pas creer de stockage.');
|
||||
|
||||
$client->request('PATCH', '/api/storages/'.$id, [
|
||||
'headers' => ['Content-Type' => self::MERGE],
|
||||
'json' => ['numero' => 'X'],
|
||||
]);
|
||||
self::assertResponseStatusCodeSame(403, $persona.' ne doit pas modifier un stockage.');
|
||||
}
|
||||
}
|
||||
|
||||
public function testViewPermissionReadsButCannotManage(): void
|
||||
{
|
||||
$storage = $this->seedStorageEntity();
|
||||
$client = $this->authView();
|
||||
|
||||
$client->request('GET', '/api/storages', ['headers' => ['Accept' => self::LD]]);
|
||||
self::assertResponseStatusCodeSame(200);
|
||||
|
||||
$client->request('GET', '/api/storages/'.$storage->getId(), ['headers' => ['Accept' => self::LD]]);
|
||||
self::assertResponseStatusCodeSame(200);
|
||||
|
||||
// view sans manage : creation refusee au niveau securite (403).
|
||||
$client->request('POST', '/api/storages', [
|
||||
'headers' => ['Content-Type' => self::LD],
|
||||
'json' => $this->validStoragePayload(),
|
||||
]);
|
||||
self::assertResponseStatusCodeSame(403);
|
||||
}
|
||||
|
||||
public function testAnonymousIsUnauthorized(): void
|
||||
{
|
||||
$client = self::createClient();
|
||||
|
||||
$client->request('GET', '/api/storages', ['headers' => ['Accept' => self::LD]]);
|
||||
self::assertResponseStatusCodeSame(401);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,143 @@
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace App\Tests\Module\Catalog\Api;
|
||||
|
||||
use App\Module\Catalog\Domain\Entity\Storage;
|
||||
use DateTimeImmutable;
|
||||
|
||||
/**
|
||||
* Contrat de serialisation du stockage (M7, spec-back § 4.0 / § 4.0.bis).
|
||||
* Jumeau du ProductSerializationContractTest (M6).
|
||||
*
|
||||
* Capture le JSON REEL (liste + detail) via un stockage cree par l'API (POST reel,
|
||||
* normalisation serveur reelle) et reverifie les pieges du RETEX M1 transposes au
|
||||
* M7 :
|
||||
* #1 : `site` sort en OBJET embarque (site:read), jamais en IRI nu.
|
||||
* #2 : `storageType` sort en OBJET embarque (storage_type:read), jamais en IRI nu.
|
||||
* #3 : `states` = tableau de chaines.
|
||||
* #4 : `displayName` present et correct (RG-7.05 : « <label> <numero> »).
|
||||
*
|
||||
* REGLE D'OR : on asserte sur le CORPS JSON reel, jamais sur les annotations.
|
||||
* DoD (§ 4.0.bis) : avec STORAGE_DOD_DUMP positionnee, ecrit les corps liste +
|
||||
* detail sous /tmp pour les coller dans la spec avant les ecrans front.
|
||||
*
|
||||
* @internal
|
||||
*/
|
||||
final class StorageSerializationContractTest extends AbstractStorageApiTestCase
|
||||
{
|
||||
public function testListAndDetailSerializationContract(): void
|
||||
{
|
||||
$client = $this->createAdminClient();
|
||||
|
||||
$site = $this->firstSite();
|
||||
$type = $this->seedStorageType('Cellule');
|
||||
$numero = $this->uniqueCode('NUM');
|
||||
|
||||
// Stockage cree par un POST reel (2 etats pour exercer le tableau).
|
||||
$created = $client->request('POST', '/api/storages', [
|
||||
'headers' => ['Content-Type' => self::LD],
|
||||
'json' => [
|
||||
'site' => $this->iri('sites', (int) $site->getId()),
|
||||
'storageType' => $this->iri('storage_types', (int) $type->getId()),
|
||||
'numero' => $numero,
|
||||
'states' => [Storage::STATE_RECEPTION, Storage::STATE_TRIAGE],
|
||||
],
|
||||
])->toArray();
|
||||
|
||||
self::assertResponseStatusCodeSame(201);
|
||||
$id = (int) $created['id'];
|
||||
|
||||
$detail = $client->request('GET', '/api/storages/'.$id, [
|
||||
'headers' => ['Accept' => self::LD],
|
||||
])->toArray();
|
||||
$list = $client->request('GET', '/api/storages?search='.$numero, [
|
||||
'headers' => ['Accept' => self::LD],
|
||||
])->toArray();
|
||||
|
||||
// Enveloppe Hydra AP4 (member/totalItems sans prefixe hydra:).
|
||||
self::assertArrayHasKey('member', $list);
|
||||
self::assertArrayNotHasKey('hydra:member', $list);
|
||||
|
||||
$row = $this->memberById($list, $id);
|
||||
self::assertNotNull($row, 'Le stockage cree doit apparaitre dans la liste filtree.');
|
||||
|
||||
// === Piege #1 : site en OBJET embarque (pas IRI nu) ===
|
||||
self::assertIsArray($row['site'], 'site doit etre un objet embarque (site:read), pas un IRI nu.');
|
||||
self::assertArrayHasKey('name', $row['site']);
|
||||
self::assertArrayHasKey('code', $row['site']);
|
||||
|
||||
// === Piege #2 : storageType en OBJET embarque (pas IRI nu) ===
|
||||
self::assertIsArray($row['storageType'], 'storageType doit etre un objet embarque (storage_type:read), pas un IRI nu.');
|
||||
self::assertArrayHasKey('label', $row['storageType']);
|
||||
self::assertSame('Cellule', $row['storageType']['label']);
|
||||
|
||||
// === Piege #3 : states tableau de chaines ===
|
||||
self::assertSame([Storage::STATE_RECEPTION, Storage::STATE_TRIAGE], $row['states']);
|
||||
|
||||
// === Piege #4 : displayName present + correct (RG-7.05) ===
|
||||
self::assertArrayHasKey('displayName', $row);
|
||||
self::assertSame('Cellule '.$numero, $row['displayName']);
|
||||
|
||||
// === Piege #5 : le soft-delete n'est JAMAIS expose (§ 2.8) ===
|
||||
// `deletedAt` n'appartient a aucun groupe de lecture : un test « contrat » doit
|
||||
// garantir son ABSENCE, pas seulement la presence des champs attendus — sinon
|
||||
// un ajout accidentel a storage:read passerait au vert. (createdBy/updatedBy
|
||||
// sont, eux, exposes a dessein via la convention `default:read` du Trait
|
||||
// Timestampable/Blamable — au meme titre que createdAt/updatedAt.)
|
||||
self::assertArrayNotHasKey('deletedAt', $row, 'deletedAt ne doit pas etre expose en liste (§ 2.8).');
|
||||
self::assertArrayNotHasKey('deletedAt', $detail, 'deletedAt ne doit pas etre expose en detail (§ 2.8).');
|
||||
|
||||
// === DETAIL : memes garanties d'embarquement ===
|
||||
self::assertIsArray($detail['site']);
|
||||
self::assertArrayHasKey('name', $detail['site']);
|
||||
self::assertIsArray($detail['storageType']);
|
||||
self::assertArrayHasKey('label', $detail['storageType']);
|
||||
self::assertSame([Storage::STATE_RECEPTION, Storage::STATE_TRIAGE], $detail['states']);
|
||||
self::assertSame('Cellule '.$numero, $detail['displayName']);
|
||||
|
||||
$this->dumpDodIfRequested($list, $detail);
|
||||
}
|
||||
|
||||
/**
|
||||
* RG-7.07 : la liste (et le detail) n'exposent JAMAIS un stockage soft-deleted.
|
||||
* On seede 1 actif + 1 supprime pour que l'assertion de liste soit discriminante
|
||||
* (sinon, avec une collection vide, « absent » ne distingue pas l'exclusion du
|
||||
* soft-delete d'une page vide).
|
||||
*/
|
||||
public function testSoftDeletedIsNotExposed(): void
|
||||
{
|
||||
$active = $this->seedStorageEntity('SD-ACTIVE');
|
||||
$deleted = $this->seedStorageEntity('SD-DELETED', deletedAt: new DateTimeImmutable());
|
||||
|
||||
$client = $this->createAdminClient();
|
||||
|
||||
// Item soft-deleted -> 404 (§ 2.8).
|
||||
$client->request('GET', '/api/storages/'.$deleted->getId(), ['headers' => ['Accept' => self::LD]]);
|
||||
self::assertResponseStatusCodeSame(404);
|
||||
|
||||
// Collection : l'actif est present, le supprime est absent (RG-7.07).
|
||||
$list = $client->request('GET', '/api/storages', ['headers' => ['Accept' => self::LD]])->toArray();
|
||||
self::assertNotNull($this->memberById($list, (int) $active->getId()), 'Le stockage actif doit etre liste.');
|
||||
self::assertNull($this->memberById($list, (int) $deleted->getId()), 'Le stockage soft-deleted ne doit pas etre liste.');
|
||||
}
|
||||
|
||||
/**
|
||||
* DoD (§ 4.0.bis) : ecrit les corps JSON reels sous /tmp si STORAGE_DOD_DUMP est
|
||||
* positionnee (sinon no-op). A coller dans spec-back.md § 4.0.bis.
|
||||
*
|
||||
* @param array<string, mixed> $list
|
||||
* @param array<string, mixed> $detail
|
||||
*/
|
||||
private function dumpDodIfRequested(array $list, array $detail): void
|
||||
{
|
||||
if (false === getenv('STORAGE_DOD_DUMP')) {
|
||||
return;
|
||||
}
|
||||
|
||||
$flags = JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES;
|
||||
file_put_contents('/tmp/storage-dod-list.json', json_encode($list, $flags));
|
||||
file_put_contents('/tmp/storage-dod-detail.json', json_encode($detail, $flags));
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,111 @@
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace App\Tests\Module\Catalog\Api;
|
||||
|
||||
use App\Module\Catalog\Domain\Entity\Storage;
|
||||
|
||||
/**
|
||||
* RG-7.04 : `states` = multi-select ⊆ {RECEPTION, PRODUCTION, TRIAGE}, au moins 1
|
||||
* requis. RG-7.08 : le PATCH applique les memes regles que le POST.
|
||||
*
|
||||
* Couvre :
|
||||
* - tableau d'etats vide -> 422 (Assert\Count(min: 1)) sur le champ `states` ;
|
||||
* - valeur hors enum -> 422 (Assert\Choice) sur le champ `states` ;
|
||||
* - un seul etat valide -> 201 (borne basse acceptee) ;
|
||||
* - PATCH vers un tableau d'etats vide -> 422 (RG-7.08).
|
||||
*
|
||||
* @internal
|
||||
*/
|
||||
final class StorageStatesValidationTest extends AbstractStorageApiTestCase
|
||||
{
|
||||
public function testEmptyStatesIsRejected(): void
|
||||
{
|
||||
$client = $this->createAdminClient();
|
||||
|
||||
$response = $client->request('POST', '/api/storages', [
|
||||
'headers' => ['Content-Type' => self::LD],
|
||||
'json' => $this->validStoragePayload(['states' => []]),
|
||||
]);
|
||||
|
||||
self::assertResponseStatusCodeSame(422);
|
||||
self::assertContains('states', $this->violationPaths($response));
|
||||
}
|
||||
|
||||
public function testUnknownStateValueIsRejected(): void
|
||||
{
|
||||
$client = $this->createAdminClient();
|
||||
|
||||
$response = $client->request('POST', '/api/storages', [
|
||||
'headers' => ['Content-Type' => self::LD],
|
||||
'json' => $this->validStoragePayload(['states' => [Storage::STATE_RECEPTION, 'FOOBAR']]),
|
||||
]);
|
||||
|
||||
self::assertResponseStatusCodeSame(422);
|
||||
self::assertContains('states', $this->violationPaths($response));
|
||||
}
|
||||
|
||||
public function testSingleValidStateIsAccepted(): void
|
||||
{
|
||||
$client = $this->createAdminClient();
|
||||
|
||||
$client->request('POST', '/api/storages', [
|
||||
'headers' => ['Content-Type' => self::LD],
|
||||
'json' => $this->validStoragePayload(['states' => [Storage::STATE_PRODUCTION]]),
|
||||
]);
|
||||
|
||||
self::assertResponseStatusCodeSame(201);
|
||||
}
|
||||
|
||||
public function testPatchToEmptyStatesIsRejected(): void
|
||||
{
|
||||
$storage = $this->seedStorageEntity();
|
||||
|
||||
// RG-7.08 : la regle RG-7.04 vaut aussi en edition.
|
||||
$client = $this->createAdminClient();
|
||||
$response = $client->request('PATCH', '/api/storages/'.$storage->getId(), [
|
||||
'headers' => ['Content-Type' => self::MERGE],
|
||||
'json' => ['states' => []],
|
||||
]);
|
||||
|
||||
self::assertResponseStatusCodeSame(422);
|
||||
self::assertContains('states', $this->violationPaths($response));
|
||||
}
|
||||
|
||||
public function testDuplicateStatesAreRejected(): void
|
||||
{
|
||||
$client = $this->createAdminClient();
|
||||
|
||||
// Doublon dans le multi-select : 422 (Assert\Unique), pas un stockage avec un
|
||||
// tableau d'etats incoherent (RG-7.04 = sous-ensemble).
|
||||
$response = $client->request('POST', '/api/storages', [
|
||||
'headers' => ['Content-Type' => self::LD],
|
||||
'json' => $this->validStoragePayload([
|
||||
'states' => [Storage::STATE_TRIAGE, Storage::STATE_TRIAGE],
|
||||
]),
|
||||
]);
|
||||
|
||||
self::assertResponseStatusCodeSame(422);
|
||||
self::assertContains('states', $this->violationPaths($response));
|
||||
}
|
||||
|
||||
public function testNonSequentialStatesDoNotCrash(): void
|
||||
{
|
||||
$client = $this->createAdminClient();
|
||||
|
||||
// `states` envoye comme OBJET JSON (cle non sequentielle) : auparavant
|
||||
// persiste tel quel en JSONB objet -> le CHECK jsonb_array_length plantait en
|
||||
// 500. Doit desormais etre renormalise en liste sequentielle (array_values du
|
||||
// setter), donc accepte proprement sans 500.
|
||||
$created = $client->request('POST', '/api/storages', [
|
||||
'headers' => ['Content-Type' => self::LD],
|
||||
'json' => $this->validStoragePayload([
|
||||
'states' => [7 => Storage::STATE_RECEPTION],
|
||||
]),
|
||||
])->toArray();
|
||||
|
||||
self::assertResponseStatusCodeSame(201);
|
||||
self::assertSame([Storage::STATE_RECEPTION], $created['states']);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,34 @@
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace App\Tests\Module\Catalog\Api;
|
||||
|
||||
/**
|
||||
* RG-7.03 : « le type de stockage doit etre disponible sur le site choisi ».
|
||||
*
|
||||
* VOLONTAIREMENT NON IMPLEMENTEE (decision validee avec Tristan, ERP-213) : le
|
||||
* concept type<->site a ete RETIRE du modele en M6. La jointure storage_type_site a
|
||||
* ete droppee (migration Version20260626100000) et StorageType est devenu un
|
||||
* referentiel PLAT, sans relation `sites` — l'entite le documente explicitement
|
||||
* (« un type n'est PAS rattache a des sites ; la dispo releve de la future entite
|
||||
* Stockage »). C'est desormais l'entite Storage (1 site + 1 type) qui MATERIALISE
|
||||
* cette disponibilite ; il n'existe plus de referentiel a interroger pour lever une
|
||||
* 422. RG-7.03 est donc inimplementable telle quelle.
|
||||
*
|
||||
* Ce test est conserve (skippe) pour la TRACABILITE DoD : il documente le gap dans
|
||||
* la suite et devra etre reactive si la spec reintroduit un lien type<->site.
|
||||
*
|
||||
* @internal
|
||||
*/
|
||||
final class StorageTypeBySiteTest extends AbstractStorageApiTestCase
|
||||
{
|
||||
public function testTypeUnavailableOnSiteIsRejected(): void
|
||||
{
|
||||
self::markTestSkipped(
|
||||
'RG-7.03 non portee : StorageType est un referentiel plat depuis le M6 '
|
||||
.'(jointure storage_type_site droppee). Aucun referentiel type<->site a '
|
||||
.'interroger. A reclarifier cote spec (cf. ERP-213).',
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,121 @@
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace App\Tests\Module\Catalog\Api;
|
||||
|
||||
use App\Module\Catalog\Domain\Entity\Storage;
|
||||
use App\Module\Catalog\Domain\Entity\StorageType;
|
||||
use App\Module\Sites\Domain\Entity\Site;
|
||||
use DateTimeImmutable;
|
||||
|
||||
use function count;
|
||||
|
||||
/**
|
||||
* RG-7.01 : unicite metier du triplet (site, storageType, numero) parmi les ACTIFS.
|
||||
* RG-7.08 : le PATCH applique les memes regles que le POST.
|
||||
*
|
||||
* Couvre :
|
||||
* - 409 sur doublon de triplet actif (pre-check deterministe du Processor) ;
|
||||
* - meme numero accepte sur un AUTRE site, ou sur un AUTRE type (unicite portee
|
||||
* par le triplet complet, pas le seul numero) ;
|
||||
* - reutilisation possible d'un triplet porte par un stockage soft-deleted (l'index
|
||||
* partiel uq_storage_site_type_numero_active ne contraint que les actifs) ;
|
||||
* - PATCH d'un numero vers un triplet deja pris -> 409 (RG-7.08).
|
||||
*
|
||||
* @internal
|
||||
*/
|
||||
final class StorageUniquenessTest extends AbstractStorageApiTestCase
|
||||
{
|
||||
public function testDuplicateActiveTripletReturns409(): void
|
||||
{
|
||||
$site = $this->firstSite();
|
||||
$type = $this->seedStorageType();
|
||||
$this->seedStorageEntity('A1', site: $site, storageType: $type);
|
||||
|
||||
$client = $this->createAdminClient();
|
||||
$client->request('POST', '/api/storages', [
|
||||
'headers' => ['Content-Type' => self::LD],
|
||||
'json' => $this->tripletPayload($site, $type, 'A1'),
|
||||
]);
|
||||
self::assertResponseStatusCodeSame(409);
|
||||
}
|
||||
|
||||
public function testSameNumeroOnAnotherTypeIsAccepted(): void
|
||||
{
|
||||
$site = $this->firstSite();
|
||||
$typeA = $this->seedStorageType();
|
||||
$typeB = $this->seedStorageType();
|
||||
$this->seedStorageEntity('A1', site: $site, storageType: $typeA);
|
||||
|
||||
$client = $this->createAdminClient();
|
||||
$client->request('POST', '/api/storages', [
|
||||
'headers' => ['Content-Type' => self::LD],
|
||||
'json' => $this->tripletPayload($site, $typeB, 'A1'),
|
||||
]);
|
||||
self::assertResponseStatusCodeSame(201);
|
||||
}
|
||||
|
||||
public function testSameNumeroOnAnotherSiteIsAccepted(): void
|
||||
{
|
||||
$sites = $this->getEm()->getRepository(Site::class)->findAll();
|
||||
if (count($sites) < 2) {
|
||||
self::markTestSkipped('Au moins 2 sites fixtures requis pour ce cas.');
|
||||
}
|
||||
|
||||
$type = $this->seedStorageType();
|
||||
$this->seedStorageEntity('A1', site: $sites[0], storageType: $type);
|
||||
|
||||
$client = $this->createAdminClient();
|
||||
$client->request('POST', '/api/storages', [
|
||||
'headers' => ['Content-Type' => self::LD],
|
||||
'json' => $this->tripletPayload($sites[1], $type, 'A1'),
|
||||
]);
|
||||
self::assertResponseStatusCodeSame(201);
|
||||
}
|
||||
|
||||
public function testSoftDeletedTripletCanBeReused(): void
|
||||
{
|
||||
$site = $this->firstSite();
|
||||
$type = $this->seedStorageType();
|
||||
$this->seedStorageEntity('B2', deletedAt: new DateTimeImmutable(), site: $site, storageType: $type);
|
||||
|
||||
$client = $this->createAdminClient();
|
||||
$client->request('POST', '/api/storages', [
|
||||
'headers' => ['Content-Type' => self::LD],
|
||||
'json' => $this->tripletPayload($site, $type, 'B2'),
|
||||
]);
|
||||
self::assertResponseStatusCodeSame(201);
|
||||
}
|
||||
|
||||
public function testPatchToExistingTripletReturns409(): void
|
||||
{
|
||||
$site = $this->firstSite();
|
||||
$type = $this->seedStorageType();
|
||||
$this->seedStorageEntity('A1', site: $site, storageType: $type);
|
||||
$target = $this->seedStorageEntity('B2', site: $site, storageType: $type);
|
||||
|
||||
// RG-7.08 : PATCH du numero B2 -> A1 (meme site+type) collisionne -> 409.
|
||||
$client = $this->createAdminClient();
|
||||
$client->request('PATCH', '/api/storages/'.$target->getId(), [
|
||||
'headers' => ['Content-Type' => self::MERGE],
|
||||
'json' => ['numero' => 'A1'],
|
||||
]);
|
||||
self::assertResponseStatusCodeSame(409);
|
||||
}
|
||||
|
||||
/**
|
||||
* Payload POST minimal pour un triplet (site, type, numero) donne.
|
||||
*
|
||||
* @return array<string, mixed>
|
||||
*/
|
||||
private function tripletPayload(Site $site, StorageType $type, string $numero): array
|
||||
{
|
||||
return [
|
||||
'site' => $this->iri('sites', (int) $site->getId()),
|
||||
'storageType' => $this->iri('storage_types', (int) $type->getId()),
|
||||
'numero' => $numero,
|
||||
'states' => [Storage::STATE_RECEPTION],
|
||||
];
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,83 @@
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace App\Tests\Module\Catalog\Api;
|
||||
|
||||
/**
|
||||
* Validation et normalisation serveur a l'ecriture du stockage (M7, POST / PATCH) :
|
||||
* - RG-7.06 : le numero est trimme cote serveur (et SANS changement de casse) ;
|
||||
* - numero vide -> 422 (Assert\NotBlank) sur `numero` ;
|
||||
* - relation nulle (site / storageType) -> 422 (Assert\NotNull, via le chemin de
|
||||
* denormalisation `collectDenormalizationErrors`) portant le bon propertyPath, et
|
||||
* NON un 400 qui court-circuiterait le mapping inline front (useFormErrors,
|
||||
* ERP-101).
|
||||
*
|
||||
* Pendant ces RG, le contrat de violation 422 (propertyPath aligne sur le champ
|
||||
* front) est ce que le front consomme : on l'asserte explicitement.
|
||||
*
|
||||
* @internal
|
||||
*/
|
||||
final class StorageWriteValidationTest extends AbstractStorageApiTestCase
|
||||
{
|
||||
public function testNumeroIsTrimmedServerSide(): void
|
||||
{
|
||||
$client = $this->createAdminClient();
|
||||
|
||||
// RG-7.06 : numero saisi avec des espaces autour -> stocke trimme.
|
||||
$created = $client->request('POST', '/api/storages', [
|
||||
'headers' => ['Content-Type' => self::LD],
|
||||
'json' => $this->validStoragePayload(['numero' => ' A1 ']),
|
||||
])->toArray();
|
||||
|
||||
self::assertResponseStatusCodeSame(201);
|
||||
self::assertSame('A1', $created['numero'], 'Le numero doit etre trimme cote serveur (RG-7.06).');
|
||||
|
||||
// Relecture : la normalisation est bien persistee, pas seulement reflechie.
|
||||
$detail = $client->request('GET', '/api/storages/'.$created['id'], [
|
||||
'headers' => ['Accept' => self::LD],
|
||||
])->toArray();
|
||||
self::assertSame('A1', $detail['numero']);
|
||||
}
|
||||
|
||||
public function testBlankNumeroIsRejected(): void
|
||||
{
|
||||
$client = $this->createAdminClient();
|
||||
|
||||
$response = $client->request('POST', '/api/storages', [
|
||||
'headers' => ['Content-Type' => self::LD],
|
||||
'json' => $this->validStoragePayload(['numero' => ' ']),
|
||||
]);
|
||||
|
||||
self::assertResponseStatusCodeSame(422);
|
||||
self::assertContains('numero', $this->violationPaths($response));
|
||||
}
|
||||
|
||||
public function testNullSiteReturns422WithPropertyPath(): void
|
||||
{
|
||||
$client = $this->createAdminClient();
|
||||
|
||||
// Relation obligatoire a null : doit ressortir en 422 (NotNull) avec un
|
||||
// propertyPath `site`, pas en 400 (collectDenormalizationErrors).
|
||||
$response = $client->request('POST', '/api/storages', [
|
||||
'headers' => ['Content-Type' => self::LD],
|
||||
'json' => $this->validStoragePayload(['site' => null]),
|
||||
]);
|
||||
|
||||
self::assertResponseStatusCodeSame(422);
|
||||
self::assertContains('site', $this->violationPaths($response));
|
||||
}
|
||||
|
||||
public function testNullStorageTypeReturns422WithPropertyPath(): void
|
||||
{
|
||||
$client = $this->createAdminClient();
|
||||
|
||||
$response = $client->request('POST', '/api/storages', [
|
||||
'headers' => ['Content-Type' => self::LD],
|
||||
'json' => $this->validStoragePayload(['storageType' => null]),
|
||||
]);
|
||||
|
||||
self::assertResponseStatusCodeSame(422);
|
||||
self::assertContains('storageType', $this->violationPaths($response));
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user