incubateur-ademe
diff --git a/‎package.json‎
Lines changed: 18 additions & 18 deletions b/‎package.json‎
Lines changed: 18 additions & 18 deletions
diff --git a/‎scripts/NGC-1784-20250331.ts‎
Lines changed: 1 addition & 1 deletion b/‎scripts/NGC-1784-20250331.ts‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎scripts/NGC-1961-20250602.ts‎
Lines changed: 1 addition & 1 deletion b/‎scripts/NGC-1961-20250602.ts‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/adapters/brevo/constant.ts‎
Lines changed: 6 additions & 0 deletions b/‎src/adapters/brevo/constant.ts‎
Lines changed: 6 additions & 0 deletions
diff --git a/‎src/app.ts‎
Lines changed: 4 additions & 12 deletions b/‎src/app.ts‎
Lines changed: 4 additions & 12 deletions
diff --git a/‎src/constants/axios.ts‎
Lines changed: 0 additions & 9 deletions b/‎src/constants/axios.ts‎
Lines changed: 0 additions & 9 deletions
diff --git a/‎src/core/batchFindMany.ts‎ renamed to ‎src/core/batch-find-many.ts‎ b/‎src/core/batchFindMany.ts‎ renamed to ‎src/core/batch-find-many.ts‎
diff --git a/‎src/core/publishApiEvent.ts‎ renamed to ‎src/core/publish-api-event.ts‎ b/‎src/core/publishApiEvent.ts‎ renamed to ‎src/core/publish-api-event.ts‎
diff --git a/‎src/features/integrations/api/mapping-situation/__tests__/map-situation.spec.ts‎
Lines changed: 4 additions & 4 deletions b/‎src/features/integrations/api/mapping-situation/__tests__/map-situation.spec.ts‎
Lines changed: 4 additions & 4 deletions
diff --git a/‎src/constants/change-case.ts‎ renamed to ‎src/features/integrations/api/mapping-situation/mapping-situation.constant.ts‎ b/‎src/constants/change-case.ts‎ renamed to ‎src/features/integrations/api/mapping-situation/mapping-situation.constant.ts‎
@@ -1,6 +1,6 @@
 {
   "name": "nosgestesclimat-server",
-  "version": "1.24.2",
+  "version": "2.0.0",
   "description": "The server part of the website nosgestesclimat.fr",
   "main": "./dist/index.js",
   "type": "module",
@@ -31,24 +31,24 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "@aws-sdk/client-s3": "^3.848.0",
-    "@aws-sdk/s3-request-presigner": "^3.848.0",
+    "@aws-sdk/client-s3": "^3.864.0",
+    "@aws-sdk/s3-request-presigner": "^3.864.0",
     "@incubateur-ademe/nosgestesclimat": "3.9.0",
     "@prisma/client": "^6.0.0",
     "@publicodes/tools": "^1.7.2",
-    "@sentry/node": "^9.40.0",
+    "@sentry/node": "^10.5.0",
     "@ts-rest/core": "^3.52.1",
     "@ts-rest/express": "^3.52.1",
     "@ts-rest/open-api": "^3.52.1",
-    "axios": "^1.10.0",
+    "axios": "^1.11.0",
     "axios-retry": "^4.5.0",
     "change-case": "^5.4.4",
     "cors": "^2.8.5",
     "dayjs": "^1.11.13",
-    "dotenv": "^17.2.0",
+    "dotenv": "^17.2.1",
     "express": "^4.17.2",
     "http-status-codes": "^2.3.0",
-    "ioredis": "^5.6.1",
+    "ioredis": "^5.7.0",
     "jsonwebtoken": "^9.0.2",
     "morgan": "^1.10.1",
     "multer": "^2.0.2",
@@ -57,49 +57,49 @@
     "publicodes": "^1.9.0",
     "request-ip": "^3.3.0",
     "slugify": "^1.6.6",
-    "supertest": "^7.1.3",
     "swagger-ui-express": "^5.0.1",
     "winston": "^3.17.0",
     "winston-transport-sentry-node": "^3.0.0",
     "xlsx": "^0.18.5",
-    "yaml": "^2.8.0",
+    "yaml": "^2.8.1",
     "yargs": "^18.0.0",
     "zod": "^3.23.8",
     "zod-express-middleware": "^1.4.0"
   },
   "devDependencies": {
-    "@electric-sql/pglite": "^0.3.5",
+    "@electric-sql/pglite": "^0.3.7",
     "@faker-js/faker": "^9.9.0",
     "@tsconfig/node22": "^22.0.2",
     "@types/cors": "^2.8.19",
     "@types/express": "^4.17.23",
     "@types/jsonwebtoken": "^9.0.10",
     "@types/morgan": "^1.9.10",
     "@types/multer": "^2.0.0",
-    "@types/node": "^24.0.15",
+    "@types/node": "^24.3.0",
     "@types/papaparse": "^5.3.16",
     "@types/redis-mock": "^0.17.3",
     "@types/request-ip": "^0.0.41",
     "@types/supertest": "^6.0.3",
     "@types/swagger-ui-express": "^4.1.8",
     "@types/yargs": "^17.0.33",
     "@vitest/coverage-v8": "^3.2.4",
-    "eslint": "^9.31.0",
+    "eslint": "^9.33.0",
     "eslint-config-prettier": "^10.1.8",
     "eslint-import-resolver-typescript": "^4.4.4",
     "eslint-plugin-import": "^2.32.0",
-    "eslint-plugin-prettier": "^5.5.3",
+    "eslint-plugin-prettier": "^5.5.4",
     "husky": "^9.1.7",
-    "lint-staged": "^16.1.2",
-    "msw": "^2.10.4",
+    "lint-staged": "^16.1.5",
+    "msw": "^2.10.5",
     "nodemon": "^3.1.10",
     "pglite-prisma-adapter": "^0.3.0",
     "prettier": "^3.6.2",
     "redis-mock": "^0.56.3",
     "rimraf": "^6.0.1",
-    "tsx": "^4.20.3",
-    "typescript": "^5.8.3",
-    "typescript-eslint": "^8.38.0",
+    "supertest": "^7.1.4",
+    "tsx": "^4.20.4",
+    "typescript": "^5.9.2",
+    "typescript-eslint": "^8.39.1",
     "vitest": "^3.2.4"
   },
   "lint-staged": {
 
@@ -1,5 +1,5 @@
 import { prisma } from '../src/adapters/prisma/client'
-import { batchFindMany } from '../src/core/batchFindMany'
+import { batchFindMany } from '../src/core/batch-find-many'
 import { updatePollFunFacts } from '../src/features/organisations/organisations.service'
 import logger from '../src/logger'
 
 
@@ -1,6 +1,6 @@
 import type { JsonObject, JsonValue } from '@prisma/client/runtime/library'
 import { prisma } from '../src/adapters/prisma/client'
-import { batchFindMany } from '../src/core/batchFindMany'
+import { batchFindMany } from '../src/core/batch-find-many'
 import logger from '../src/logger'
 
 const hasPreciseChoice = (situation: JsonValue): situation is JsonObject =>
 
@@ -42,6 +42,9 @@ export const ListIds = {
   GROUP_JOINED: 30,
   TRANSPORT_NEWSLETTER: 32,
   LOGEMENT_NEWSLETTER: 36,
+  CONSO_NEWSLETTER: 40,
+  ALIMENTATION_NEWSLETTER: 41,
+  CITOYENS_NEWSLETTER: 42,
 } as const
 
 export type ListIds = ValueOf<typeof ListIds>
@@ -50,6 +53,9 @@ export const AllNewsletters = [
   ListIds.MAIN_NEWSLETTER,
   ListIds.LOGEMENT_NEWSLETTER,
   ListIds.TRANSPORT_NEWSLETTER,
+  ListIds.CONSO_NEWSLETTER,
+  ListIds.ALIMENTATION_NEWSLETTER,
+  ListIds.CITOYENS_NEWSLETTER,
 ] as const
 
 // Matomo campaigns & keywords
 
@@ -1,13 +1,12 @@
-import type { Request } from 'express'
-import express from 'express'
-import morgan from 'morgan'
-import requestIp from 'request-ip'
-
 import { createExpressEndpoints } from '@ts-rest/express'
 import { generateOpenApi } from '@ts-rest/open-api'
 import cors from 'cors'
+import type { Request } from 'express'
+import express from 'express'
 import { StatusCodes } from 'http-status-codes'
+import morgan from 'morgan'
 import path from 'path'
+import requestIp from 'request-ip'
 import swaggerUi from 'swagger-ui-express'
 import { origin } from './config.js'
 import authenticationController from './features/authentication/authentication.controller.js'
@@ -23,8 +22,6 @@ import simulationController from './features/simulations/simulations.controller.
 import statsController from './features/stats/stats.controller.js'
 import usersController from './features/users/users.controller.js'
 import logger from './logger.js'
-import getNewsletterSubscriptions from './routes/settings/getNewsletterSubscriptions.js'
-import updateSettingsRoute from './routes/settings/updateSettings.js'
 
 const app = express()
 
@@ -65,11 +62,6 @@ app.use(
   )
 )
 
-// Deprecated routes
-app.use('/update-settings', updateSettingsRoute)
-app.use('/get-newsletter-subscriptions', getNewsletterSubscriptions)
-
-// new API routes
 app.use('/authentication', authenticationController)
 app.use('/modele', modeleController)
 app.use('/groups', groupsController)
 
@@ -7,16 +7,16 @@ import supertest from 'supertest'
 import { afterEach, beforeEach, describe, expect, test, vi } from 'vitest'
 import { client } from '../../../../../adapters/scaleway/client.js'
 import app from '../../../../../app.js'
-import {
-  MAPPING_CASES,
-  MAPPING_CASES_FUNC,
-} from '../../../../../constants/change-case.js'
 import logger from '../../../../../logger.js'
 import { getRandomPersonaSituation } from '../../../../simulations/__tests__/fixtures/simulations.fixtures.js'
 import type { SituationSchema } from '../../../../simulations/simulations.validator.js'
 import { ExternalServiceTypeEnum } from '../../../integrations.validator.js'
 import { randomPartner } from '../../mapping-file/__tests__/fixtures/index.js'
 import type { MappingFileKind } from '../../mapping-file/mapping-file.contract.js'
+import {
+  MAPPING_CASES,
+  MAPPING_CASES_FUNC,
+} from '../mapping-situation.constant.js'
 
 const mockS3Files = (
   filesContent: Partial<