From 6900a0090da78c4030110159e5f17715d94db93f Mon Sep 17 00:00:00 2001
From: Eric SANCHEZ <eric.cmsfr@gmail.com>
Date: Wed, 13 Nov 2024 16:29:10 +0100
Subject: [PATCH] Ajout des nouvelles colonnes

---
 .../PlanDeTransport/pointDeRassemblement.ts   |  5 +++
 .../import/pointDeRassemblementImport.ts      | 20 +++++++++--
 .../pointDeRassemblementImportMapper.ts       |  6 ++++
 .../planDeTransport/pointDeRassemblement.ts   | 35 +++++++++++++++++++
 4 files changed, 64 insertions(+), 2 deletions(-)

diff --git a/api/src/__tests__/fixtures/PlanDeTransport/pointDeRassemblement.ts b/api/src/__tests__/fixtures/PlanDeTransport/pointDeRassemblement.ts
index 5284b2736c..d40902beb1 100644
--- a/api/src/__tests__/fixtures/PlanDeTransport/pointDeRassemblement.ts
+++ b/api/src/__tests__/fixtures/PlanDeTransport/pointDeRassemblement.ts
@@ -19,6 +19,11 @@ function getNewPointDeRassemblementFixture(object: Partial<PointDeRassemblementT
     },
     matricule: faker.lorem.words(),
     particularitesAcces: faker.lorem.words(),
+    uai: faker.string.alpha(8).toUpperCase(),
+    numeroOrdre: faker.number.int({ min: 4, max: 16 }).toString().padStart(3, "0"),
+    dateCreation: faker.date.past(),
+    dateDebutValidite: faker.date.past(),
+    dateDerniereModification: faker.date.past(),
     ...object,
   };
 }
diff --git a/api/src/planDeTransport/pointDeRassemblement/import/pointDeRassemblementImport.ts b/api/src/planDeTransport/pointDeRassemblement/import/pointDeRassemblementImport.ts
index fef4b7e4a5..844242ec9a 100644
--- a/api/src/planDeTransport/pointDeRassemblement/import/pointDeRassemblementImport.ts
+++ b/api/src/planDeTransport/pointDeRassemblement/import/pointDeRassemblementImport.ts
@@ -20,14 +20,30 @@ export interface PointDeRassemblementCSV {
   "Région académique": string;
   Académie: string;
   Département: string;
+  "ID temporaire PDR": string;
+  UAI: string;
   "Numéro d'ordre": string;
   "Date  début validité de l'enregistrement": string;
-  "ID temporaire PDR": string;
+  "Point de Rassemblement : Date de création": string;
+  "Point de Rassemblement : Date de dernière modification": string;
 }
 
 export type PointDeRassemblementImportMapped = Pick<
   PointDeRassemblementType,
-  "name" | "address" | "city" | "zip" | "department" | "region" | "academie" | "particularitesAcces" | "matricule"
+  | "name"
+  | "address"
+  | "city"
+  | "zip"
+  | "department"
+  | "region"
+  | "academie"
+  | "particularitesAcces"
+  | "matricule"
+  | "uai"
+  | "numeroOrdre"
+  | "dateCreation"
+  | "dateDebutValidite"
+  | "dateDerniereModification"
 > & {
   complementAddress: string;
 };
diff --git a/api/src/planDeTransport/pointDeRassemblement/import/pointDeRassemblementImportMapper.ts b/api/src/planDeTransport/pointDeRassemblement/import/pointDeRassemblementImportMapper.ts
index d651fc0a34..c9954d7b96 100644
--- a/api/src/planDeTransport/pointDeRassemblement/import/pointDeRassemblementImportMapper.ts
+++ b/api/src/planDeTransport/pointDeRassemblement/import/pointDeRassemblementImportMapper.ts
@@ -1,4 +1,5 @@
 import { academyList, departmentList, regionList } from "snu-lib";
+const { parse: parseDate } = require("date-fns");
 import { logger } from "../../../logger";
 import { PointDeRassemblementCSV, PointDeRassemblementImportMapped } from "./pointDeRassemblementImport";
 
@@ -16,6 +17,11 @@ export const mapPointDeRassemblements = (rawPdrs: PointDeRassemblementCSV[]): Po
       region: mapRegion(rawPdr["Région académique"]),
       academie: mapAcademy(rawPdr["Académie"]),
       matricule: rawPdr["Matricule du point de rassemblement"],
+      uai: rawPdr["UAI"],
+      numeroOrdre: rawPdr["Numéro d'ordre"],
+      dateCreation: parseDate(rawPdr["Point de Rassemblement : Date de création"], "dd/MM/yyyy", new Date()),
+      dateDebutValidite: parseDate(rawPdr["Date  début validité de l'enregistrement"], "dd/MM/yyyy", new Date()),
+      dateDerniereModification: parseDate(rawPdr["Point de Rassemblement : Date de dernière modification"], "dd/MM/yyyy", new Date()),
       // code: rawPdr["Matricule du point de rassemblement"],
     };
     if (!rawPdrWithoutId.name) {
diff --git a/packages/lib/src/mongoSchema/planDeTransport/pointDeRassemblement.ts b/packages/lib/src/mongoSchema/planDeTransport/pointDeRassemblement.ts
index dceef76551..b5241178f9 100644
--- a/packages/lib/src/mongoSchema/planDeTransport/pointDeRassemblement.ts
+++ b/packages/lib/src/mongoSchema/planDeTransport/pointDeRassemblement.ts
@@ -49,6 +49,41 @@ export const PointDeRassemblementSchema = {
     },
   },
 
+  uai: {
+    type: String,
+    documentation: {
+      description: "UAI du point de rassemblement",
+    },
+  },
+
+  numeroOrdre: {
+    type: String,
+    documentation: {
+      description: "Numéro d'ordre du point de rassemblement",
+    },
+  },
+
+  dateCreation: {
+    type: Date,
+    documentation: {
+      description: "Date de création du point de rassemblement",
+    },
+  },
+
+  dateDebutValidite: {
+    type: Date,
+    documentation: {
+      description: "Date de début de validité du point de rassemblement",
+    },
+  },
+
+  dateDerniereModification: {
+    type: Date,
+    documentation: {
+      description: "Date de dernière modification du point de rassemblement",
+    },
+  },
+
   // LEGACY
   complementAddress: {
     type: [