Registry - Améliorations (#4006)

MTES-MCT · Mar 5, 2025 · 3b57cb2 · 3b57cb2
1 parent 9b11ad0
commit 3b57cb2
Show file tree

Hide file tree

Showing 46 changed files with 192 additions and 177 deletions.
diff --git a/back/src/bsda/registryV2.ts b/back/src/bsda/registryV2.ts
@@ -229,7 +229,6 @@ export const toIncomingWasteV2 = (
     initialEmitterCompanyPostalCode,
     initialEmitterCompanyCity,
     initialEmitterCompanyCountry,
-    initialEmitterMunicipalitiesNames: null,
     initialEmitterMunicipalitiesInseeCodes: null,
     emitterCompanyIrregularSituation: null,
     emitterCompanyName: bsda.emitterCompanyName,
@@ -501,7 +500,6 @@ export const toOutgoingWasteV2 = (
     initialEmitterCompanyPostalCode,
     initialEmitterCompanyCity,
     initialEmitterCompanyCountry,
-    initialEmitterMunicipalitiesNames: null,
     initialEmitterMunicipalitiesInseeCodes: null,
     emitterCompanyIrregularSituation: null,
     emitterCompanySiret: bsda.emitterCompanySiret,

diff --git a/back/src/bsdasris/registryV2.ts b/back/src/bsdasris/registryV2.ts
@@ -119,7 +119,6 @@ export const toIncomingWasteV2 = (
     initialEmitterCompanyPostalCode: null,
     initialEmitterCompanyCity: null,
     initialEmitterCompanyCountry: null,
-    initialEmitterMunicipalitiesNames: null,
     initialEmitterMunicipalitiesInseeCodes: null,
     emitterCompanyIrregularSituation: null,
     emitterCompanyName: bsdasri.emitterCompanyName,
@@ -295,7 +294,6 @@ export const toOutgoingWasteV2 = (
     initialEmitterCompanyPostalCode: null,
     initialEmitterCompanyCity: null,
     initialEmitterCompanyCountry: null,
-    initialEmitterMunicipalitiesNames: null,
     initialEmitterMunicipalitiesInseeCodes: null,
     emitterCompanyIrregularSituation: null,
     emitterCompanySiret: bsdasri.emitterCompanySiret,

diff --git a/back/src/bsffs/registryV2.ts b/back/src/bsffs/registryV2.ts
@@ -331,7 +331,6 @@ export const toIncomingWasteV2 = (
     initialEmitterCompanyPostalCode,
     initialEmitterCompanyCity,
     initialEmitterCompanyCountry,
-    initialEmitterMunicipalitiesNames: null,
     initialEmitterMunicipalitiesInseeCodes: null,
     emitterCompanyIrregularSituation: null,
     emitterCompanyName: bsff.emitterCompanyName,
@@ -567,7 +566,6 @@ export const toOutgoingWasteV2 = (
     initialEmitterCompanyPostalCode,
     initialEmitterCompanyCity,
     initialEmitterCompanyCountry,
-    initialEmitterMunicipalitiesNames: null,
     initialEmitterMunicipalitiesInseeCodes: null,
     emitterCompanyIrregularSituation: null,
     emitterCompanySiret: bsff.emitterCompanySiret,

diff --git a/back/src/bspaoh/registryV2.ts b/back/src/bspaoh/registryV2.ts
@@ -84,7 +84,6 @@ export const toIncomingWasteV2 = (
     initialEmitterCompanyPostalCode: null,
     initialEmitterCompanyCity: null,
     initialEmitterCompanyCountry: null,
-    initialEmitterMunicipalitiesNames: null,
     initialEmitterMunicipalitiesInseeCodes: null,
     emitterCompanyIrregularSituation: null,
     emitterCompanyName: bspaoh.emitterCompanyName,
@@ -245,7 +244,6 @@ export const toOutgoingWasteV2 = (
     initialEmitterCompanyPostalCode: null,
     initialEmitterCompanyCity: null,
     initialEmitterCompanyCountry: null,
-    initialEmitterMunicipalitiesNames: null,
     initialEmitterMunicipalitiesInseeCodes: null,
     emitterCompanyIrregularSituation: null,
     emitterCompanySiret: bspaoh.emitterCompanySiret,

diff --git a/back/src/bsvhu/registryV2.ts b/back/src/bsvhu/registryV2.ts
@@ -213,7 +213,6 @@ export const toOutgoingWasteV2 = (
     initialEmitterCompanyPostalCode: null,
     initialEmitterCompanyCity: null,
     initialEmitterCompanyCountry: null,
-    initialEmitterMunicipalitiesNames: null,
     initialEmitterMunicipalitiesInseeCodes: null,
     emitterCompanyIrregularSituation: !!bsvhu.emitterIrregularSituation,
     emitterCompanySiret: bsvhu.emitterCompanySiret,

diff --git a/back/src/forms/registryV2.ts b/back/src/forms/registryV2.ts
@@ -213,7 +213,6 @@ export const toIncomingWasteV2 = (
     initialEmitterCompanyPostalCode,
     initialEmitterCompanyCity,
     initialEmitterCompanyCountry,
-    initialEmitterMunicipalitiesNames: null,
     initialEmitterMunicipalitiesInseeCodes: null,
     emitterCompanyIrregularSituation: null,
     emitterCompanyName: bsdd.emitterCompanyName,
@@ -490,7 +489,6 @@ export const toOutgoingWasteV2 = (
     initialEmitterCompanyCity,
     initialEmitterCompanyCountry,
     initialEmitterMunicipalitiesInseeCodes: null,
-    initialEmitterMunicipalitiesNames: null,
     emitterCompanyIrregularSituation: null,
     emitterCompanySiret: bsdd.emitterCompanySiret,
     emitterCompanyName: bsdd.emitterCompanyName,

diff --git a/back/src/registryV2/columns.ts b/back/src/registryV2/columns.ts
@@ -230,10 +230,6 @@ export const EXPORT_COLUMNS: {
       label: "Producteur(s) - Code(s) INSEE de(s) commune(s)",
       format: formatArray
     },
-    initialEmitterMunicipalitiesNames: {
-      label: "Producteur(s) - Commune(s)",
-      format: formatArray
-    },
     emitterCompanyIrregularSituation: {
       label: "Expéditeur - Situation irrégulière",
       format: formatBoolean
@@ -528,10 +524,6 @@ export const EXPORT_COLUMNS: {
       label: "Producteur(s) - Code(s) INSEE de(s) commune(s)",
       format: formatArray
     },
-    initialEmitterMunicipalitiesNames: {
-      label: "Producteur(s) - Commune(s)",
-      format: formatArray
-    },
 
     emitterCompanyIrregularSituation: {
       label: "Expéditeur - Situation irrégulière",

diff --git a/back/src/registryV2/resolvers/mutations/__tests__/addToIncomingTexsRegistry.integration.ts b/back/src/registryV2/resolvers/mutations/__tests__/addToIncomingTexsRegistry.integration.ts
@@ -37,7 +37,6 @@ function getCorrectLine(siret: string) {
     initialEmitterCompanyCity: "Commune du producteur",
     initialEmitterCompanyCountryCode: "FR",
     initialEmitterMunicipalitiesInseeCodes: null,
-    initialEmitterMunicipalitiesNames: null,
     emitterCompanyType: "ETABLISSEMENT_FR",
     emitterCompanyOrgId: "78467169500103",
     emitterCompanyName: "Raison sociale de l'expéditeur",

diff --git a/back/src/registryV2/resolvers/mutations/__tests__/addToIncomingWasteRegistry.integration.ts b/back/src/registryV2/resolvers/mutations/__tests__/addToIncomingWasteRegistry.integration.ts
@@ -37,7 +37,6 @@ function getCorrectLine(siret: string) {
     initialEmitterCompanyCity: "Commune du producteur",
     initialEmitterCompanyCountryCode: "FR",
     initialEmitterMunicipalitiesInseeCodes: null,
-    initialEmitterMunicipalitiesNames: null,
     emitterCompanyType: "ETABLISSEMENT_FR",
     emitterCompanyOrgId: "78467169500103",
     emitterCompanyName: "Raison sociale de l'expéditeur",

diff --git a/back/src/registryV2/resolvers/mutations/__tests__/addToOutgoingTexsRegistry.integration.ts b/back/src/registryV2/resolvers/mutations/__tests__/addToOutgoingTexsRegistry.integration.ts
@@ -42,7 +42,6 @@ function getCorrectLine(siret: string) {
     initialEmitterCompanyCity: "Commune du producteur",
     initialEmitterCompanyCountryCode: "FR",
     initialEmitterMunicipalitiesInseeCodes: null,
-    initialEmitterMunicipalitiesNames: null,
     parcelInseeCodes: undefined,
     parcelNumbers: undefined,
     parcelCoordinates: ["47.829864 1.937389", "48.894258 2.240027"],

diff --git a/back/src/registryV2/resolvers/mutations/__tests__/addToOutgoingWasteRegistry.integration.ts b/back/src/registryV2/resolvers/mutations/__tests__/addToOutgoingWasteRegistry.integration.ts
@@ -36,7 +36,6 @@ function getCorrectLine(siret: string) {
     initialEmitterCompanyCity: "Commune du producteur",
     initialEmitterCompanyCountryCode: "FR",
     initialEmitterMunicipalitiesInseeCodes: null,
-    initialEmitterMunicipalitiesNames: null,
     destinationCompanyType: "ETABLISSEMENT_FR",
     destinationCompanyOrgId: "78467169500103",
     destinationCompanyName: "Raison sociale de l'expéditeur",

diff --git a/back/src/registryV2/resolvers/queries/__tests__/registryChangeAggregates.integration.ts b/back/src/registryV2/resolvers/queries/__tests__/registryChangeAggregates.integration.ts
@@ -50,7 +50,6 @@ function getIncomingTexsLine(siret: string) {
     initialEmitterCompanyCity: "Commune du producteur",
     initialEmitterCompanyCountryCode: "FR",
     initialEmitterMunicipalitiesInseeCodes: null,
-    initialEmitterMunicipalitiesNames: null,
     emitterCompanyType: "ETABLISSEMENT_FR",
     emitterCompanyOrgId: "78467169500103",
     emitterCompanyName: "Raison sociale de l'expéditeur",

diff --git a/back/src/registryV2/typeDefs/registryV2.enums.graphql b/back/src/registryV2/typeDefs/registryV2.enums.graphql
@@ -109,3 +109,18 @@ enum RegistryLineReason {
   "Spécifie que la ligne doit être supprimée du registre"
   CANCEL
 }
+
+enum RegisryCompanyType {
+  "Etablissement français"
+  ETABLISSEMENT_FR
+  "Entreprise de l'Union Européenne"
+  ENTREPRISE_UE
+  "Entreprise hors Union Européenne"
+  ENTREPRISE_HORS_UE
+  "Association"
+  ASSOCIATION
+  "Personne physique"
+  PERSONNE_PHYSIQUE
+  "Communes"
+  COMMUNES
+}