Feat/budget

.circleci/config.yml

@@ -6,43 +6,43 @@ orbs:
 executors:
   node:
     docker:
-      - image: cimg/node:22.9.0
+      - image: cimg/node:22.10.0
         environment:
           TZ: 'UTC'
 
   node-postgres:
     docker:
-      - image: cimg/node:22.9.0
+      - image: cimg/node:22.10.0
         environment:
           TZ: 'UTC'
           CI_PG_ADMIN_URL: postgresql://postgres@localhost
           CI_DATABASE_URL: postgresql://postgres@localhost/test
-      - image: cimg/postgres:14.0
+      - image: huguesm/circleci-postgres:14.13-vector
         environment:
           POSTGRES_USER: postgres
   node-browsers:
     docker:
-      - image: cimg/node:22.9.0-browsers
+      - image: cimg/node:22.10.0-browsers
         environment:
           TZ: 'UTC'
   node-e2e:
     docker:
-      - image: cimg/node:22.9.0-browsers
+      - image: cimg/node:22.10.0-browsers
         environment:
           TZ: 'UTC'
           CI_DATABASE_URL: postgresql://postgres@localhost/test
       - image: maildev/maildev:latest
         environment:
           MAILDEV_INCOMING_USER: mailuser
           MAILDEV_INCOMING_PASS: mailpassword
-      - image: cimg/postgres:14.0
+      - image: huguesm/circleci-postgres:14.13-vector
         environment:
           POSTGRES_USER: postgres
 
 parameters:
   cache_version:
     type: string
-    default: '2024-10-03-01'
+    default: '2025-02-24-01'
   virtual_store_dir:
     type: string
     default: './.pnpm'
@@ -51,7 +51,7 @@ parameters:
     default: './pnpm-lock.yaml'
   image:
     type: string
-    default: stack-web-<< pipeline.git.branch >> | sed -e 's/\//-/g'
+    default: coop-mediation-numerique-web-<< pipeline.git.branch >> | sed -e 's/\//-/g'
   deploy_version:
     type: string
     default: latest
@@ -69,7 +69,7 @@ parameters:
   web_app_docker_registry:
     # This is redundant with .env.dist but needed as jobs are way simpler to configure with this parameter
     type: string
-    default: 'rg.fr-par.scw.cloud/stack-web-app'
+    default: 'rg.fr-par.scw.cloud/coop-mediation-numerique-web-app'
   preview_deletion_branch:
     type: string
     default: ""
@@ -81,10 +81,7 @@ workflows:
       equal: [ web_app_deployment, << pipeline.parameters.trigger_workflow >> ]
     jobs:
       - prepare_workspace_dependencies
-      - lint_web:
-          requires:
-            - prepare_workspace_dependencies
-      - lint_packages:
+      - lint:
           requires:
             - prepare_workspace_dependencies
       - test_packages:
@@ -110,8 +107,7 @@ workflows:
 
       - deploy_web:
           requires:
-            - lint_web
-            - lint_packages
+            - lint
             - build_web
             - test_packages
             - test_web
@@ -124,17 +120,13 @@ workflows:
       equal: [ chromatic_deployment, << pipeline.parameters.trigger_workflow >> ]
     jobs:
       - prepare_workspace_dependencies
-      - lint_web:
-          requires:
-            - prepare_workspace_dependencies
-      - lint_packages:
+      - lint:
           requires:
             - prepare_workspace_dependencies
       - chromatic:
           requires:
             - prepare_workspace_dependencies
-            - lint_web
-            - lint_packages
+            - lint
 
   project_infrastructure_deployment:
     when:
@@ -180,7 +172,7 @@ jobs:
     steps:
       - checkout
       - skip/skip_unchanged:
-          paths: pnpm-lock.yaml
+          paths: pnpm-lock.yaml .circleci/config.yml
       - install_dependencies
       - run:
           name: 'Fetch dependencies'
@@ -200,7 +192,6 @@ jobs:
             - ./packages/config/node_modules
             - ./packages/e2e/node_modules
             - ./packages/emails/node_modules
-            - ./packages/lint/node_modules
             - ./packages/storybook/node_modules
             - ./packages/test/node_modules
             - ./packages/ui/node_modules
@@ -211,7 +202,7 @@ jobs:
           paths:
             - /home/circleci/.cache/Cypress
 
-  lint_web:
+  lint:
     executor: node
     resource_class: large
     steps:
@@ -224,26 +215,33 @@ jobs:
           name: 'Tsc'
           command: pnpm tsc
       - run:
-          name: 'Lint @app/web'
-          command: pnpm -F '@app/web' lint
-          no_output_timeout: 30m
-
-  lint_packages:
-    executor: node
-    resource_class: large
-    steps:
-      - checkout
-      - install_dependencies
+          name: 'Lint all packages except @app/web'
+          command: pnpm -F '!@app/web' lint
       - run:
-          name: 'Prisma generate'
-          command: pnpm --silent -F @app/web prisma generate
+          name: 'Lint @app/web - biome'
+          command: pnpm -F '@app/web' lint:biome
+      # check that the openapi file is the same before and after generating (developers should have generated it)
       - run:
-          name: 'Tsc'
-          command: pnpm tsc
+          name: 'Get openapi spec file hash before generating'
+          command: |
+            echo "OPENAPI_SPEC_FILE_HASH_BEFORE_GENERATING=$(cat apps/web/src/app/api/v1/documentation/v1.openapi.json | shasum -a 256)" >> $BASH_ENV
       - run:
-          name: 'Lint all packages except @app/web'
-          command: pnpm -F '!@app/web' lint
-          no_output_timeout: 30m
+          name: 'Generate openapi docs for api v1'
+          command: pnpm --silent -F @app/web api-v1-doc:generate
+      - run:
+          name: 'Get openapi spec file hash after generating'
+          command: |
+            echo "OPENAPI_SPEC_FILE_HASH_AFTER_GENERATING=$(cat apps/web/src/app/api/v1/documentation/v1.openapi.json | shasum -a 256)" >> $BASH_ENV
+      - run:
+          name: 'Check that versioning of openapi spec file has not changed'
+          command: |
+            if [[ "$OPENAPI_SPEC_FILE_HASH_BEFORE_GENERATING" != "$OPENAPI_SPEC_FILE_HASH_AFTER_GENERATING" ]]; then
+              echo "Openapi spec file has changed, please run 'pnpm --silent -F @app/web api-v1-doc:generate' to update the openapi spec file and commit the changes"
+              exit 1
+            fi
+      - run:
+          name: 'Lint @app/web - api'
+          command: pnpm -F '@app/web' lint:api
 
   lint_and_test_cdk_package:
     executor: node
@@ -312,7 +310,7 @@ jobs:
             - << pipeline.parameters.cache_version >>-next-prod-{{ checksum "<< pipeline.parameters.lockfile >>" }}-{{ checksum "./.env" }}
       - run:
           name: 'Build next app'
-          command: pnpm --silent -F @app/web build
+          command: SENTRY_RELEASE=true pnpm --silent -F @app/web build
       - save_cache:
           key: << pipeline.parameters.cache_version >>-next-prod-{{ checksum "<< pipeline.parameters.lockfile >>" }}-{{ checksum "./.env" }}
           paths:
@@ -331,6 +329,7 @@ jobs:
             - ./apps/web/.next/standalone
             - ./apps/web/.next/static
             - ./apps/web/public
+            - ./apps/web/private-static
 
   chromatic:
     executor: node
@@ -396,6 +395,10 @@ jobs:
             echo "SMTP_PASSWORD=mailpassword" >> .env
             echo "IS_E2E=true" >> .env
             echo 'PROCONNECT_CLIENT_SECRET=$PROCONNECT_LOCAL_CLIENT_SECRET' >> .env
+            echo 'NEXT_PUBLIC_RDV_SERVICE_PUBLIC_OAUTH_HOSTNAME="$RDV_SERVICE_PUBLIC_LOCAL_OAUTH_HOSTNAME"' >> .env
+            echo 'NEXT_PUBLIC_RDV_SERVICE_PUBLIC_OAUTH_CLIENT_ID="$RDV_SERVICE_PUBLIC_LOCAL_OAUTH_CLIENT_ID"' >> .env
+            echo 'RDV_SERVICE_PUBLIC_OAUTH_CLIENT_SECRET="$RDV_SERVICE_PUBLIC_LOCAL_OAUTH_CLIENT_SECRET"' >> .env
+            echo 'RDV_SERVICE_PUBLIC_API_KEY="$RDV_SERVICE_PUBLIC_LOCAL_API_KEY"' >> .env
             echo 'CYPRESS_PROCONNECT_TEST_USER_EMAIL=$PROCONNECT_TEST_USER_EMAIL' >> .env
             echo 'CYPRESS_PROCONNECT_TEST_USER_PASSWORD=$PROCONNECT_TEST_USER_PASSWORD' >> .env
       - add_dotenv_vars_to_bash_env
@@ -421,6 +424,7 @@ jobs:
           command: |
             mv apps/web/.next/standalone ~/dist
             mv apps/web/public ~/dist/apps/web/public
+            mv apps/web/private-static ~/dist/apps/web/private-static
             mv apps/web/.next/static ~/dist/apps/web/.next/static
             cd ~/dist
             NODE_TLS_REJECT_UNAUTHORIZED="0" HOSTNAME=localhost node apps/web/server.js
@@ -449,6 +453,10 @@ jobs:
             echo "SMTP_PORT=1025" >> .env
             echo "SMTP_USERNAME=mailuser" >> .env
             echo "SMTP_PASSWORD=mailpassword" >> .env
+            echo 'NEXT_PUBLIC_RDV_SERVICE_PUBLIC_OAUTH_HOSTNAME="$RDV_SERVICE_PUBLIC_LOCAL_OAUTH_HOSTNAME"' >> .env
+            echo 'NEXT_PUBLIC_RDV_SERVICE_PUBLIC_OAUTH_CLIENT_ID="$RDV_SERVICE_PUBLIC_LOCAL_OAUTH_CLIENT_ID"' >> .env
+            echo 'RDV_SERVICE_PUBLIC_OAUTH_CLIENT_SECRET="$RDV_SERVICE_PUBLIC_LOCAL_OAUTH_CLIENT_SECRET"' >> .env
+            echo 'RDV_SERVICE_PUBLIC_API_KEY="$RDV_SERVICE_PUBLIC_LOCAL_API_KEY"' >> .env
       - run:
           name: 'Prisma generate'
           command: pnpm --silent -F @app/web prisma generate
@@ -676,7 +684,7 @@ commands:
             echo "export WEB_APP_DOCKER_REGISTRY='<< pipeline.parameters.web_app_docker_registry >>'" >> ${BASH_ENV}
             echo "export BRANCH='<< pipeline.git.branch >>'" >> ${BASH_ENV}
             echo "export NAMESPACE=$(echo '<< pipeline.git.branch >>' | sed -e 's/\//-/g')" >> ${BASH_ENV}
-            echo "export IMAGE_NAME=$(echo 'stack-web-<< pipeline.git.branch >>' | sed -e 's/\//-/g')" >> ${BASH_ENV}
+            echo "export IMAGE_NAME=$(echo 'coop-mediation-numerique-web-<< pipeline.git.branch >>' | sed -e 's/\//-/g')" >> ${BASH_ENV}
             echo "export IMAGE_BUILD_TAG=$(echo '$WEB_APP_DOCKER_REGISTRY/$IMAGE_NAME:<< pipeline.number >>')" >> ${BASH_ENV}
             echo "export IMAGE_DEPLOY_TAG=$(echo '$WEB_APP_DOCKER_REGISTRY/$IMAGE_NAME:<< pipeline.parameters.deploy_version >>')" >> ${BASH_ENV}
             echo "export IMAGE_E2E_TAG=$(echo '$WEB_APP_DOCKER_REGISTRY/$IMAGE_NAME:<< pipeline.parameters.e2e_version >>')" >> ${BASH_ENV}

.env.dist

@@ -19,12 +19,12 @@
 TZ=UTC
 SCW_DEFAULT_REGION=fr-par
 SCW_DEFAULT_ORGANIZATION_ID=0e5249bc-c22c-42a9-b30d-6105fc814d75
-SCW_PROJECT_ID=6f7de13a-078a-4cc1-bcd1-813e80f40292
+SCW_PROJECT_ID=61bfe597-bcc4-4f8b-8e2b-ff93ba2a2439
 DO_NOT_TRACK=1
 TURBO_TELEMETRY_DISABLED=1
-
 # Activate node packages debug
 #DEBUG="prisma:client"
+PRISMA_ENABLE_LOGGING=0
 
 # Scaleway authentication
 # This is your personal credential, ask a team member for how to generate it
@@ -38,13 +38,16 @@ SCW_SECRET_KEY="<secret>"
 # Web app variables (apps/web)
 ##############################
 
-NEXT_PUBLIC_APP_NAME="Stack"
-NEXT_PUBLIC_APP_SLUG="stack"
+NEXT_PUBLIC_APP_NAME="La coop de la médiation numérique"
+NEXT_PUBLIC_APP_SLUG="coop-mediation-numerique"
 
 # Database connection string
 DATABASE_URL="postgresql://${NEXT_PUBLIC_APP_SLUG}:password@localhost:5433/${NEXT_PUBLIC_APP_SLUG}?schema=public"
 
-NEXT_PUBLIC_CONTACT_EMAIL=hugues.maignol@beta.gouv.fr
+# Accès à la base de données MongoDB de conseiller-numerique.beta.gouv.fr
+CONSEILLER_NUMERIQUE_MONGODB_URL="<secret>"
+
+NEXT_PUBLIC_CONTACT_EMAIL=coop-numerique@anct.gouv.fr
 
 # Next auth secret must be unique to your environment
 NEXTAUTH_SECRET="<change-me>"
@@ -53,7 +56,7 @@ NEXTAUTH_SECRET="<change-me>"
 NEXT_TELEMETRY_DISABLED=1
 
 # Mail sending
-EMAIL_FROM_DOMAIN=$NEXT_PUBLIC_APP_SLUG.incubateur.anct.gouv.fr
+EMAIL_FROM_DOMAIN=coop-numerique.anct.gouv.fr
 EMAIL_FROM_ADDRESS=contact@$EMAIL_FROM_DOMAIN
 EMAIL_FROM_NAME="[Dev] $NEXT_PUBLIC_APP_NAME"
 # Change the SMTP server to a mailcatcher if you want
@@ -65,14 +68,16 @@ SMTP_PASSWORD="<change-me>"
 
 # Sentry auth token only needed to interact with Sentry API (e.g. publishing releases,...)
 SENTRY_AUTH_TOKEN="<secret>"
-NEXT_PUBLIC_SENTRY_DSN=https://22968dca8fe84972bf74932d68dae55e@sentry.incubateur.net/92
+NEXT_PUBLIC_SENTRY_DSN=https://5a7a0ba0a9784132b31fe226c1344655@sentry.incubateur.net/150
 SENTRY_URL=https://sentry.incubateur.net
 SENTRY_ORG=betagouv
 SENTRY_PROJECT=$NEXT_PUBLIC_APP_SLUG
+## Create sourcemaps and release on sentry
+SENTRY_ENABLE_RELEASE=false
 
 # Matomo
 NEXT_PUBLIC_MATOMO_HOST=matomo.incubateur.anct.gouv.fr
-NEXT_PUBLIC_MATOMO_SITE_ID='8'
+NEXT_PUBLIC_MATOMO_SITE_ID='21'
 
 # Object storage credentials
 S3_HOST=s3.fr-par.scw.cloud
@@ -85,11 +90,11 @@ AWS_ENDPOINT_URL_S3=https://$S3_HOST
 
 # ProConnect authentication variables
 PROCONNECT_LOCAL_HOSTNAME="fca.integ01.dev-agentconnect.fr"
-PROCONNECT_LOCAL_CLIENT_ID="<to-be-defined>"
+PROCONNECT_LOCAL_CLIENT_ID="623c51c1-fb06-427d-917a-7408f5e50ca7"
 PROCONNECT_LOCAL_CLIENT_SECRET="<secret>"
 
 PROCONNECT_PREVIEW_HOSTNAME="fca.integ01.dev-agentconnect.fr"
-PROCONNECT_PREVIEW_CLIENT_ID="<to-be-defined>"
+PROCONNECT_PREVIEW_CLIENT_ID="623c51c1-fb06-427d-917a-7408f5e50ca7"
 PROCONNECT_PREVIEW_CLIENT_SECRET="<secret>"
 
 PROCONNECT_MAIN_HOSTNAME="auth.agentconnect.gouv.fr"
@@ -110,12 +115,50 @@ CYPRESS_PROCONNECT_TEST_USER_PASSWORD=$PROCONNECT_TEST_USER_PASSWORD
 # Internal private key for private API calls
 INTERNAL_API_PRIVATE_KEY="<secret>"
 
+# Api entreprise
+API_ENTREPRISE_TOKEN="<secret>"
+
+# Security
+HMAC_SECRET_KEY="<change-for-a-secure-and-random-key>"
+
+# Assistant credentials
+MISTRAL_API_KEY="<secret>"
+SCALEWAY_GENERATIVE_API_SERVICE_URL="<secret>"
+ALBERT_SERVICE_URL="https://albert.api.etalab.gouv.fr/v1/"
+ALBERT_API_KEY="<secret>"
+BRAVE_API_KEY="<secret>"
+
+# RDV Service public api and OAuth credentials
+RDV_SERVICE_PUBLIC_LOCAL_API_KEY="<secret>"
+RDV_SERVICE_PUBLIC_LOCAL_OAUTH_HOSTNAME="demo.rdv-aide-numerique.fr"
+RDV_SERVICE_PUBLIC_LOCAL_OAUTH_CLIENT_ID="<secret>"
+RDV_SERVICE_PUBLIC_LOCAL_OAUTH_CLIENT_SECRET="<secret>"
+
+RDV_SERVICE_PUBLIC_PREVIEW_API_KEY="<secret>"
+RDV_SERVICE_PUBLIC_PREVIEW_OAUTH_HOSTNAME="demo.rdv-aide-numerique.fr"
+RDV_SERVICE_PUBLIC_PREVIEW_OAUTH_CLIENT_ID="<secret>"
+RDV_SERVICE_PUBLIC_PREVIEW_OAUTH_CLIENT_SECRET="<secret>"
+
+RDV_SERVICE_PUBLIC_MAIN_API_KEY="<secret>"
+RDV_SERVICE_PUBLIC_MAIN_OAUTH_HOSTNAME="www.rdv-aide-numerique.fr"
+RDV_SERVICE_PUBLIC_MAIN_OAUTH_CLIENT_ID="<secret>"
+RDV_SERVICE_PUBLIC_MAIN_OAUTH_CLIENT_SECRET="<secret>"
+
+NEXT_PUBLIC_RDV_SERVICE_PUBLIC_OAUTH_HOSTNAME="$RDV_SERVICE_PUBLIC_LOCAL_OAUTH_HOSTNAME"
+NEXT_PUBLIC_RDV_SERVICE_PUBLIC_OAUTH_CLIENT_ID="$RDV_SERVICE_PUBLIC_LOCAL_OAUTH_CLIENT_ID"
+RDV_SERVICE_PUBLIC_OAUTH_CLIENT_SECRET="$RDV_SERVICE_PUBLIC_LOCAL_OAUTH_CLIENT_SECRET"
+RDV_SERVICE_PUBLIC_API_KEY="$RDV_SERVICE_PUBLIC_LOCAL_API_KEY"
+
+# Brevo
+BREVO_API_KEY="<secret>"
+BREVO_USERS_LIST_ID="34"
+
 ##############################
 # Storybook Variables (packages/storybook)
 ##############################
 
 CHROMATIC_PROJECT_TOKEN="<secret>"
-CHROMATIC_APP_ID=6437b8e47c46a95e460061e0
+CHROMATIC_APP_ID=661549fb7cb5474a3bf7d8d7
 
 ##############################
 # CLI Variables
@@ -145,10 +188,10 @@ CIRCLE_CI_TOKEN="<secret>"
 # Used for cdk development tests only
 #CDK_FORCE_BRANCH="ops/new-domain"
 
-MAIN_ROOT_DOMAIN=incubateur.anct.gouv.fr
+MAIN_ROOT_DOMAIN=anct.gouv.fr
 PREVIEW_ROOT_DOMAIN=incubateur.anct.gouv.fr
-MAIN_SUBDOMAIN=$NEXT_PUBLIC_APP_SLUG
-PREVIEW_SUBDOMAIN=$NEXT_PUBLIC_APP_SLUG
+MAIN_SUBDOMAIN="coop-numerique"
+PREVIEW_SUBDOMAIN="coop-mediation-numerique"
 DATABASE_INSTANCE_NAME=$NEXT_PUBLIC_APP_SLUG-production
 CONTAINER_NAMESPACE_NAME=$NEXT_PUBLIC_APP_SLUG-web
 WEB_APP_DOCKER_REGISTRY_NAME=$NEXT_PUBLIC_APP_SLUG-web-app
@@ -158,3 +201,4 @@ COCKPIT_GRAPHANA_EDITORS=hugues,thibault,marc
 COCKPIT_GRAPHANA_VIEWERS=""
 
 CYPRESS_RECORD_KEY="<secret>"
+