Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 1d9a656504 | |||
| 92a2d4f763 |
@@ -0,0 +1,102 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace DoctrineMigrations;
|
||||||
|
|
||||||
|
use Doctrine\DBAL\Schema\Schema;
|
||||||
|
use Doctrine\Migrations\AbstractMigration;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* ERP-84 — Taxonomie FOURNISSEUR (module Catalog, prerequis M2).
|
||||||
|
*
|
||||||
|
* Contexte : ERP-78 (Version20260602100000) a unifie la taxonomie sur un type
|
||||||
|
* unique CLIENT. Le M2 (fournisseurs) a besoin d'une taxonomie distincte : les
|
||||||
|
* categories clients (Agro-alimentaire...) ne sont pas valides pour un
|
||||||
|
* fournisseur (Negociant, Cooperative...). Decision Matthieu (02/06) : types
|
||||||
|
* distincts CLIENT / FOURNISSEUR (PRESTA a venir), chacun avec sa taxonomie.
|
||||||
|
*
|
||||||
|
* Cette migration :
|
||||||
|
* 1. recree le `category_type` FOURNISSEUR (code FOURNISSEUR, label « Fournisseur ») ;
|
||||||
|
* 2. seede quelques `Category` de demonstration rattachees a ce type.
|
||||||
|
*
|
||||||
|
* Aucune colonne creee/modifiee -> pas de `COMMENT ON COLUMN` (regle ABSOLUE n°12).
|
||||||
|
*
|
||||||
|
* Namespace racine `DoctrineMigrations` (regle ABSOLUE n°11) et NON modulaire
|
||||||
|
* Catalog : avec plusieurs migrations_paths, Doctrine Migrations 3.x trie par
|
||||||
|
* FQCN alphabetique -> une migration `App\Module\Catalog\...` passerait avant les
|
||||||
|
* `DoctrineMigrations\...` sur base vide, donc avant la creation de la table
|
||||||
|
* `category_type`. Le namespace racine garantit l'ordre par timestamp.
|
||||||
|
*
|
||||||
|
* Idempotence : `INSERT ... ON CONFLICT (code) DO NOTHING` pour le type,
|
||||||
|
* `INSERT ... SELECT ... WHERE NOT EXISTS` pour chaque categorie (aligne sur le
|
||||||
|
* pattern ERP-78 etape 4). En prod la table `category` est vide (aucune fixture
|
||||||
|
* metier). En dev/test, le purger Doctrine vide `category`/`category_type` avant
|
||||||
|
* les fixtures qui reproduisent le meme etat final (CategoryTypeFixtures /
|
||||||
|
* CategoryFixtures etendus a FOURNISSEUR).
|
||||||
|
*/
|
||||||
|
final class Version20260605120000 extends AbstractMigration
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* Categories de demonstration du type FOURNISSEUR : nom => code stable. Le
|
||||||
|
* code est la cle metier (slug MAJUSCULE du nom, miroir du
|
||||||
|
* CategoryCodeGenerator) et reste unique parmi les actifs (uq_category_code,
|
||||||
|
* partage avec les codes CLIENT — aucune collision ici).
|
||||||
|
*/
|
||||||
|
private const array SUPPLIER_CATEGORIES = [
|
||||||
|
'Négociant' => 'NEGOCIANT',
|
||||||
|
'Coopérative' => 'COOPERATIVE',
|
||||||
|
'Producteur' => 'PRODUCTEUR',
|
||||||
|
'Grossiste' => 'GROSSISTE',
|
||||||
|
'Importateur' => 'IMPORTATEUR',
|
||||||
|
];
|
||||||
|
|
||||||
|
public function getDescription(): string
|
||||||
|
{
|
||||||
|
return 'ERP-84 : recree le CategoryType FOURNISSEUR + seed des categories fournisseurs (Negociant, Cooperative...).';
|
||||||
|
}
|
||||||
|
|
||||||
|
public function up(Schema $schema): void
|
||||||
|
{
|
||||||
|
// 1. Type FOURNISSEUR (idempotent via l'index unique uq_category_type_code).
|
||||||
|
$this->addSql(<<<'SQL'
|
||||||
|
INSERT INTO category_type (code, label) VALUES ('FOURNISSEUR', 'Fournisseur')
|
||||||
|
ON CONFLICT (code) DO NOTHING
|
||||||
|
SQL);
|
||||||
|
|
||||||
|
// 2. Categories de demonstration sous FOURNISSEUR (si le code est libre
|
||||||
|
// parmi les actifs). created_at/updated_at NOT NULL -> NOW() ; le blame
|
||||||
|
// reste null (seed hors contexte HTTP, libelle « Systeme » cote front).
|
||||||
|
foreach (self::SUPPLIER_CATEGORIES as $name => $code) {
|
||||||
|
$this->addSql(<<<'SQL'
|
||||||
|
INSERT INTO category (name, code, category_type_id, created_at, updated_at)
|
||||||
|
SELECT :name, :code, ct.id, NOW(), NOW()
|
||||||
|
FROM category_type ct
|
||||||
|
WHERE ct.code = 'FOURNISSEUR'
|
||||||
|
AND NOT EXISTS (
|
||||||
|
SELECT 1 FROM category c WHERE c.code = :code AND c.deleted_at IS NULL
|
||||||
|
)
|
||||||
|
SQL, ['name' => $name, 'code' => $code]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public function down(Schema $schema): void
|
||||||
|
{
|
||||||
|
// Best-effort : on retire d'abord les categories seedees (par code), puis
|
||||||
|
// le type s'il n'est plus reference (guard NOT EXISTS sur la FK RESTRICT).
|
||||||
|
$this->addSql(
|
||||||
|
'DELETE FROM category WHERE code IN (:codes) '
|
||||||
|
."AND category_type_id = (SELECT id FROM category_type WHERE code = 'FOURNISSEUR')",
|
||||||
|
['codes' => array_values(self::SUPPLIER_CATEGORIES)],
|
||||||
|
['codes' => \Doctrine\DBAL\ArrayParameterType::STRING],
|
||||||
|
);
|
||||||
|
|
||||||
|
$this->addSql(<<<'SQL'
|
||||||
|
DELETE FROM category_type
|
||||||
|
WHERE code = 'FOURNISSEUR'
|
||||||
|
AND NOT EXISTS (
|
||||||
|
SELECT 1 FROM category c WHERE c.category_type_id = category_type.id
|
||||||
|
)
|
||||||
|
SQL);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,438 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace DoctrineMigrations;
|
||||||
|
|
||||||
|
use App\Shared\Infrastructure\Database\ColumnCommentsCatalog;
|
||||||
|
use Doctrine\DBAL\Schema\Schema;
|
||||||
|
use Doctrine\Migrations\AbstractMigration;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* M2 — Repertoire fournisseurs (ERP-85) : creation de toute la structure BDD
|
||||||
|
* des fournisseurs sous le module Commercial (jumeau du M1 client).
|
||||||
|
*
|
||||||
|
* Tables creees :
|
||||||
|
* - Table principale : supplier (formulaire principal + Information +
|
||||||
|
* Comptabilite + archive + soft-delete + Timestampable/Blamable).
|
||||||
|
* - Sous-collections : supplier_category (M2M), supplier_contact (1:n),
|
||||||
|
* supplier_address (1:n), supplier_rib (1:n).
|
||||||
|
* - Jointures de supplier_address : supplier_address_site,
|
||||||
|
* supplier_address_contact, supplier_address_category.
|
||||||
|
*
|
||||||
|
* Differences vs le M1 `client` (cf. spec M2 § 2.4 / § 3.1) :
|
||||||
|
* - PAS de contact inline sur supplier (first_name / last_name / phone_* /
|
||||||
|
* email retires en V0.2, refonte-contact ERP-106). Les contacts vivent
|
||||||
|
* uniquement dans supplier_contact (onglet Contacts).
|
||||||
|
* - PAS d'auto-reference distributor_id / broker_id (pas de CHECK associe).
|
||||||
|
* - Ajout du champ Information volume_forecast (entier).
|
||||||
|
* - supplier_address remplace les 3 booleens M1 (is_prospect / is_delivery /
|
||||||
|
* is_billing + billing_email) par un seul enum address_type
|
||||||
|
* (PROSPECT | DEPART | RENDU, radio exclusif, CHECK chk_supplier_address_type)
|
||||||
|
* et ajoute bennes (int nullable) + triage_provider (bool).
|
||||||
|
*
|
||||||
|
* Referentiels comptables NON recrees : tva_mode / payment_delay / payment_type
|
||||||
|
* / bank sont ceux du M1 (FK partagees, zero duplication — spec § 2.3).
|
||||||
|
*
|
||||||
|
* CategoryType FOURNISSEUR NON re-seede : il est cree par ERP-84
|
||||||
|
* (Version20260605120000) avec ses categories de demonstration. Le M2M
|
||||||
|
* supplier_category / supplier_address_category s'appuie sur ce type existant.
|
||||||
|
*
|
||||||
|
* Namespace racine `DoctrineMigrations` (regle ABSOLUE Starseed n°11) et NON
|
||||||
|
* `App\Module\Commercial\...` : la migration cree un schema avec FK cross-module
|
||||||
|
* (user, category, site, et les referentiels comptables M1). Avec plusieurs
|
||||||
|
* migrations_paths, Doctrine Migrations 3.x trie par FQCN alphabetique — un
|
||||||
|
* namespace modulaire s'executerait avant la creation de user/category/site sur
|
||||||
|
* base vide -> echec des FK. Le namespace racine garantit l'ordre par timestamp.
|
||||||
|
*
|
||||||
|
* Style DDL aligne sur le M1 (Version20260601000000) : `INT GENERATED BY DEFAULT
|
||||||
|
* AS IDENTITY` (et non SERIAL), `TIMESTAMP(0) WITHOUT TIME ZONE` (et non
|
||||||
|
* TIMESTAMPTZ, car le TimestampableBlamableTrait mappe `datetime_immutable`).
|
||||||
|
* Garantit que `schema:update` restera un no-op quand les entites arriveront
|
||||||
|
* (ticket ERP-86).
|
||||||
|
*
|
||||||
|
* Decision unicite (Matthieu 02/06, alignee Q4 du M1) : unicite metier sur le
|
||||||
|
* NOM DE SOCIETE uniquement (uq_supplier_company_name_active, partiel). Pas
|
||||||
|
* d'index unique sur siren ni email.
|
||||||
|
*
|
||||||
|
* Chaque colonne porte un `COMMENT ON COLUMN` (regle ABSOLUE n°12, garde-fou
|
||||||
|
* ColumnsHaveSqlCommentTest). Les tables n'etant pas encore mappees par l'ORM
|
||||||
|
* (entites a ERP-86), ces commentaires survivent au `schema:update --force` du
|
||||||
|
* setup de test (additif, ne drop pas les tables non mappees).
|
||||||
|
*/
|
||||||
|
final class Version20260605130000 extends AbstractMigration
|
||||||
|
{
|
||||||
|
public function getDescription(): string
|
||||||
|
{
|
||||||
|
return 'ERP-85 (M2) : tables supplier + sous-collections + jointures M2M (referentiels comptables et CategoryType FOURNISSEUR reutilises).';
|
||||||
|
}
|
||||||
|
|
||||||
|
public function up(Schema $schema): void
|
||||||
|
{
|
||||||
|
$this->createSupplierTable();
|
||||||
|
$this->createSupplierCategory();
|
||||||
|
$this->createSupplierContact();
|
||||||
|
$this->createSupplierAddress();
|
||||||
|
$this->createSupplierAddressJoinTables();
|
||||||
|
$this->createSupplierRib();
|
||||||
|
}
|
||||||
|
|
||||||
|
public function down(Schema $schema): void
|
||||||
|
{
|
||||||
|
// Ordre inverse des dependances FK : jointures et sous-collections
|
||||||
|
// d'abord, puis supplier. Les referentiels comptables et le
|
||||||
|
// CategoryType FOURNISSEUR ne sont pas touches (crees ailleurs).
|
||||||
|
$this->addSql('DROP TABLE supplier_address_category');
|
||||||
|
$this->addSql('DROP TABLE supplier_address_contact');
|
||||||
|
$this->addSql('DROP TABLE supplier_address_site');
|
||||||
|
$this->addSql('DROP TABLE supplier_rib');
|
||||||
|
$this->addSql('DROP TABLE supplier_address');
|
||||||
|
$this->addSql('DROP TABLE supplier_contact');
|
||||||
|
$this->addSql('DROP TABLE supplier_category');
|
||||||
|
$this->addSql('DROP TABLE supplier');
|
||||||
|
}
|
||||||
|
|
||||||
|
// =================================================================
|
||||||
|
// Table principale `supplier`
|
||||||
|
// =================================================================
|
||||||
|
|
||||||
|
private function createSupplierTable(): void
|
||||||
|
{
|
||||||
|
$this->addSql(<<<'SQL'
|
||||||
|
CREATE TABLE supplier (
|
||||||
|
id INT GENERATED BY DEFAULT AS IDENTITY NOT NULL,
|
||||||
|
company_name VARCHAR(180) NOT NULL,
|
||||||
|
description TEXT DEFAULT NULL,
|
||||||
|
competitors VARCHAR(255) DEFAULT NULL,
|
||||||
|
founded_at DATE DEFAULT NULL,
|
||||||
|
employees_count INT DEFAULT NULL,
|
||||||
|
revenue_amount NUMERIC(15, 2) DEFAULT NULL,
|
||||||
|
director_name VARCHAR(120) DEFAULT NULL,
|
||||||
|
profit_amount NUMERIC(15, 2) DEFAULT NULL,
|
||||||
|
volume_forecast INT DEFAULT NULL,
|
||||||
|
siren VARCHAR(20) DEFAULT NULL,
|
||||||
|
account_number VARCHAR(40) DEFAULT NULL,
|
||||||
|
tva_mode_id INT DEFAULT NULL,
|
||||||
|
n_tva VARCHAR(40) DEFAULT NULL,
|
||||||
|
payment_delay_id INT DEFAULT NULL,
|
||||||
|
payment_type_id INT DEFAULT NULL,
|
||||||
|
bank_id INT DEFAULT NULL,
|
||||||
|
is_archived BOOLEAN DEFAULT FALSE NOT NULL,
|
||||||
|
archived_at TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL,
|
||||||
|
deleted_at TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL,
|
||||||
|
created_at TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL,
|
||||||
|
updated_at TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL,
|
||||||
|
created_by INT DEFAULT NULL,
|
||||||
|
updated_by INT DEFAULT NULL,
|
||||||
|
PRIMARY KEY (id),
|
||||||
|
CONSTRAINT fk_supplier_tva_mode
|
||||||
|
FOREIGN KEY (tva_mode_id) REFERENCES tva_mode (id) ON DELETE RESTRICT,
|
||||||
|
CONSTRAINT fk_supplier_payment_delay
|
||||||
|
FOREIGN KEY (payment_delay_id) REFERENCES payment_delay (id) ON DELETE RESTRICT,
|
||||||
|
CONSTRAINT fk_supplier_payment_type
|
||||||
|
FOREIGN KEY (payment_type_id) REFERENCES payment_type (id) ON DELETE RESTRICT,
|
||||||
|
CONSTRAINT fk_supplier_bank
|
||||||
|
FOREIGN KEY (bank_id) REFERENCES bank (id) ON DELETE RESTRICT,
|
||||||
|
CONSTRAINT fk_supplier_created_by
|
||||||
|
FOREIGN KEY (created_by) REFERENCES "user" (id) ON DELETE SET NULL,
|
||||||
|
CONSTRAINT fk_supplier_updated_by
|
||||||
|
FOREIGN KEY (updated_by) REFERENCES "user" (id) ON DELETE SET NULL
|
||||||
|
)
|
||||||
|
SQL);
|
||||||
|
|
||||||
|
$this->addSql('CREATE INDEX idx_supplier_is_archived ON supplier (is_archived)');
|
||||||
|
$this->addSql('CREATE INDEX idx_supplier_deleted_at ON supplier (deleted_at)');
|
||||||
|
$this->addSql('CREATE INDEX idx_supplier_created_by ON supplier (created_by)');
|
||||||
|
$this->addSql('CREATE INDEX idx_supplier_updated_by ON supplier (updated_by)');
|
||||||
|
|
||||||
|
// Index sur les FK des referentiels comptables (Postgres n'indexe pas
|
||||||
|
// automatiquement les colonnes portant une FOREIGN KEY).
|
||||||
|
$this->addSql('CREATE INDEX idx_supplier_tva_mode_id ON supplier (tva_mode_id)');
|
||||||
|
$this->addSql('CREATE INDEX idx_supplier_payment_delay_id ON supplier (payment_delay_id)');
|
||||||
|
$this->addSql('CREATE INDEX idx_supplier_payment_type_id ON supplier (payment_type_id)');
|
||||||
|
$this->addSql('CREATE INDEX idx_supplier_bank_id ON supplier (bank_id)');
|
||||||
|
|
||||||
|
// Unicite metier partielle : nom de societe insensible a la casse, parmi
|
||||||
|
// les non-archives ET non soft-deletes uniquement (spec § 2.6). Pas
|
||||||
|
// d'index unique sur siren ni email.
|
||||||
|
$this->addSql(<<<'SQL'
|
||||||
|
CREATE UNIQUE INDEX uq_supplier_company_name_active
|
||||||
|
ON supplier (LOWER(company_name))
|
||||||
|
WHERE is_archived = FALSE AND deleted_at IS NULL
|
||||||
|
SQL);
|
||||||
|
|
||||||
|
$this->comment('supplier', '_table', 'Repertoire fournisseurs (M2 Commercial) — entites archivables (is_archived) et soft-deletables (deleted_at, HP M3).');
|
||||||
|
$this->comment('supplier', 'id', 'Identifiant interne auto-incremente.');
|
||||||
|
$this->comment('supplier', 'company_name', 'Raison sociale du fournisseur (stockee en MAJUSCULES). Unique case-insensitive parmi les actifs non archives/non supprimes (uq_supplier_company_name_active, § 2.6).');
|
||||||
|
$this->comment('supplier', 'description', 'Onglet Information : description libre. Obligatoire pour le role Commerciale (RG-2.03), optionnel sinon.');
|
||||||
|
$this->comment('supplier', 'competitors', 'Onglet Information : concurrents identifies (texte libre ≤ 255). Obligatoire role Commerciale (RG-2.03).');
|
||||||
|
$this->comment('supplier', 'founded_at', 'Onglet Information : date de creation de l entreprise. Obligatoire role Commerciale (RG-2.03).');
|
||||||
|
$this->comment('supplier', 'employees_count', 'Onglet Information : effectif (entier >= 0). Obligatoire role Commerciale (RG-2.03).');
|
||||||
|
$this->comment('supplier', 'revenue_amount', 'Onglet Information : chiffre d affaires (NUMERIC 15,2). Obligatoire role Commerciale (RG-2.03).');
|
||||||
|
$this->comment('supplier', 'director_name', 'Onglet Information : nom du dirigeant. Obligatoire role Commerciale (RG-2.03).');
|
||||||
|
$this->comment('supplier', 'profit_amount', 'Onglet Information : resultat / benefice (NUMERIC 15,2). Obligatoire role Commerciale (RG-2.03).');
|
||||||
|
$this->comment('supplier', 'volume_forecast', 'Onglet Information : volume previsionnel (entier >= 0) — specifique fournisseur. Obligatoire role Commerciale (RG-2.03).');
|
||||||
|
$this->comment('supplier', 'siren', 'Onglet Comptabilite : SIREN (9 chiffres attendus). NON unique — peut etre partage entre etablissements (§ 2.6).');
|
||||||
|
$this->comment('supplier', 'account_number', 'Onglet Comptabilite : numero de compte comptable du fournisseur.');
|
||||||
|
$this->comment('supplier', 'tva_mode_id', 'Onglet Comptabilite : mode de TVA applique — FK -> tva_mode.id (referentiel partage M1), ON DELETE RESTRICT.');
|
||||||
|
$this->comment('supplier', 'n_tva', 'Onglet Comptabilite : numero de TVA intracommunautaire.');
|
||||||
|
$this->comment('supplier', 'payment_delay_id', 'Onglet Comptabilite : delai de reglement — FK -> payment_delay.id (M1), ON DELETE RESTRICT.');
|
||||||
|
$this->comment('supplier', 'payment_type_id', 'Onglet Comptabilite : type de reglement — FK -> payment_type.id (M1), ON DELETE RESTRICT. Pilote RG-2.07 (Banque si VIREMENT) et RG-2.08 (RIB).');
|
||||||
|
$this->comment('supplier', 'bank_id', 'Onglet Comptabilite : banque — FK -> bank.id (M1), ON DELETE RESTRICT. Obligatoire ssi payment_type = VIREMENT (RG-2.07), null sinon.');
|
||||||
|
$this->comment('supplier', 'is_archived', 'Drapeau fonctionnel d archivage — masque par defaut dans la liste. Bascule via permission commercial.suppliers.archive.');
|
||||||
|
$this->comment('supplier', 'archived_at', 'Horodatage de l archivage — pose quand is_archived passe a vrai, remis a null a la restauration.');
|
||||||
|
$this->comment('supplier', 'deleted_at', 'Horodatage du soft-delete technique (HP M3) — non expose par l API au M2. Null = ligne active.');
|
||||||
|
$this->addTimestampableBlamableComments('supplier');
|
||||||
|
}
|
||||||
|
|
||||||
|
// =================================================================
|
||||||
|
// M2M supplier <-> category (type FOURNISSEUR — RG-2.10)
|
||||||
|
// =================================================================
|
||||||
|
|
||||||
|
private function createSupplierCategory(): void
|
||||||
|
{
|
||||||
|
$this->addSql(<<<'SQL'
|
||||||
|
CREATE TABLE supplier_category (
|
||||||
|
supplier_id INT NOT NULL,
|
||||||
|
category_id INT NOT NULL,
|
||||||
|
PRIMARY KEY (supplier_id, category_id),
|
||||||
|
CONSTRAINT fk_supplier_category_supplier
|
||||||
|
FOREIGN KEY (supplier_id) REFERENCES supplier (id) ON DELETE CASCADE,
|
||||||
|
CONSTRAINT fk_supplier_category_category
|
||||||
|
FOREIGN KEY (category_id) REFERENCES category (id) ON DELETE RESTRICT
|
||||||
|
)
|
||||||
|
SQL);
|
||||||
|
$this->addSql('CREATE INDEX idx_supplier_category_category ON supplier_category (category_id)');
|
||||||
|
|
||||||
|
$this->comment('supplier_category', '_table', 'Jointure M2M supplier <-> category (Catalog) — categories de type FOURNISSEUR du fournisseur, au moins une obligatoire (RG-2.10).');
|
||||||
|
$this->comment('supplier_category', 'supplier_id', 'FK -> supplier.id, ON DELETE CASCADE — fournisseur porteur de la categorie.');
|
||||||
|
$this->comment('supplier_category', 'category_id', 'FK -> category.id, ON DELETE RESTRICT — categorie de type FOURNISSEUR rattachee au fournisseur (RG-2.10).');
|
||||||
|
}
|
||||||
|
|
||||||
|
// =================================================================
|
||||||
|
// Sous-collection : contacts (1:n)
|
||||||
|
// =================================================================
|
||||||
|
|
||||||
|
private function createSupplierContact(): void
|
||||||
|
{
|
||||||
|
$this->addSql(<<<'SQL'
|
||||||
|
CREATE TABLE supplier_contact (
|
||||||
|
id INT GENERATED BY DEFAULT AS IDENTITY NOT NULL,
|
||||||
|
supplier_id INT NOT NULL,
|
||||||
|
first_name VARCHAR(120) DEFAULT NULL,
|
||||||
|
last_name VARCHAR(120) DEFAULT NULL,
|
||||||
|
job_title VARCHAR(120) DEFAULT NULL,
|
||||||
|
phone_primary VARCHAR(20) DEFAULT NULL,
|
||||||
|
phone_secondary VARCHAR(20) DEFAULT NULL,
|
||||||
|
email VARCHAR(180) DEFAULT NULL,
|
||||||
|
position INT DEFAULT 0 NOT NULL,
|
||||||
|
created_at TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL,
|
||||||
|
updated_at TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL,
|
||||||
|
created_by INT DEFAULT NULL,
|
||||||
|
updated_by INT DEFAULT NULL,
|
||||||
|
PRIMARY KEY (id),
|
||||||
|
CONSTRAINT chk_supplier_contact_name
|
||||||
|
CHECK (first_name IS NOT NULL OR last_name IS NOT NULL),
|
||||||
|
CONSTRAINT fk_supplier_contact_supplier
|
||||||
|
FOREIGN KEY (supplier_id) REFERENCES supplier (id) ON DELETE CASCADE,
|
||||||
|
CONSTRAINT fk_supplier_contact_created_by
|
||||||
|
FOREIGN KEY (created_by) REFERENCES "user" (id) ON DELETE SET NULL,
|
||||||
|
CONSTRAINT fk_supplier_contact_updated_by
|
||||||
|
FOREIGN KEY (updated_by) REFERENCES "user" (id) ON DELETE SET NULL
|
||||||
|
)
|
||||||
|
SQL);
|
||||||
|
$this->addSql('CREATE INDEX idx_supplier_contact_supplier ON supplier_contact (supplier_id)');
|
||||||
|
|
||||||
|
$this->comment('supplier_contact', '_table', 'Contacts d un fournisseur (1:n) — au moins firstName OU lastName par contact (RG-2.04).');
|
||||||
|
$this->comment('supplier_contact', 'id', 'Identifiant interne auto-incremente.');
|
||||||
|
$this->comment('supplier_contact', 'supplier_id', 'FK -> supplier.id, ON DELETE CASCADE — fournisseur proprietaire du contact.');
|
||||||
|
$this->comment('supplier_contact', 'first_name', 'Prenom du contact (capitalise serveur). first_name OU last_name obligatoire (RG-2.04, chk_supplier_contact_name).');
|
||||||
|
$this->comment('supplier_contact', 'last_name', 'Nom du contact (capitalise serveur). first_name OU last_name obligatoire (RG-2.04, chk_supplier_contact_name).');
|
||||||
|
$this->comment('supplier_contact', 'job_title', 'Fonction / intitule de poste du contact (≤ 120 caracteres).');
|
||||||
|
$this->comment('supplier_contact', 'phone_primary', 'Telephone principal du contact — chiffres uniquement (normalisation serveur).');
|
||||||
|
$this->comment('supplier_contact', 'phone_secondary', 'Telephone secondaire du contact — chiffres uniquement (normalisation serveur).');
|
||||||
|
$this->comment('supplier_contact', 'email', 'Email du contact (lowercase serveur).');
|
||||||
|
$this->comment('supplier_contact', 'position', 'Ordre d affichage du contact dans la liste du fournisseur (croissant).');
|
||||||
|
$this->addTimestampableBlamableComments('supplier_contact');
|
||||||
|
}
|
||||||
|
|
||||||
|
// =================================================================
|
||||||
|
// Sous-collection : adresses (1:n)
|
||||||
|
// =================================================================
|
||||||
|
|
||||||
|
private function createSupplierAddress(): void
|
||||||
|
{
|
||||||
|
$this->addSql(<<<'SQL'
|
||||||
|
CREATE TABLE supplier_address (
|
||||||
|
id INT GENERATED BY DEFAULT AS IDENTITY NOT NULL,
|
||||||
|
supplier_id INT NOT NULL,
|
||||||
|
address_type VARCHAR(20) NOT NULL,
|
||||||
|
country VARCHAR(80) DEFAULT 'France' NOT NULL,
|
||||||
|
postal_code VARCHAR(20) NOT NULL,
|
||||||
|
city VARCHAR(120) NOT NULL,
|
||||||
|
street VARCHAR(255) NOT NULL,
|
||||||
|
street_complement VARCHAR(255) DEFAULT NULL,
|
||||||
|
bennes INT DEFAULT NULL,
|
||||||
|
triage_provider BOOLEAN DEFAULT FALSE NOT NULL,
|
||||||
|
position INT DEFAULT 0 NOT NULL,
|
||||||
|
created_at TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL,
|
||||||
|
updated_at TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL,
|
||||||
|
created_by INT DEFAULT NULL,
|
||||||
|
updated_by INT DEFAULT NULL,
|
||||||
|
PRIMARY KEY (id),
|
||||||
|
CONSTRAINT chk_supplier_address_type
|
||||||
|
CHECK (address_type IN ('PROSPECT', 'DEPART', 'RENDU')),
|
||||||
|
CONSTRAINT fk_supplier_address_supplier
|
||||||
|
FOREIGN KEY (supplier_id) REFERENCES supplier (id) ON DELETE CASCADE,
|
||||||
|
CONSTRAINT fk_supplier_address_created_by
|
||||||
|
FOREIGN KEY (created_by) REFERENCES "user" (id) ON DELETE SET NULL,
|
||||||
|
CONSTRAINT fk_supplier_address_updated_by
|
||||||
|
FOREIGN KEY (updated_by) REFERENCES "user" (id) ON DELETE SET NULL
|
||||||
|
)
|
||||||
|
SQL);
|
||||||
|
$this->addSql('CREATE INDEX idx_supplier_address_supplier ON supplier_address (supplier_id)');
|
||||||
|
|
||||||
|
$this->comment('supplier_address', '_table', 'Adresses d un fournisseur (1:n) — type PROSPECT/DEPART/RENDU exclusif (RG-2.09), >= 1 site rattache (RG-2.06).');
|
||||||
|
$this->comment('supplier_address', 'id', 'Identifiant interne auto-incremente.');
|
||||||
|
$this->comment('supplier_address', 'supplier_id', 'FK -> supplier.id, ON DELETE CASCADE — fournisseur proprietaire de l adresse.');
|
||||||
|
$this->comment('supplier_address', 'address_type', 'Type d adresse : PROSPECT | DEPART | RENDU (radio exclusif par construction — RG-2.09, chk_supplier_address_type).');
|
||||||
|
$this->comment('supplier_address', 'country', 'Pays de l adresse — defaut France.');
|
||||||
|
$this->comment('supplier_address', 'postal_code', 'Code postal (4-5 chiffres attendus).');
|
||||||
|
$this->comment('supplier_address', 'city', 'Ville — preremplie depuis le code postal via API BAN cote front.');
|
||||||
|
$this->comment('supplier_address', 'street', 'Numero et voie de l adresse.');
|
||||||
|
$this->comment('supplier_address', 'street_complement', 'Complement d adresse (etage, batiment...) — optionnel.');
|
||||||
|
$this->comment('supplier_address', 'bennes', 'Nombre de bennes sur le site fournisseur (entier nullable) — specifique fournisseur.');
|
||||||
|
$this->comment('supplier_address', 'triage_provider', 'Le fournisseur est prestataire de triage sur cette adresse. Faux par defaut.');
|
||||||
|
$this->comment('supplier_address', 'position', 'Ordre d affichage de l adresse dans la liste du fournisseur (croissant).');
|
||||||
|
$this->addTimestampableBlamableComments('supplier_address');
|
||||||
|
}
|
||||||
|
|
||||||
|
// =================================================================
|
||||||
|
// Jointures de supplier_address (M2M)
|
||||||
|
// =================================================================
|
||||||
|
|
||||||
|
private function createSupplierAddressJoinTables(): void
|
||||||
|
{
|
||||||
|
$this->addSql(<<<'SQL'
|
||||||
|
CREATE TABLE supplier_address_site (
|
||||||
|
supplier_address_id INT NOT NULL,
|
||||||
|
site_id INT NOT NULL,
|
||||||
|
PRIMARY KEY (supplier_address_id, site_id),
|
||||||
|
CONSTRAINT fk_supplier_address_site_address
|
||||||
|
FOREIGN KEY (supplier_address_id) REFERENCES supplier_address (id) ON DELETE CASCADE,
|
||||||
|
CONSTRAINT fk_supplier_address_site_site
|
||||||
|
FOREIGN KEY (site_id) REFERENCES site (id) ON DELETE RESTRICT
|
||||||
|
)
|
||||||
|
SQL);
|
||||||
|
$this->comment('supplier_address_site', '_table', 'Jointure M2M supplier_address <-> site (Sites) — sites rattaches a l adresse (>= 1 obligatoire, RG-2.06).');
|
||||||
|
$this->comment('supplier_address_site', 'supplier_address_id', 'FK -> supplier_address.id, ON DELETE CASCADE — adresse concernee.');
|
||||||
|
$this->comment('supplier_address_site', 'site_id', 'FK -> site.id, ON DELETE RESTRICT — site rattache a l adresse.');
|
||||||
|
|
||||||
|
$this->addSql(<<<'SQL'
|
||||||
|
CREATE TABLE supplier_address_contact (
|
||||||
|
supplier_address_id INT NOT NULL,
|
||||||
|
supplier_contact_id INT NOT NULL,
|
||||||
|
PRIMARY KEY (supplier_address_id, supplier_contact_id),
|
||||||
|
CONSTRAINT fk_supplier_address_contact_address
|
||||||
|
FOREIGN KEY (supplier_address_id) REFERENCES supplier_address (id) ON DELETE CASCADE,
|
||||||
|
CONSTRAINT fk_supplier_address_contact_contact
|
||||||
|
FOREIGN KEY (supplier_contact_id) REFERENCES supplier_contact (id) ON DELETE CASCADE
|
||||||
|
)
|
||||||
|
SQL);
|
||||||
|
$this->comment('supplier_address_contact', '_table', 'Jointure M2M supplier_address <-> supplier_contact — contacts associes a une adresse.');
|
||||||
|
$this->comment('supplier_address_contact', 'supplier_address_id', 'FK -> supplier_address.id, ON DELETE CASCADE — adresse concernee.');
|
||||||
|
$this->comment('supplier_address_contact', 'supplier_contact_id', 'FK -> supplier_contact.id, ON DELETE CASCADE — contact associe a l adresse.');
|
||||||
|
|
||||||
|
$this->addSql(<<<'SQL'
|
||||||
|
CREATE TABLE supplier_address_category (
|
||||||
|
supplier_address_id INT NOT NULL,
|
||||||
|
category_id INT NOT NULL,
|
||||||
|
PRIMARY KEY (supplier_address_id, category_id),
|
||||||
|
CONSTRAINT fk_supplier_address_category_address
|
||||||
|
FOREIGN KEY (supplier_address_id) REFERENCES supplier_address (id) ON DELETE CASCADE,
|
||||||
|
CONSTRAINT fk_supplier_address_category_category
|
||||||
|
FOREIGN KEY (category_id) REFERENCES category (id) ON DELETE RESTRICT
|
||||||
|
)
|
||||||
|
SQL);
|
||||||
|
$this->comment('supplier_address_category', '_table', 'Jointure M2M supplier_address <-> category — categories d adresse de type FOURNISSEUR (RG-2.10).');
|
||||||
|
$this->comment('supplier_address_category', 'supplier_address_id', 'FK -> supplier_address.id, ON DELETE CASCADE — adresse concernee.');
|
||||||
|
$this->comment('supplier_address_category', 'category_id', 'FK -> category.id, ON DELETE RESTRICT — categorie d adresse de type FOURNISSEUR (RG-2.10).');
|
||||||
|
}
|
||||||
|
|
||||||
|
// =================================================================
|
||||||
|
// Sous-collection : RIB (1:n)
|
||||||
|
// =================================================================
|
||||||
|
|
||||||
|
private function createSupplierRib(): void
|
||||||
|
{
|
||||||
|
$this->addSql(<<<'SQL'
|
||||||
|
CREATE TABLE supplier_rib (
|
||||||
|
id INT GENERATED BY DEFAULT AS IDENTITY NOT NULL,
|
||||||
|
supplier_id INT NOT NULL,
|
||||||
|
label VARCHAR(120) NOT NULL,
|
||||||
|
bic VARCHAR(20) NOT NULL,
|
||||||
|
iban VARCHAR(34) NOT NULL,
|
||||||
|
position INT DEFAULT 0 NOT NULL,
|
||||||
|
created_at TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL,
|
||||||
|
updated_at TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL,
|
||||||
|
created_by INT DEFAULT NULL,
|
||||||
|
updated_by INT DEFAULT NULL,
|
||||||
|
PRIMARY KEY (id),
|
||||||
|
CONSTRAINT fk_supplier_rib_supplier
|
||||||
|
FOREIGN KEY (supplier_id) REFERENCES supplier (id) ON DELETE CASCADE,
|
||||||
|
CONSTRAINT fk_supplier_rib_created_by
|
||||||
|
FOREIGN KEY (created_by) REFERENCES "user" (id) ON DELETE SET NULL,
|
||||||
|
CONSTRAINT fk_supplier_rib_updated_by
|
||||||
|
FOREIGN KEY (updated_by) REFERENCES "user" (id) ON DELETE SET NULL
|
||||||
|
)
|
||||||
|
SQL);
|
||||||
|
$this->addSql('CREATE INDEX idx_supplier_rib_supplier ON supplier_rib (supplier_id)');
|
||||||
|
|
||||||
|
$this->comment('supplier_rib', '_table', 'Coordonnees bancaires d un fournisseur (1:n) — >= 1 RIB attendu selon le type de reglement (RG-2.08). Tous les champs audites (pas d AuditIgnore).');
|
||||||
|
$this->comment('supplier_rib', 'id', 'Identifiant interne auto-incremente.');
|
||||||
|
$this->comment('supplier_rib', 'supplier_id', 'FK -> supplier.id, ON DELETE CASCADE — fournisseur proprietaire du RIB.');
|
||||||
|
$this->comment('supplier_rib', 'label', 'Libelle du RIB (ex: compte principal).');
|
||||||
|
$this->comment('supplier_rib', 'bic', 'Code BIC/SWIFT de la banque (8 ou 11 caracteres).');
|
||||||
|
$this->comment('supplier_rib', 'iban', 'IBAN du compte (≤ 34 caracteres).');
|
||||||
|
$this->comment('supplier_rib', 'position', 'Ordre d affichage du RIB dans la liste du fournisseur (croissant).');
|
||||||
|
$this->addTimestampableBlamableComments('supplier_rib');
|
||||||
|
}
|
||||||
|
|
||||||
|
// =================================================================
|
||||||
|
// Helpers
|
||||||
|
// =================================================================
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Pose les 4 commentaires standardises Timestampable/Blamable sur une table,
|
||||||
|
* en reutilisant le catalogue partage (source unique, cf. ERP-67).
|
||||||
|
*/
|
||||||
|
private function addTimestampableBlamableComments(string $table): void
|
||||||
|
{
|
||||||
|
foreach (ColumnCommentsCatalog::timestampableBlamableComments() as $column => $description) {
|
||||||
|
$this->comment($table, $column, $description);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Emet un `COMMENT ON TABLE` (colonne speciale `_table`) ou
|
||||||
|
* `COMMENT ON COLUMN` en dollar-quoting Postgres ($_$...$_$) pour eviter
|
||||||
|
* tout echappement d apostrophe.
|
||||||
|
*/
|
||||||
|
private function comment(string $table, string $column, string $description): void
|
||||||
|
{
|
||||||
|
$quotedTable = '"'.str_replace('"', '""', $table).'"';
|
||||||
|
|
||||||
|
if ('_table' === $column) {
|
||||||
|
$this->addSql(sprintf('COMMENT ON TABLE %s IS $_$%s$_$', $quotedTable, $description));
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->addSql(sprintf(
|
||||||
|
'COMMENT ON COLUMN %s.%s IS $_$%s$_$',
|
||||||
|
$quotedTable,
|
||||||
|
'"'.str_replace('"', '""', $column).'"',
|
||||||
|
$description,
|
||||||
|
));
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -23,7 +23,10 @@ interface CategoryRepositoryInterface
|
|||||||
/**
|
/**
|
||||||
* Construit un QueryBuilder de liste avec filtre soft-delete et tri par defaut.
|
* Construit un QueryBuilder de liste avec filtre soft-delete et tri par defaut.
|
||||||
* - $includeDeleted = false : exclut les categories soft-deleted (RG-1.08)
|
* - $includeDeleted = false : exclut les categories soft-deleted (RG-1.08)
|
||||||
|
* - $typeCode non null : ne garde que les categories dont le CategoryType
|
||||||
|
* porte ce code (filtre `?typeCode=`, ex. FOURNISSEUR / CLIENT). Sert au
|
||||||
|
* multi-select Categorie du fournisseur (M2, RG-2.10).
|
||||||
* - Tri : name ASC (RG-1.10).
|
* - Tri : name ASC (RG-1.10).
|
||||||
*/
|
*/
|
||||||
public function createListQueryBuilder(bool $includeDeleted = false): QueryBuilder;
|
public function createListQueryBuilder(bool $includeDeleted = false, ?string $typeCode = null): QueryBuilder;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -40,7 +40,7 @@ final class CategoryProvider implements ProviderInterface
|
|||||||
$includeDeleted = $this->readIncludeDeleted($context);
|
$includeDeleted = $this->readIncludeDeleted($context);
|
||||||
|
|
||||||
if ($operation instanceof CollectionOperationInterface) {
|
if ($operation instanceof CollectionOperationInterface) {
|
||||||
$qb = $this->repository->createListQueryBuilder($includeDeleted);
|
$qb = $this->repository->createListQueryBuilder($includeDeleted, $this->readTypeCode($context));
|
||||||
|
|
||||||
// Echappatoire ?pagination=false : retourne la collection complete sans Paginator.
|
// Echappatoire ?pagination=false : retourne la collection complete sans Paginator.
|
||||||
// Utile pour les drawers Role/Permission/Site/CategoryType qui alimentent un <select>.
|
// Utile pour les drawers Role/Permission/Site/CategoryType qui alimentent un <select>.
|
||||||
@@ -97,4 +97,22 @@ final class CategoryProvider implements ProviderInterface
|
|||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Lit le filtre `?typeCode=` depuis les filtres API Platform. Renvoie le code
|
||||||
|
* normalise (trim) ou null si absent / vide. Ne contraint pas la casse : la
|
||||||
|
* comparaison SQL se fait sur le code exact stocke (ex. FOURNISSEUR, CLIENT).
|
||||||
|
*/
|
||||||
|
private function readTypeCode(array $context): ?string
|
||||||
|
{
|
||||||
|
$raw = $context['filters']['typeCode'] ?? null;
|
||||||
|
|
||||||
|
if (!is_string($raw)) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
$raw = trim($raw);
|
||||||
|
|
||||||
|
return '' === $raw ? null : $raw;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -14,14 +14,16 @@ use RuntimeException;
|
|||||||
use Symfony\Component\DependencyInjection\Attribute\Autowire;
|
use Symfony\Component\DependencyInjection\Attribute\Autowire;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Fixtures dev/test du module Catalog : ~11 categories de demonstration, toutes
|
* Fixtures dev/test du module Catalog : categories de demonstration rattachees
|
||||||
* rattachees au type unique CLIENT (refonte taxonomie ERP-78). Chaque categorie
|
* a leur CategoryType. Le type CLIENT porte ~11 categories clients (refonte
|
||||||
* porte un `code` stable. Alimente le repertoire clients (ClientFixtures, module
|
* taxonomie ERP-78) ; le type FOURNISSEUR porte les categories fournisseurs
|
||||||
* Commercial) avec des donnees realistes couvrant RG-1.03 (codes DISTRIBUTEUR /
|
* (ERP-84 : Negociant, Cooperative...). Chaque categorie porte un `code` stable.
|
||||||
* COURTIER) et RG-1.29 (codes interdits sur adresse).
|
* Alimente le repertoire clients (ClientFixtures, module Commercial) avec des
|
||||||
|
* donnees realistes couvrant RG-1.03 (codes DISTRIBUTEUR / COURTIER) et RG-1.29
|
||||||
|
* (codes interdits sur adresse), et le multi-select Categorie fournisseur (M2).
|
||||||
*
|
*
|
||||||
* Depend de CategoryTypeFixtures : le type CLIENT doit etre seede avant de
|
* Depend de CategoryTypeFixtures : les types CLIENT et FOURNISSEUR doivent etre
|
||||||
* pouvoir y rattacher des Category.
|
* seedes avant de pouvoir y rattacher des Category.
|
||||||
*
|
*
|
||||||
* Idempotence : lookup par `code` parmi les categories non supprimees (deletedAt
|
* Idempotence : lookup par `code` parmi les categories non supprimees (deletedAt
|
||||||
* null), coherent avec l'index unique partiel uq_category_code (code WHERE
|
* null), coherent avec l'index unique partiel uq_category_code (code WHERE
|
||||||
@@ -39,17 +41,17 @@ use Symfony\Component\DependencyInjection\Attribute\Autowire;
|
|||||||
*/
|
*/
|
||||||
class CategoryFixtures extends Fixture implements DependentFixtureInterface
|
class CategoryFixtures extends Fixture implements DependentFixtureInterface
|
||||||
{
|
{
|
||||||
/** Code du type unique (cf. CategoryTypeFixtures, migration ERP-78). */
|
|
||||||
private const string CLIENT_TYPE_CODE = 'CLIENT';
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Source unique des categories de demonstration : nom => code stable. Les 4
|
* Categories de demonstration par code de type. Les 4 premieres categories
|
||||||
* premieres (Distributeur / Courtier / Secteur / Autre) sont les categories
|
* CLIENT (Distributeur / Courtier / Secteur / Autre) sont les categories
|
||||||
* « systeme » reportees des anciens types ; leurs codes pilotent les RG.
|
* « systeme » reportees des anciens types ; leurs codes pilotent les RG.
|
||||||
|
* Les categories FOURNISSEUR (ERP-84) miroir de la migration
|
||||||
|
* Version20260605120000. Chaque valeur : nom => code stable.
|
||||||
*
|
*
|
||||||
* @var array<string, string>
|
* @var array<string, array<string, string>>
|
||||||
*/
|
*/
|
||||||
private const CATEGORIES = [
|
private const CATEGORIES_BY_TYPE = [
|
||||||
|
'CLIENT' => [
|
||||||
'Distributeur' => 'DISTRIBUTEUR',
|
'Distributeur' => 'DISTRIBUTEUR',
|
||||||
'Courtier' => 'COURTIER',
|
'Courtier' => 'COURTIER',
|
||||||
'Secteur' => 'SECTEUR',
|
'Secteur' => 'SECTEUR',
|
||||||
@@ -61,6 +63,14 @@ class CategoryFixtures extends Fixture implements DependentFixtureInterface
|
|||||||
'Services' => 'SERVICES',
|
'Services' => 'SERVICES',
|
||||||
'Association' => 'ASSOCIATION',
|
'Association' => 'ASSOCIATION',
|
||||||
'Indépendant' => 'INDEPENDANT',
|
'Indépendant' => 'INDEPENDANT',
|
||||||
|
],
|
||||||
|
'FOURNISSEUR' => [
|
||||||
|
'Négociant' => 'NEGOCIANT',
|
||||||
|
'Coopérative' => 'COOPERATIVE',
|
||||||
|
'Producteur' => 'PRODUCTEUR',
|
||||||
|
'Grossiste' => 'GROSSISTE',
|
||||||
|
'Importateur' => 'IMPORTATEUR',
|
||||||
|
],
|
||||||
];
|
];
|
||||||
|
|
||||||
public function __construct(
|
public function __construct(
|
||||||
@@ -84,31 +94,33 @@ class CategoryFixtures extends Fixture implements DependentFixtureInterface
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
$clientType = null;
|
// Index des types presents par code, pour rattacher chaque categorie.
|
||||||
|
$typesByCode = [];
|
||||||
foreach ($this->categoryTypeRepository->findAllOrderedByLabel() as $type) {
|
foreach ($this->categoryTypeRepository->findAllOrderedByLabel() as $type) {
|
||||||
if (self::CLIENT_TYPE_CODE === $type->getCode()) {
|
$typesByCode[$type->getCode()] = $type;
|
||||||
$clientType = $type;
|
|
||||||
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!$clientType instanceof CategoryType) {
|
foreach (self::CATEGORIES_BY_TYPE as $typeCode => $categories) {
|
||||||
// Misconfiguration : CategoryTypeFixtures n'a pas tourne avant.
|
$type = $typesByCode[$typeCode] ?? null;
|
||||||
throw new RuntimeException(
|
|
||||||
'CategoryTypeFixtures doit avoir seede le type "CLIENT" avant CategoryFixtures.',
|
if (!$type instanceof CategoryType) {
|
||||||
);
|
// Misconfiguration : CategoryTypeFixtures n'a pas seede ce type.
|
||||||
|
throw new RuntimeException(sprintf(
|
||||||
|
'CategoryTypeFixtures doit avoir seede le type "%s" avant CategoryFixtures.',
|
||||||
|
$typeCode,
|
||||||
|
));
|
||||||
}
|
}
|
||||||
|
|
||||||
foreach (self::CATEGORIES as $name => $code) {
|
foreach ($categories as $name => $code) {
|
||||||
$this->ensureCategory($manager, $name, $code, $clientType);
|
$this->ensureCategory($manager, $name, $code, $type);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
$manager->flush();
|
$manager->flush();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Cree la categorie (name, code) sous le type CLIENT si son code n'existe pas
|
* Cree la categorie (name, code) sous le type fourni si son code n'existe pas
|
||||||
* encore parmi les categories actives, sinon la laisse en place. Lookup
|
* encore parmi les categories actives, sinon la laisse en place. Lookup
|
||||||
* aligne sur l'index unique partiel uq_category_code.
|
* aligne sur l'index unique partiel uq_category_code.
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -12,10 +12,14 @@ use Doctrine\Persistence\ObjectManager;
|
|||||||
/**
|
/**
|
||||||
* Fixtures du module Catalog : seed du type de categorie (M1).
|
* Fixtures du module Catalog : seed du type de categorie (M1).
|
||||||
*
|
*
|
||||||
* Refonte taxonomie ERP-78 : le modele n'a plus qu'UN SEUL `category_type`,
|
* Refonte taxonomie ERP-78 : le type CLIENT (code CLIENT, label « Client »)
|
||||||
* CLIENT (code CLIENT, label « Client »). Distributeur / Courtier / Secteur /
|
* porte les categories clients ; Distributeur / Courtier / Secteur / Autre (et
|
||||||
* Autre (et les categories metier fines) sont desormais des `Category` codees
|
* les categories metier fines) sont des `Category` codees rattachees a ce type
|
||||||
* rattachees a ce type (cf. CategoryFixtures + migration Version20260602100000).
|
* (cf. CategoryFixtures + migration Version20260602100000).
|
||||||
|
*
|
||||||
|
* ERP-84 : ajout du type FOURNISSEUR (code FOURNISSEUR, label « Fournisseur »),
|
||||||
|
* taxonomie distincte des fournisseurs (Negociant, Cooperative...). Mirroir de
|
||||||
|
* la migration Version20260605120000.
|
||||||
*
|
*
|
||||||
* Pourquoi une fixture EN PLUS du seed de la migration : `category_type` est une
|
* Pourquoi une fixture EN PLUS du seed de la migration : `category_type` est une
|
||||||
* entite managee par l ORM, donc le purger Doctrine la vide avant chaque
|
* entite managee par l ORM, donc le purger Doctrine la vide avant chaque
|
||||||
@@ -31,11 +35,13 @@ use Doctrine\Persistence\ObjectManager;
|
|||||||
class CategoryTypeFixtures extends Fixture
|
class CategoryTypeFixtures extends Fixture
|
||||||
{
|
{
|
||||||
/**
|
/**
|
||||||
* Source unique du type : code technique => libelle FR. Doit rester aligne
|
* Source unique des types : code technique => libelle FR. Doit rester aligne
|
||||||
* sur le seed de la migration Version20260602100000 (type unique CLIENT).
|
* sur le seed des migrations Version20260602100000 (CLIENT) et
|
||||||
|
* Version20260605120000 (FOURNISSEUR).
|
||||||
*/
|
*/
|
||||||
private const TYPES = [
|
private const TYPES = [
|
||||||
'CLIENT' => 'Client',
|
'CLIENT' => 'Client',
|
||||||
|
'FOURNISSEUR' => 'Fournisseur',
|
||||||
];
|
];
|
||||||
|
|
||||||
public function __construct(
|
public function __construct(
|
||||||
|
|||||||
@@ -48,7 +48,7 @@ class DoctrineCategoryRepository extends ServiceEntityRepository implements Cate
|
|||||||
return [] !== $qb->getQuery()->getResult();
|
return [] !== $qb->getQuery()->getResult();
|
||||||
}
|
}
|
||||||
|
|
||||||
public function createListQueryBuilder(bool $includeDeleted = false): QueryBuilder
|
public function createListQueryBuilder(bool $includeDeleted = false, ?string $typeCode = null): QueryBuilder
|
||||||
{
|
{
|
||||||
$qb = $this->createQueryBuilder('c')
|
$qb = $this->createQueryBuilder('c')
|
||||||
->orderBy('c.name', 'ASC')
|
->orderBy('c.name', 'ASC')
|
||||||
@@ -58,6 +58,16 @@ class DoctrineCategoryRepository extends ServiceEntityRepository implements Cate
|
|||||||
$qb->andWhere('c.deletedAt IS NULL');
|
$qb->andWhere('c.deletedAt IS NULL');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Filtre `?typeCode=` : jointure sur le CategoryType pour ne garder que
|
||||||
|
// les categories du type demande (ex. FOURNISSEUR). La jointure reste
|
||||||
|
// compatible avec le Paginator ORM (fetchJoinCollection) du provider.
|
||||||
|
if (null !== $typeCode) {
|
||||||
|
$qb->join('c.categoryType', 'ct')
|
||||||
|
->andWhere('ct.code = :typeCode')
|
||||||
|
->setParameter('typeCode', $typeCode)
|
||||||
|
;
|
||||||
|
}
|
||||||
|
|
||||||
return $qb;
|
return $qb;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,86 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace App\Tests\Module\Catalog\Api;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Tests du filtre `?typeCode=` sur GET /api/categories (ERP-84).
|
||||||
|
*
|
||||||
|
* Brique manquante avant le M2 : le filtre n'existait pas en prod (ERP-78 avait
|
||||||
|
* unifie sur un type unique CLIENT). Apres implementation :
|
||||||
|
* - `?typeCode=FOURNISSEUR` ne renvoie QUE les categories du type FOURNISSEUR ;
|
||||||
|
* - le filtre n'altere pas l'echappatoire `?pagination=false` ;
|
||||||
|
* - un code inexistant renvoie une liste vide (pas d'erreur).
|
||||||
|
*
|
||||||
|
* @internal
|
||||||
|
*/
|
||||||
|
final class CategoryTypeCodeFilterTest extends AbstractCatalogApiTestCase
|
||||||
|
{
|
||||||
|
public function testTypeCodeFilterReturnsOnlyMatchingType(): void
|
||||||
|
{
|
||||||
|
$clientType = $this->createCategoryType('TEST_CLIENT');
|
||||||
|
$supplierType = $this->createCategoryType('TEST_FOURNISSEUR');
|
||||||
|
|
||||||
|
$this->createCategory(self::TEST_CATEGORY_PREFIX.'client_one', $clientType);
|
||||||
|
$this->createCategory(self::TEST_CATEGORY_PREFIX.'supplier_one', $supplierType);
|
||||||
|
$this->createCategory(self::TEST_CATEGORY_PREFIX.'supplier_two', $supplierType);
|
||||||
|
|
||||||
|
$client = $this->createAdminClient();
|
||||||
|
$response = $client->request('GET', '/api/categories?typeCode=TEST_FOURNISSEUR&pagination=false');
|
||||||
|
self::assertSame(200, $response->getStatusCode());
|
||||||
|
|
||||||
|
$members = $response->toArray()['member'];
|
||||||
|
$names = array_map(fn (array $m): string => $m['name'], $members);
|
||||||
|
$testOnly = array_values(array_filter(
|
||||||
|
$names,
|
||||||
|
fn (string $n): bool => str_starts_with($n, self::TEST_CATEGORY_PREFIX),
|
||||||
|
));
|
||||||
|
|
||||||
|
sort($testOnly);
|
||||||
|
self::assertSame(
|
||||||
|
[
|
||||||
|
self::TEST_CATEGORY_PREFIX.'supplier_one',
|
||||||
|
self::TEST_CATEGORY_PREFIX.'supplier_two',
|
||||||
|
],
|
||||||
|
$testOnly,
|
||||||
|
'Le filtre ?typeCode= doit ne renvoyer QUE les categories du type demande.',
|
||||||
|
);
|
||||||
|
|
||||||
|
// Tous les types embarques doivent etre le type filtre.
|
||||||
|
foreach ($members as $member) {
|
||||||
|
self::assertSame('TEST_FOURNISSEUR', $member['categoryType']['code']);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testTypeCodeFilterWorksWithPagination(): void
|
||||||
|
{
|
||||||
|
$supplierType = $this->createCategoryType('TEST_FOURNISSEUR');
|
||||||
|
$this->createCategory(self::TEST_CATEGORY_PREFIX.'paginated', $supplierType);
|
||||||
|
|
||||||
|
$client = $this->createAdminClient();
|
||||||
|
// Sans ?pagination=false : on doit obtenir l'enveloppe Hydra paginee.
|
||||||
|
$response = $client->request('GET', '/api/categories?typeCode=TEST_FOURNISSEUR');
|
||||||
|
self::assertSame(200, $response->getStatusCode());
|
||||||
|
|
||||||
|
$data = $response->toArray();
|
||||||
|
self::assertArrayHasKey('totalItems', $data, 'Le filtre ne doit pas casser la pagination Hydra.');
|
||||||
|
self::assertArrayHasKey('member', $data);
|
||||||
|
|
||||||
|
foreach ($data['member'] as $member) {
|
||||||
|
self::assertSame('TEST_FOURNISSEUR', $member['categoryType']['code']);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testUnknownTypeCodeReturnsEmptyList(): void
|
||||||
|
{
|
||||||
|
$type = $this->createCategoryType('TEST_CLIENT');
|
||||||
|
$this->createCategory(self::TEST_CATEGORY_PREFIX.'lonely', $type);
|
||||||
|
|
||||||
|
$client = $this->createAdminClient();
|
||||||
|
$response = $client->request('GET', '/api/categories?typeCode=TEST_DOES_NOT_EXIST&pagination=false');
|
||||||
|
self::assertSame(200, $response->getStatusCode());
|
||||||
|
|
||||||
|
self::assertSame([], $response->toArray()['member']);
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user