[TRA 15238] Export SSD

.env.model

@@ -122,7 +122,9 @@ S3_REGION=*********
 S3_ACCESS_KEY_ID=*********
 S3_SECRET_ACCESS_KEY=*********
 S3_BUCKET=*********
-
+S3_REGISTRY_ERRORS_BUCKET=*********
+S3_REGISTRY_IMPORTS_BUCKET=*********
+S3_REGISTRY_EXPORTS_BUCKET=*********
 # File storage configuration for empty bsds templates
 S3_BSD_TEMPLATES_ACCESS_KEY_ID==*********
 S3_BSD_TEMPLATES_SECRET_ACCESS_KEY==*********

.github/workflows/e2e.yml

@@ -31,6 +31,7 @@ jobs:
       - name: Init DB & ES index
         run: |
           npx nx run back:codegen
+          npx nx run @td/codegen-back:build
           npx nx run @td/prisma:generate
           npx nx run @td/codegen-ui:build
           TERM=xterm bash ./scripts/deploy-db.sh

.github/workflows/integration-tests.yml

@@ -29,6 +29,7 @@ jobs:
       - name: Init DB & ES index
         run: |
           npx nx run back:codegen
+          npx nx run @td/codegen-back:build
           npx nx run @td/prisma:generate
           TERM=xterm bash ./scripts/deploy-db.sh
       - name: Create MinIO buckets

Changelog.md

@@ -7,6 +7,10 @@ et le projet suit un schéma de versionning inspiré de [Calendar Versioning](ht
 
 # [2024.12.1] 17/12/2024
 
+#### :rocket: Nouvelles fonctionnalités
+
+- Ajout de l'export v2 des registres SSD [PR 3755](https://github.com/MTES-MCT/trackdechets/pull/3755)
+
 #### :bug: Corrections de bugs
 
 - Ne pas doubler les quantités restantes à regrouper lorsqu'on modifie un bordereau de groupement [PR 3760](https://github.com/MTES-MCT/trackdechets/pull/3760)

apps/queues-runner/src/main.ts

@@ -14,7 +14,9 @@ import {
   updateAppendix2Queue,
   updateAppendix2Job,
   registryImportQueue,
-  processRegistryImportJob
+  processRegistryImportJob,
+  registryExportQueue,
+  processRegistryExportJob
 } from "back";
 
 import { schema } from "@td/env";
@@ -38,6 +40,7 @@ function startConsumers() {
   administrativeTransferQueue.process(processAdministrativeTransferJob);
   updateAppendix2Queue.process(updateAppendix2Job);
   registryImportQueue.process(processRegistryImportJob);
+  registryExportQueue.process(processRegistryExportJob);
 }
 
 startConsumers();

back/codegen.yml

@@ -8,6 +8,7 @@ generates:
     config:
       contextType: ../../types#GraphQLContext
       enumsAsTypes: true
+      allowParentTypeOverride: true
       scalars:
         DateTime: Date
         URL: URL

back/project.json

@@ -72,6 +72,15 @@
       "configurations": {
         "integration": {}
       }
+    },
+    "rebuild-registry-lookup": {
+      "executor": "nx:run-commands",
+      "options": {
+        "command": "tsx --tsconfig back/tsconfig.lib.json back/src/scripts/bin/rebuildRegistryLookup.ts"
+      },
+      "configurations": {
+        "integration": {}
+      }
     }
   },
   "tags": []

back/src/bsdasris/edition.ts

@@ -40,6 +40,7 @@ type EditableBsdasriFields = Required<
     | "finalOperations"
     | "FinalOperationToFinalBsdasri"
     | "bsdasriRevisionRequests"
+    | "registryLookups"
   >
 >;
 // Defines until which signature BSDASRI fields can be modified

back/src/bsds/resolvers/mutations/utils/clone.utils.ts

@@ -56,7 +56,9 @@ export const cloneBsda = async (user: Express.User, id: string) => {
     | "grouping"
     | "rowNumber"
     // Done manually
+    // TODO(registry): clone associated registryLookup
     | "finalOperations"
+    | "registryLookups"
   > = {
     id: getReadableId(ReadableIdPrefix.BSDA),
     brokerCompanyAddress: bsda.brokerCompanyAddress,
@@ -244,6 +246,7 @@ export const cloneBsdasri = async (user: Express.User, id: string) => {
     | "rowNumber"
     // Done manually
     | "finalOperations"
+    | "registryLookups"
   > = {
     id: getReadableId(ReadableIdPrefix.DASRI),
     createdAt: bsdasri.createdAt,
@@ -419,7 +422,7 @@ export const cloneBsff = async (user: Express.User, id: string) => {
   const newBsffCreateInput: Omit<
     Required<Prisma.BsffCreateInput>,
     // Ignored for the time being
-    "rowNumber"
+    "rowNumber" | "registryLookups"
   > = {
     id: getReadableId(ReadableIdPrefix.FF),
     createdAt: bsff.createdAt,
@@ -541,7 +544,7 @@ export const cloneBsvhu = async (user: Express.User, id: string) => {
   const newBsvhuCreateInput: Omit<
     Required<Prisma.BsvhuCreateInput>,
     // Ignored for the time being
-    "rowNumber"
+    "rowNumber" | "registryLookups"
   > = {
     id: getReadableId(ReadableIdPrefix.VHU),
     createdAt: bsvhu.createdAt,
@@ -685,7 +688,7 @@ export const cloneBspaoh = async (user: Express.User, id: string) => {
   const newBspaohCreateInput: Omit<
     Required<Prisma.BspaohCreateInput>,
     // Ignored for the time being
-    "rowNumber"
+    "rowNumber" | "registryLookups"
   > = {
     id: getReadableId(ReadableIdPrefix.PAOH),
     canAccessDraftSirets: bspaoh.canAccessDraftSirets,
@@ -820,6 +823,7 @@ export const cloneBsdd = async (
     | "bsddRevisionRequests"
     // Done manually
     | "finalOperations"
+    | "registryLookups"
   > = {
     owner: {
       connect: {

back/src/bspaoh/validation/rules.ts

@@ -48,6 +48,7 @@ type EditableBspaohFields = Required<
     | "transportersSirets"
     | "canAccessDraftSirets"
     | "transporterTransportTakenOverAt"
+    | "registryLookups"
   >
 >;
 

back/src/common/typeDefs/common.enums.graphql

@@ -87,3 +87,27 @@ enum TransportMode {
   "Autre (utilisé avec Packaging = PIPELINE par exemple)"
   OTHER
 }
+
+"Type de déclaration"
+enum DeclarationType {
+  "Bordereau"
+  BSD
+  "Registre"
+  REGISTRY
+  "Tous types"
+  ALL
+}
+
+"""
+Format de l'export du registre
+"""
+enum FormsRegisterExportFormat {
+  """
+  Fichier csv
+  """
+  CSV
+  """
+  Fichier Excel
+  """
+  XLSX
+}

back/src/companies/converters.ts

@@ -1,5 +1,5 @@
 import { Company } from "@prisma/client";
-import { CompanyPrivate } from "../generated/graphql/types";
+import { CompanyPrivate, CompanyPublic } from "../generated/graphql/types";
 import { libelleFromCodeNaf } from "./sirene/utils";
 
 export function toGqlCompanyPrivate(company: Company): CompanyPrivate {
@@ -23,3 +23,14 @@ export function toGqlCompanyPrivate(company: Company): CompanyPrivate {
     }
   };
 }
+
+export function toGqlCompanyPublic(company: Company): CompanyPublic {
+  return {
+    ...company,
+    ecoOrganismeAgreements:
+      company.ecoOrganismeAgreements?.map(a => new URL(a)) ?? [],
+    naf: company.codeNaf,
+    isDormant: company.isDormantSince !== null,
+    libelleNaf: company.codeNaf ? libelleFromCodeNaf(company.codeNaf) : ""
+  };
+}

back/src/companies/dataloaders.ts

@@ -1,18 +1,34 @@
 import DataLoader from "dataloader";
 import { prisma } from "@td/prisma";
-import { UserRole } from "@prisma/client";
+import { Company, UserRole } from "@prisma/client";
 
 export function createCompanyDataLoaders() {
   return {
+    companies: new DataLoader((sirets: string[]) => getCompanies(sirets)),
     installations: new DataLoader((sirets: string[]) =>
       getInstallations(sirets)
     ),
     companiesAdmin: new DataLoader((companyIds: string[]) =>
       getCompaniesAdmin(companyIds)
+    ),
+    delegators: new DataLoader((companyIds: string[]) =>
+      getCompaniesDelegators(companyIds)
     )
   };
 }
 
+async function getCompanies(sirets: string[]) {
+  const companies = await prisma.company.findMany({
+    where: {
+      orgId: { in: sirets }
+    }
+  });
+
+  return sirets.map(
+    siret => companies.find(company => company.orgId === siret) ?? null
+  );
+}
+
 async function getInstallations(sirets: string[]) {
   const installations = await prisma.installation.findMany({
     where: {
@@ -91,3 +107,25 @@ async function getCompaniesAdmin(companyIds: string[]) {
     return association?.admin ?? null;
   });
 }
+
+const getCompaniesDelegators = async (
+  companyIds: string[]
+): Promise<Company[][]> => {
+  const delegations = await prisma.registryDelegation.findMany({
+    where: {
+      delegateId: { in: companyIds },
+      revokedBy: null,
+      cancelledBy: null,
+      startDate: { lte: new Date() },
+      OR: [{ endDate: null }, { endDate: { gt: new Date() } }]
+    },
+    include: {
+      delegator: true
+    }
+  });
+  return companyIds.map(companyId =>
+    delegations
+      .filter(delegation => delegation.delegateId === companyId)
+      .map(delegation => delegation.delegator)
+  );
+};

back/src/companies/resolvers/CompanyPrivate.ts

@@ -3,6 +3,7 @@ import { CompanyPrivateResolvers } from "../../generated/graphql/types";
 import { getCompanyUsers } from "../database";
 import { getUserRole, grants, toGraphQLPermission } from "../../permissions";
 import { toGqlNotifications } from "../../users/notifications";
+import { toGqlCompanyPublic } from "../converters";
 
 const companyPrivateResolvers: CompanyPrivateResolvers = {
   users: async (parent, _, context) => {
@@ -96,6 +97,10 @@ const companyPrivateResolvers: CompanyPrivateResolvers = {
     return prisma.company
       .findUnique({ where: { id: parent.id } })
       .receivedAdministrativeTransfers() as any;
+  },
+  delegators: async (parent, _, context) => {
+    const res = await context.dataloaders.delegators.load(parent.id);
+    return res.map(toGqlCompanyPublic);
   }
 };
 

back/src/companies/typeDefs/company.objects.graphql

@@ -154,6 +154,11 @@ type CompanyPrivate {
   Liste des transferts administratifs reçus par l'établissement
   """
   receivedAdministrativeTransfers: [AdministrativeTransfer!]
+
+  """
+  Liste des entreprises ayant délégué la déclaration de leurs registres
+  """
+  delegators: [CompanyPublic!]
 }
 
 type CompanyPrivateEdge {

back/src/forms/edition.ts

@@ -79,6 +79,7 @@ type EditableBsddFields = Required<
     | "finalOperations"
     | "FinalOperationToFinalForm"
     | "emptyReturnADR"
+    | "registryLookups"
   >
 >;
 

back/src/forms/typeDefs/bsdd.enums.graphql

@@ -177,20 +177,6 @@ enum FormsRegisterExportType {
   BROKERED
 }
 
-"""
-Format de l'export du registre
-"""
-enum FormsRegisterExportFormat {
-  """
-  Fichier csv
-  """
-  CSV
-  """
-  Fichier Excel
-  """
-  XLSX
-}
-
 "Charte citerne - Raison pour laquelle la citerne n'a pas été rincée"
 enum CiterneNotWashedOutReason {
   "Exemptions de rinçage (citerne dédiée)"

back/src/index.ts

@@ -24,14 +24,16 @@ export { operationHooksQueue } from "./queue/producers/operationHook";
 export { administrativeTransferQueue } from "./queue/producers/administrativeTransfer";
 export { updateAppendix2Queue } from "./queue/producers/updateAppendix2";
 export { registryImportQueue } from "./queue/producers/registryImport";
+export { registryExportQueue } from "./queue/producers/registryExport";
 export {
   indexBsdJob,
   operationHookJob,
   updateAppendix2Job,
   sendMailJob,
   postGericoJob,
   processAdministrativeTransferJob,
-  processRegistryImportJob
+  processRegistryImportJob,
+  processRegistryExportJob
 } from "./queue/jobs";
 
 export {

back/src/queue/jobs/index.ts

@@ -7,3 +7,4 @@ export { postGericoJob } from "./gerico";
 export { processAdministrativeTransferJob } from "./administrativeTransfer";
 export { updateAppendix2Job } from "./updateAppendix2";
 export { processRegistryImportJob } from "./processRegistryImport";
+export { processRegistryExportJob } from "./processRegistryExport";