Personnalisation 1.1.2.1, plus de 20000 habitants

.github/workflows/deploy-storybook.yml

@@ -0,0 +1,42 @@
+name: Publie le storybook sur chromatic
+
+# On ne lance le workflow que si un storyshot ou une story est modifié.
+on:
+  push:
+    paths:
+      - '**.storyshot'
+      - '**.stories.tsx'
+
+
+jobs:
+  chromatic-deployment:
+    runs-on: ubuntu-latest
+
+    env:
+      client-directory: ./app.territoiresentransitions.react
+      LANG: 'fr_FR.UTF-8'
+      SUPABASE_SERVICE_ROLE_KEY: ${{secrets.TEST_SERVICE_SUPABASE_KEY}}
+      SUPABASE_ANON_KEY: ${{secrets.TEST_ANON_SUPABASE_KEY}}
+
+    steps:
+      - uses: actions/checkout@v1
+
+      - name: Fixe la langue de l'environnement
+        run: |
+          sudo locale-gen ${{env.LANG}}
+          sudo update-locale LANG=${{env.LANG}}
+
+      - name: Copie les variables d'environnement
+        run: sh make_dot_env.sh
+
+      # On n'utilise pas Docker, car l'action Chromatic nécessite Git.
+      - name: Installe les dépendances.
+        run: npm install
+        working-directory: ${{env.client-directory}}
+
+      - name: Publication du storybook sur Chromatic
+        uses: chromaui/action@v1
+
+        with:
+          projectToken: ${{ secrets.CHROMATIC_PROJECT_TOKEN }}
+          workingDir: ${{env.client-directory}}

.github/workflows/update-preuves.yml

@@ -16,18 +16,18 @@ jobs:
 
       # Execute CLI on local datalayer if branch not in [upcoming-sandbox, upcoming-production]
       - name: Execute parsing scripts to generate JSON files in data_layer/content
-        run: docker compose run --no-deps business-parse-preuves
+        run: docker compose run --no-deps business-parse-content
 
-      # Check that datalayer loader runs  
-      - name: Run datalayer loader 
+      # Check that datalayer loader runs
+      - name: Run datalayer loader
         run: sh make_dot_env.sh && docker-compose run loader
         env:
           SUPABASE_SERVICE_ROLE_KEY: ${{secrets.TEST_SERVICE_SUPABASE_KEY}}
           SUPABASE_ANON_KEY: ${{secrets.TEST_ANON_SUPABASE_KEY}}
-          
+
       # Commit changes
       - name: Commit generated JSON files
         uses: EndBug/add-and-commit@v7
         with:
           default_author: github_actions
-          message: Generated preuves from updated markdowns.
+          message: Generated preuves from updated markdowns.

LICENSE

@@ -0,0 +1,205 @@
+   A l'exception des contenus dans le dossier `markdown` qui sont la
+   propriété intellectuelle de l'ADEME, le code est sous license
+   Apache, version 2.0
+
+
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright 2022 ADEME
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

README.md

@@ -1,9 +1,6 @@
 # Territoires en Transition
 
-Dans le cadre des programmes d'accompagnement des collectivités dans leurs démarches de transition écologique,
-l'[ADEME (l'Agence de la transition écologique)](https://www.ademe.fr/) s'est associée à
-[beta.gouv.fr](https://beta.gouv.fr/) pour lancer une plateforme numérique pour faciliter et accélérer la mise en oeuvre
-des actions de transition écologique dans les collectivités territoriales.
+Dans le cadre des programmes d'accompagnement des collectivités dans leurs démarches de transition écologique, l'[ADEME (l'Agence de la transition écologique)](https://www.ademe.fr/) s'est associée à [beta.gouv.fr](https://beta.gouv.fr/) pour lancer une plateforme numérique pour faciliter et accélérer la mise en œuvre des actions de transition écologique dans les collectivités territoriales.
 
 L'interface a pour objectifs de permettre aux utilisateurs :
 
@@ -43,18 +40,16 @@ Ces fichiers markdowns représentent des définitions auxquelles sont rattachée
 exemple un indicateur tel que [Emissions de GES](markdown/indicateurs/crte/crte_001.md)
 est destiné à permettre aux utilisateurs à saisir leurs données annuelles dans notre application.
 
-Ces définitions sont lues par la partie [referentiel](business/business/referentiel) du `business` et sauvegardée en
+Ces définitions sont lues par la partie [referentiel](business/business/referentiel/README.md) du `business` et sauvegardée en
 base afin d'être
 
-- utilisées pour le processus d'[évaluation](business/business/evaluation)
+- utilisées pour le processus d'[évaluation](./business/business/evaluation/README.md)
 - affichées dans le `client`
-- garantir la cohérence des données utilisateur stockées dans le `data layer` grace
-  au [schema](data_layer/postgres/definitions)
+- utilisées comme garantie de la cohérence des données utilisateur stockées dans le `data layer`
 
 ### Les données utilisateurs
 
-Les utilisateurs saisissent pour le compte de leur collectivité des données qui sont stockées dans le `data layer`
-qui vérifie leurs droits en écriture grace aux
+Les utilisateurs saisissent pour le compte de leur collectivité des données qui sont stockées dans le `data layer` qui vérifie leurs droits en écriture grace aux
 [row security policies](https://www.postgresql.˚org/docs/current/ddl-rowsecurity.html)
 
 ### Les données d'évaluation
@@ -82,10 +77,6 @@ Chacun de ses éléments a un périmètre définit :
     - il lit les contenus markdown et les enregistre dans le `data layer`
     - il évalue les données utilisateur et les enregistre dans le `data layer`
 
-<div align="center">
-<img src="design.png" alt="architecture design" >
-</div>
-
 ## Stack
 
 - Le `client` utilise React ce qui nous permet de bénéficier d'un écosystème riche. Il est développé en TypeScript.
@@ -145,4 +136,4 @@ Néanmoins, on peut lancer les tests à partir de docker compose :
 
 ## Déploiement
 
-Aujourd'hui le `business` et le `client` sont déployés chez Scalingo, le `data layer` est chez supabase.io en mode SAAS.
+Aujourd'hui le `business` et le `client` sont déployés chez [Scalingo](https://scalingo.com/), le `data layer` est chez [Supabase](https://supabase.com/) en mode BaaS.

api_tests/.env.example

@@ -0,0 +1,2 @@
+SUPABASE_KEY=$SUPABASE_ANON_KEY
+SUPABASE_URL=http://localhost:8000

api_tests/README.md

@@ -0,0 +1,52 @@
+# API tests
+
+Regroupe les tests d'intégration de l'API générée par le Datalayer.
+
+Ces tests écrits en TypeScript nous permettent de produire des scénarios d'utilisation au fur et à mesure du développement de l'API et de s'assurer que l'API est bien accessible par le client.
+
+On se sert des [tests pgTAP](../data_layer/tests) pour tester le comportement de la base de données.
+
+## Utilisation
+
+[Installer deno](https://deno.land/manual/getting_started/installation), puis
+lancer les tests avec :
+
+```sh
+deno test --allow-net --allow-env --allow-read tests/ --location 'http://localhost'
+```
+
+La commande se décompose ainsi :
+
+- `deno test`: le [test runner de deno](https://deno.land/manual/testing)
+- `--allow-net`: permet l'accès au network
+- `--allow-env`: permet de lire les variables d'environnement
+- `--allow-read`: permet de lire les variables d'environnement du ficher `.env`
+- `tests/`: tous les fichiers TypeScript `.test.ts` du dossier `tests`
+- `--location`: le `location.href` dont le client Supabase a besoin
+
+### Variables d'environnement
+
+- `SUPABASE_URL`: l'URL de Supabase
+- `SUPABASE_KEY`: la clé **anon** de l'API
+
+## Générer les types
+
+Nécessite [d'installer la CLI Supabase](https://supabase.com/docs/guides/cli).
+
+```sh
+gen_types.sh
+```
+
+### Variables d'environnement
+
+- `POSTGRES_PASSWORD`: Le mot de passe de la base locale, voir le `.env` à la
+  racine.
+- `POSTGRES_PORT`: Le port de la base locale
+
+## Formater la doc et le code
+
+Pour le moment on le fait avant commit en attendant de mettre à jour notre CI.
+
+```sh
+deno fmt
+```

api_tests/gen_types.sh

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+supabase gen types typescript --db-url "postgresql://postgres:[email protected]:$POSTGRES_PORT/postgres" > ./lib/database.types.ts