feat: migration preparation & global package upgrade for mongodb V7

.bin/scripts/seed-apply.sh

@@ -39,3 +39,4 @@ cat "$SEED_GZ" | docker compose -f "$ROOT_DIR/docker-compose.yml" exec -iT mongo
 yarn build:dev
 yarn cli migrations:up
 yarn cli mongodb:indexes:create
+# yarn cli recreate:indexes // when migration to V7 to replace with above

.bin/scripts/seed-update.sh

@@ -38,6 +38,7 @@ mkdir -p "$ROOT_DIR/.infra/files/mongodb"
 yarn build:dev
 yarn cli migrations:up
 yarn cli mongodb:indexes:create
+# yarn cli recreate:indexes // when migration to V7 to replace with above
 
 docker compose -f "$ROOT_DIR/docker-compose.yml" exec -it mongodb mongodump --uri "$TARGET_DB" --gzip --archive > "$SEED_GZ" 
 rm -f "$SEED_GPG"

.bin/scripts/setup-local-env.sh

@@ -48,3 +48,4 @@ yarn setup:mongodb
 yarn build:dev
 yarn cli migrations:up
 yarn cli mongodb:indexes:create
+# yarn cli recreate:indexes // when migration to V7 to replace with above

.talismanrc

@@ -8,7 +8,7 @@ fileignoreconfig:
 - filename: .bin/scripts/set-cypress-env.sh
   checksum: 4463ed7c1d5b82a8b152248b953778f37771bfba72865ee0e8af3b61cf3c38da
 - filename: .bin/scripts/setup-local-env.sh
-  checksum: f3cd7443153a8d4bc742ea6075b2ea9a174572b736186c6759fbf29f59567fd8
+  checksum: 7d480e0c37b177c4d84fb58b915da6495db0bb0fcd5996e0b3cf67d955929144
 - filename: .github/workflows/cypress.yml
   checksum: 39f98fb68fdebf6a36959706adb43a8219a4b7781ac35329f957dc1cfa8b6de0
 - filename: .github/workflows/deploy_preview.yml
@@ -28,7 +28,7 @@ fileignoreconfig:
 - filename: .infra/local/mongod.conf
   checksum: bb2ce0c27102259a5fa39da1fb4460af9ad6ad58adc715312e53dcd69c8e6be7
 - filename: .infra/vault/vault.yml
-  checksum: 6926cc583e24275ba52513ce9fd2559316f6bc75d5e869f9ed0e8c10d6b9f617
+  checksum: 7b101f10db1e047f483ba510e901723e59f54a92a54a059c1240cc9ae3f81f82
 - filename: docker-compose.yml
   checksum: 8cdd1da6c1155f26b417a27e26311d4f00b7d8bd6c21f1f86c1c7cb3f0599e6a
 - filename: server/.env.test
@@ -40,17 +40,17 @@ fileignoreconfig:
 - filename: server/src/db/migrations/20231127120528-remove-password.ts
   checksum: 5c7a2ec4655f0543f42bfbccc759bff4eb10456946885531c91107cac3e8dbc0
 - filename: server/src/db/migrations/202405230000000-migrate-fix-missing-date-blacklist.ts
-  checksum: 967bd89c16914bc70cf25d886d9800fb6fddcd53a8b87a1e78bda1c2167897ba
+  checksum: 0c1b814245a58b8ca788fbfab9899206edbddaae795d56963f86c5aa83ea555f
 - filename: server/src/http/controllers/appointments/appointments.controller.ts
   checksum: dc77c04efc26dcd8ca4816f392ab24a32a92cb45ca4b94adb593a08e7a2d231e
 - filename: server/src/http/routes/appointmentRequest.controller.ts
   checksum: d2770daa97ae332eec0b66497fdb717229895583ac3bfd48af1a830b36504968
 - filename: server/src/http/routes/auth/password.controller.ts
   checksum: 0eb3948d875508edf6d31f0ffe1290aac0cc02c9c80c913bcb04a312edd062cc
 - filename: server/src/jobs/database/obfuscateCollections.ts
-  checksum: 9b7aa9538398882159db97f7d271a37ff368cc73faa184993dc9ce13a088950e
+  checksum: df959adedd069bbfd68c6c5c99a9f506b980147a973f95b517c24e740d79ee37
 - filename: server/src/jobs/job.actions.ts
-  checksum: d716e214d828109181a138f0ae253d5489a3c544b2625917b458d1e07886c408
+  checksum: 40c0dfd4f33ec0f09d736e3e7554b0edee132165e1eb00440e196edf49e0c647
 - filename: server/src/jobs/lba_recruteur/formulaire/misc/removeVersionKeyFromRecruiters.ts
   checksum: 3cd111d8c109cfec357bae48af70d0cf5644d02cd2c4b9afc5b8aa07bccbd535
 - filename: server/src/security/accessTokenService.ts
@@ -86,7 +86,7 @@ fileignoreconfig:
 - filename: shared/helpers/generateUri.ts
   checksum: 6542db0d3eca959c6e81d574f8b71d4b18d2f1af21042ca5ed4dff319cd39555
 - filename: shared/helpers/openapi/__snapshots__/generateOpenapi.test.ts.snap
-  checksum: 527b5cc9cabe1009b736f2d2ab6da0b1f87f5536926a692c3a7e94cdee5d2e8a
+  checksum: caa1131ffe2f23d62ba2d4370173cce74ffa05a17330c8d342c41c4b971c6f9f
 - filename: shared/helpers/openapi/generateOpenapi.test.ts
   checksum: d7b85c3dff488cec523d78f0926e15dbea41071a1864bda62b4d6caeb2541df3
 - filename: shared/models/applications.model.ts
@@ -141,6 +141,10 @@ fileignoreconfig:
   checksum: 1ad48425b890a5ed3de19d079692e2ef7eac76483339a469a6cd9bc6d796ad26
 - filename: ui/utils/api.utils.ts
   checksum: 324cd501354cfff65447c2599c4cc8966aa8aac30dda7854623dd6f7f7b0d34e
+- filename: ui/components/ItemDetail/LbaJobComponents/LbaJobTechniques.tsx
+  checksum: 553720667140e5bbf7cef1969c02cbcd3c234defc30bb08208398c1900e29e3b
+- filename: server/src/http/sentry.ts
+  checksum: efa665e02ca4d3acbf48c5dc549dae4e915c02ae0626bedf71e3608f8d5e5ebd
 scopeconfig:
 - scope: node
 custom_patterns:

server/package.json

@@ -37,6 +37,7 @@
     "axios-cache-interceptor": "^1.3.2",
     "basic-ftp": "^5.0.3",
     "boom": "^7.3.0",
+    "bson": "^6.7.0",
     "bunyan": "^1.8.15",
     "bunyan-slack": "^0.0.10",
     "burner-email-providers": "^1.0.67",
@@ -71,8 +72,8 @@
     "migrate-mongo": "^11.0.0",
     "miniget": "^4.2.3",
     "mjml": "^4.14.1",
-    "mongodb": "^3.7.4",
-    "mongoose": "^5.13.20",
+    "mongodb": "^6.7.0",
+    "mongoose": "^7.4.0",
     "netmask": "^2.0.2",
     "nodemailer": "^6.9.5",
     "nodemailer-html-to-text": "^3.2.0",
@@ -89,7 +90,8 @@
     "type-fest": "^4.18.2",
     "xlsx": "^0.18.5",
     "xml2js": "^0.6.2",
-    "zod": "3.21.4"
+    "zod": "3.23.8",
+    "zod-mongodb-schema": "^1.0.2"
   },
   "devDependencies": {
     "@sentry/types": "^7.72.0",

server/src/commands.ts

@@ -7,6 +7,7 @@ import { closeMongoConnection } from "@/common/mongodb"
 import { closeMemoryCache } from "./common/apis/client"
 import { logger } from "./common/logger"
 import { sleep } from "./common/utils/asyncUtils"
+import { closeMongodbConnection } from "./common/utils/mongodbUtils"
 import { notifyToSlack } from "./common/utils/slackUtils"
 import config from "./config"
 import { closeSentry, initSentryProcessor } from "./http/sentry"
@@ -70,7 +71,7 @@ program
     logger.info(`Starting command ${command}`)
   })
   .hook("postAction", async () => {
-    await Promise.all([closeMongoConnection(), closeMemoryCache()])
+    await Promise.all([closeMongoConnection(), closeMongodbConnection(), closeMemoryCache()])
     await closeSentry()
 
     setTimeout(async () => {
@@ -164,6 +165,7 @@ function createJobAction(name) {
   }
 }
 
+program.command("recreate:indexes").description("Recreate MongoDB indexes").option("-q, --queued", "Run job asynchronously", false).action(createJobAction("recreate:indexes"))
 program.command("db:validate").description("Validate Documents").option("-q, --queued", "Run job asynchronously", false).action(createJobAction("db:validate"))
 
 program
@@ -574,12 +576,6 @@ program
   .requiredOption("--from-date <string>, [fromDate]", "format DD-MM-YYYY. Date depuis laquelle les prises de rendez-vous sont renvoyéees")
   .action(createJobAction("prdv:emails:resend"))
 
-program
-  .command("migrate-multi-compte")
-  .description("Migre les données vers les tables multi-compte")
-  .option("-q, --queued", "Run job asynchronously", false)
-  .action(createJobAction("migrate-multi-compte"))
-
 export async function startCLI() {
   await program.parseAsync(process.argv)
 }

server/src/common/model/schema/appointments/appointment.schema.ts

@@ -1,9 +1,37 @@
-import { IAppointment } from "shared"
+import { IAppointment, IMailing } from "shared"
 import { AppointmentUserType } from "shared/constants/appointment"
 
 import { model, Schema } from "../../../mongodb"
 import { mongoosePagination, Pagination } from "../_shared/mongoose-paginate"
 
+const mailSchema = new Schema<IMailing>({
+  campaign: {
+    type: String,
+    default: null,
+    description: "Identifiant de campagne",
+  },
+  message_id: {
+    type: String,
+    default: null,
+    description: "Identifiant Brevo",
+  },
+  status: {
+    type: String,
+    default: null,
+    description: "Code erreur Brevo",
+  },
+  webhook_status_at: {
+    type: Date,
+    default: null,
+    description: "Date fournie par les webhooks Brevo lors de la réception d'un event",
+  },
+  email_sent_at: {
+    type: Date,
+    default: null,
+    description: "Date de création de la collection",
+  },
+})
+
 export const appointmentSchema = new Schema<IAppointment>(
   {
     applicant_id: {
@@ -59,80 +87,8 @@ export const appointmentSchema = new Schema<IAppointment>(
       default: null,
       description: "Date à laquelle le CFA à consulté la page contenant les informations du rendez et du candidat",
     },
-    to_applicant_mails: {
-      type: "array",
-      description: "Liste des évènements MAIL récupéré par le serveur",
-      required: false,
-      default: [],
-      items: {
-        type: "object",
-        required: false,
-        properties: {
-          campaign: {
-            type: "string",
-            default: null,
-            description: "Identifiant de campagne",
-          },
-          message_id: {
-            type: "string",
-            default: null,
-            description: "Identifiant Brevo",
-          },
-          status: {
-            type: "string",
-            default: null,
-            description: "Code erreur Brevo",
-          },
-          webhook_status_at: {
-            type: Date,
-            default: null,
-            description: "Date fournie par les webhooks Brevo lors de la réception d'un event",
-          },
-          email_sent_at: {
-            type: Date,
-            default: null,
-            description: "Date de création de la collection",
-          },
-        },
-      },
-    },
-    to_cfa_mails: {
-      type: "array",
-      description: "Liste des évènements MAIL récupéré par le serveur",
-      required: false,
-      default: [],
-      items: {
-        type: "object",
-        required: false,
-        properties: {
-          campaign: {
-            type: "string",
-            default: null,
-            description: "Identifiant de campagne",
-          },
-          message_id: {
-            type: "string",
-            default: null,
-            description: "Identifiant Brevo",
-          },
-          status: {
-            type: "string",
-            default: null,
-            description: "Code erreur Brevo",
-          },
-          webhook_status_at: {
-            type: Date,
-            default: null,
-            description: "Date fournie par les webhooks Brevo lors de la réception d'un event",
-          },
-          email_sent_at: {
-            type: Date,
-            default: null,
-            description: "Date de création de la collection",
-          },
-        },
-      },
-    },
+    to_applicant_mails: [{ type: mailSchema, default: {} }],
+    to_cfa_mails: [{ type: mailSchema, default: {} }],
     cle_ministere_educatif: {
       type: String,
       default: null,

server/src/common/model/schema/formationCatalogue/formationCatalogue.schema.ts

@@ -497,5 +497,5 @@ const mnaFormationSchema = new Schema<IFormationCatalogue>(
     versionKey: false,
   }
 )
-
+// @ts-ignore
 export default model<IFormationCatalogue>("formationcatalogues", mnaFormationSchema)

server/src/common/model/schema/geopoint/geoPoint.schema.ts

@@ -3,12 +3,16 @@ import { Schema } from "../../../mongodb"
 export const geoPointSchema = new Schema<{
   type: string
   coordinates: number[]
-}>({
-  _id: false,
-  type: { type: String, default: "Point" },
-  coordinates: {
-    type: [Number],
-    default: [],
-    description: "Coordonnées [longitude,latitude] du point",
+}>(
+  {
+    type: { type: String, default: "Point" },
+    coordinates: [
+      {
+        type: Number,
+        default: [],
+        description: "Coordonnées [longitude,latitude] du point",
+      },
+    ],
   },
-})
+  { _id: false }
+)

server/src/common/model/schema/jobs/jobs.schema.ts

@@ -72,12 +72,14 @@ export const jobsSchema = new Schema<IJob>(
       type: String,
       description: "Raison de la suppression de l'offre",
     },
-    job_type: {
-      type: [String],
-      default: TRAINING_CONTRACT_TYPE.APPRENTISSAGE,
-      enum: Object.values(TRAINING_CONTRACT_TYPE),
-      description: "Type de contrat",
-    },
+    job_type: [
+      {
+        type: String,
+        default: TRAINING_CONTRACT_TYPE.APPRENTISSAGE,
+        enum: Object.values(TRAINING_CONTRACT_TYPE),
+        description: "Type de contrat",
+      },
+    ],
     is_multi_published: {
       type: Boolean,
       default: true,

server/src/common/model/schema/lbaCompanylegacy/lbaCompanyLegacy.schema.ts

@@ -1,9 +1,9 @@
-import { ILbaCompany } from "shared"
+import { ILbaLegacyCompany } from "shared"
 
 import { Schema, model } from "../../../mongodb"
 import { lbaCompanySchema } from "../lbaCompany/lbaCompany.schema"
 
-export const lbaCompanyLegacySchema = new Schema<Pick<ILbaCompany, "siret" | "email">>(
+export const lbaCompanyLegacySchema = new Schema<ILbaLegacyCompany>(
   {
     siret: {
       type: String,
@@ -21,4 +21,5 @@ export const lbaCompanyLegacySchema = new Schema<Pick<ILbaCompany, "siret" | "em
     versionKey: false,
   }
 )
-export default model<Pick<ILbaCompany, "siret" | "email">>("bonnesboiteslegacy", lbaCompanySchema)
+// @ts-ignore
+export default model<ILbaLegacyCompany>("bonnesboiteslegacy", lbaCompanySchema)

server/src/common/model/schema/multiCompte/buildMongooseModel.ts

@@ -5,6 +5,7 @@ import { mongoosePagination, Pagination } from "../_shared/mongoose-paginate"
 const { model } = mongoose
 
 export const buildMongooseModel = <T>(schema: Schema<T>, tableName: string) => {
+  // @ts-ignore
   schema.plugin(mongoosePagination)
 
   return model<T, Pagination<T>>(tableName, schema)

server/src/common/model/schema/siretDiffusibleStatusSchema/siretDiffusibleStatusSchema.schema.ts

@@ -1,3 +1,4 @@
+import { EDiffusibleStatus } from "shared/constants/diffusibleStatus"
 import { ISiretDiffusibleStatus } from "shared/models"
 
 import { model, Schema } from "../../../mongodb"
@@ -13,7 +14,8 @@ export const siretDiffusibleStatusSchema = new Schema<ISiretDiffusibleStatus>(
     },
     status_diffusion: {
       type: String,
-      default: "diffusible",
+      default: EDiffusibleStatus.DIFFUSIBLE,
+      enum: [Object.values(EDiffusibleStatus)[0], ...Object.values(EDiffusibleStatus).slice(1)],
       description: "Le statut de diffusion : diffusible | partiellement_diffusible | non_diffusible",
     },
     created_at: {

server/src/common/model/schema/unsubscribedLbaCompany/unsubscribedLbaCompany.schema.ts

@@ -1,23 +1,21 @@
 import { IUnsubscribedLbaCompany } from "shared"
 
 import { model, Schema } from "../../../mongodb"
-import { lbaCompanySchema } from "../lbaCompany/lbaCompany.schema"
 
-const { siret, raison_sociale, enseigne, naf_code, naf_label, rome_codes, insee_city_code, zip_code, city, company_size, created_at, last_update_at } = lbaCompanySchema.obj
 const unsubscribedLbaCompanySchema = new Schema<IUnsubscribedLbaCompany>(
   {
-    siret,
-    raison_sociale,
-    enseigne,
-    naf_code,
-    naf_label,
-    rome_codes,
-    insee_city_code,
-    zip_code,
-    city,
-    company_size,
-    created_at,
-    last_update_at,
+    siret: String,
+    raison_sociale: String,
+    enseigne: String,
+    naf_code: String,
+    naf_label: String,
+    rome_codes: [String],
+    insee_city_code: String,
+    zip_code: String,
+    city: String,
+    company_size: String,
+    created_at: Date,
+    last_update_at: Date,
     unsubscribe_date: {
       type: Date,
       default: Date.now,