From 7a4bdc852b90f0ad1256afd2d58316f39a577fe3 Mon Sep 17 00:00:00 2001
From: Antoine Augusti <antoine.augusti@transport.data.gouv.fr>
Date: Tue, 12 Dec 2023 08:57:21 +0100
Subject: [PATCH 01/25] =?UTF-8?q?Notifications=20:=20ajuste=20le=20contenu?=
 =?UTF-8?q?=20du=20rappel=20p=C3=A9riodique=20des=20notifs=20aux=20product?=
 =?UTF-8?q?eurs=20(#3653)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...dic_reminder_producers_notification_job.ex | 29 +--------
 .../email/producer_with_subscriptions.html.md | 22 ++-----
 .../producer_without_subscriptions.html.md    | 24 +++-----
 ...minder_producers_notification_job_test.exs | 61 ++-----------------
 4 files changed, 18 insertions(+), 118 deletions(-)

diff --git a/apps/transport/lib/jobs/periodic_reminder_producers_notification_job.ex b/apps/transport/lib/jobs/periodic_reminder_producers_notification_job.ex
index 3d42bb6c59..bcf476e182 100644
--- a/apps/transport/lib/jobs/periodic_reminder_producers_notification_job.ex
+++ b/apps/transport/lib/jobs/periodic_reminder_producers_notification_job.ex
@@ -111,8 +111,6 @@ defmodule Transport.Jobs.PeriodicReminderProducersNotificationJob do
       |> Enum.filter(&DB.Dataset.is_active?/1)
       |> Enum.sort_by(fn %DB.Dataset{custom_title: custom_title} -> custom_title end)
 
-    contacts_in_orgs = contact |> other_contacts_in_orgs()
-
     Transport.EmailSender.impl().send_mail(
       "transport.data.gouv.fr",
       Application.get_env(:transport, :contact_email),
@@ -120,12 +118,7 @@ defmodule Transport.Jobs.PeriodicReminderProducersNotificationJob do
       Application.get_env(:transport, :contact_email),
       "Notifications pour vos données sur transport.data.gouv.fr",
       "",
-      Phoenix.View.render_to_string(TransportWeb.EmailView, "producer_without_subscriptions.html", %{
-        manage_organization_url: contact |> manage_organization_url(),
-        datasets: datasets,
-        contacts_in_orgs: Enum.map_join(contacts_in_orgs, ", ", &DB.Contact.display_name/1),
-        has_other_contacts: not Enum.empty?(contacts_in_orgs)
-      })
+      Phoenix.View.render_to_string(TransportWeb.EmailView, "producer_without_subscriptions.html", %{datasets: datasets})
     )
 
     DB.Notification.insert!(@notification_reason, contact.email)
@@ -142,7 +135,6 @@ defmodule Transport.Jobs.PeriodicReminderProducersNotificationJob do
       "Rappel : vos notifications pour vos données sur transport.data.gouv.fr",
       "",
       Phoenix.View.render_to_string(TransportWeb.EmailView, "producer_with_subscriptions.html", %{
-        manage_organization_url: contact |> manage_organization_url(),
         datasets_subscribed: contact |> datasets_subscribed_as_producer(),
         has_other_producers_subscribers: not Enum.empty?(other_producers_subscribers),
         other_producers_subscribers: Enum.map_join(other_producers_subscribers, ", ", &DB.Contact.display_name/1)
@@ -152,14 +144,6 @@ defmodule Transport.Jobs.PeriodicReminderProducersNotificationJob do
     DB.Notification.insert!(@notification_reason, contact.email)
   end
 
-  def manage_organization_url(%DB.Contact{organizations: [%DB.Organization{id: org_id}]}) do
-    Application.fetch_env!(:transport, :datagouvfr_site) <> "/fr/admin/organization/#{org_id}/"
-  end
-
-  def manage_organization_url(%DB.Contact{}) do
-    Application.fetch_env!(:transport, :datagouvfr_site) <> "/fr/admin/"
-  end
-
   @spec datasets_subscribed_as_producer(DB.Contact.t()) :: [DB.Dataset.t()]
   def datasets_subscribed_as_producer(%DB.Contact{notification_subscriptions: subscriptions}) do
     subscriptions
@@ -169,17 +153,6 @@ defmodule Transport.Jobs.PeriodicReminderProducersNotificationJob do
     |> Enum.sort_by(& &1.custom_title)
   end
 
-  @spec other_contacts_in_orgs(DB.Contact.t()) :: [DB.Contact.t()]
-  def other_contacts_in_orgs(%DB.Contact{id: contact_id} = contact) do
-    contact
-    |> DB.Repo.preload(organizations: [:contacts])
-    |> Map.fetch!(:organizations)
-    |> Enum.flat_map(& &1.contacts)
-    |> Enum.uniq()
-    |> Enum.reject(&match?(%DB.Contact{id: ^contact_id}, &1))
-    |> Enum.sort_by(&DB.Contact.display_name/1)
-  end
-
   @spec subscribed_as_producer?(DB.Contact.t()) :: boolean()
   def subscribed_as_producer?(%DB.Contact{notification_subscriptions: subscriptions}) do
     Enum.any?(subscriptions, &match?(%DB.NotificationSubscription{role: :producer}, &1))
diff --git a/apps/transport/lib/transport_web/templates/email/producer_with_subscriptions.html.md b/apps/transport/lib/transport_web/templates/email/producer_with_subscriptions.html.md
index c639edd489..7705861efd 100644
--- a/apps/transport/lib/transport_web/templates/email/producer_with_subscriptions.html.md
+++ b/apps/transport/lib/transport_web/templates/email/producer_with_subscriptions.html.md
@@ -1,13 +1,9 @@
 Bonjour,
 
-Vous gérez des données présentes sur transport.data.gouv.fr.
-
-## Gérer vos notifications
-
 <%= if Enum.count(@datasets_subscribed) == 1 do %>
-Vous êtes susceptible de recevoir des notifications pour le jeu de données <%= @datasets_subscribed |> hd() |> link_for_dataset() %>.
+Vous êtes inscrit à des notifications pour le jeu de données <%= @datasets_subscribed |> hd() |> link_for_dataset() %>.
 <% else %>
-Vous êtes susceptible de recevoir des notifications pour les jeux de données suivants :
+Vous êtes inscrit à des notifications concernant les jeux de données suivants :
 <ul>
   <%= for dataset <- @datasets_subscribed do %>
   <li><%= link_for_dataset(dataset) %></li>
@@ -15,20 +11,14 @@ Vous êtes susceptible de recevoir des notifications pour les jeux de données s
 </ul>
 <% end %>
 
-Les notifications facilitent la gestion de vos données. Elles vous permettront d’être averti de l’expiration de vos ressources, des erreurs qu’elles peuvent contenir et de leur potentielle indisponibilité.
-
-Vous pouvez gérer ces notifications depuis [votre espace producteur](<%= TransportWeb.Router.Helpers.page_url(TransportWeb.Endpoint, :espace_producteur) %>) du Point d’Accès National.
-
-## Gérer les membres de votre organisation
-
-L’administrateur de votre organisation peut ajouter, modifier ou supprimer les différents membres depuis [votre espace d’administration data.gouv.fr](<%= @manage_organization_url %>).
+Les notifications vous permettent d’être alerté en cas d’expiration, d’indisponibilité et d’erreurs de vos données. Rendez-vous sur votre [Espace Producteur](<%= TransportWeb.Router.Helpers.page_url(TransportWeb.Endpoint, :espace_producteur) %>) pour les gérer de manière autonome.
 
 <%= if @has_other_producers_subscribers do %>
 Les autres personnes inscrites à ces notifications sont : <%= @other_producers_subscribers %>.
 <% end %>
 
-Chaque utilisateur peut paramétrer ses propres notifications depuis son espace producteur du PAN.
-
 Nous restons disponibles pour vous accompagner si besoin.
 
-À bientôt !
+À bientôt,
+
+L’équipe transport.data.gouv.fr
diff --git a/apps/transport/lib/transport_web/templates/email/producer_without_subscriptions.html.md b/apps/transport/lib/transport_web/templates/email/producer_without_subscriptions.html.md
index e1507647a0..8ab2bdc9d7 100644
--- a/apps/transport/lib/transport_web/templates/email/producer_without_subscriptions.html.md
+++ b/apps/transport/lib/transport_web/templates/email/producer_without_subscriptions.html.md
@@ -1,13 +1,9 @@
 Bonjour,
 
-Vous gérez des données présentes sur transport.data.gouv.fr.
-
-## Recevoir des notifications
-
 <%= if Enum.count(@datasets) == 1 do %>
-Vous gérez le jeu de données <%= @datasets |> hd() |> link_for_dataset() %>.
+Le saviez-vous ? Il est possible de vous inscrire à des notifications concernant le jeu de données que vous gérez sur transport.data.gouv.fr, <%= @datasets |> hd() |> link_for_dataset() %>.
 <% else %>
-Vous gérez les jeux de données suivants :
+Le saviez-vous ? Il est possible de vous inscrire à des notifications concernant les jeux de données que vous gérez sur transport.data.gouv.fr :
 <ul>
   <%= for dataset <- @datasets do %>
   <li><%= link_for_dataset(dataset) %></li>
@@ -15,18 +11,12 @@ Vous gérez les jeux de données suivants :
 </ul>
 <% end %>
 
-Pour vous faciliter la gestion de ces données, vous pouvez activer des notifications depuis [votre espace producteur](<%= TransportWeb.Router.Helpers.page_url(TransportWeb.Endpoint, :espace_producteur) %>) du Point d’Accès National. Elles vous permettront d’être averti de l’expiration de vos ressources, des erreurs qu’elles peuvent contenir et de leur potentielle indisponibilité.
+Les notifications vous permettent d’être alerté en cas d’expiration, d’indisponibilité et d’erreurs de vos données.
 
-## Gérer les membres de votre organisation
-
-L’administrateur de votre organisation peut ajouter, modifier ou supprimer les différents membres depuis [votre espace d’administration data.gouv.fr](<%= @manage_organization_url %>).
-
-<%= if @has_other_contacts do %>
-Les autres personnes pouvant s’inscrire à ces notifications et s’étant déjà connectées sont : <%= @contacts_in_orgs %>.
-<% end %>
-
-Chaque utilisateur peut paramétrer ses propres notifications depuis son espace producteur du PAN.
+Pour vous inscrire, rien de plus simple : rendez-vous sur votre [Espace Producteur](<%= TransportWeb.Router.Helpers.page_url(TransportWeb.Endpoint, :espace_producteur) %>) dans le menu “Recevoir des notifications”.
 
 Nous restons disponibles pour vous accompagner si besoin.
 
-À bientôt !
+À bientôt,
+
+L’équipe transport.data.gouv.fr
diff --git a/apps/transport/test/transport/jobs/periodic_reminder_producers_notification_job_test.exs b/apps/transport/test/transport/jobs/periodic_reminder_producers_notification_job_test.exs
index 9e043e87cc..d4a94c381b 100644
--- a/apps/transport/test/transport/jobs/periodic_reminder_producers_notification_job_test.exs
+++ b/apps/transport/test/transport/jobs/periodic_reminder_producers_notification_job_test.exs
@@ -104,28 +104,6 @@ defmodule Transport.Test.Transport.Jobs.PeriodicReminderProducersNotificationJob
            |> PeriodicReminderProducersNotificationJob.subscribed_as_producer?()
   end
 
-  test "other_contacts_in_orgs" do
-    org_id = Ecto.UUID.generate()
-
-    contact =
-      insert_contact(%{
-        organizations: [
-          sample_org(%{"id" => org_id}),
-          sample_org()
-        ]
-      })
-
-    %DB.Contact{id: other_contact_id} =
-      insert_contact(%{
-        organizations: [
-          sample_org(%{"id" => org_id})
-        ]
-      })
-
-    assert [%DB.Contact{id: ^other_contact_id}] =
-             PeriodicReminderProducersNotificationJob.other_contacts_in_orgs(contact)
-  end
-
   test "other_producers_subscribers" do
     producer_1 = insert_contact()
     %DB.Contact{id: producer_2_id} = producer_2 = insert_contact()
@@ -216,7 +194,7 @@ defmodule Transport.Test.Transport.Jobs.PeriodicReminderProducersNotificationJob
       assert subject == "Rappel : vos notifications pour vos données sur transport.data.gouv.fr"
 
       assert html =~
-               ~s(Vous êtes susceptible de recevoir des notifications pour le jeu de données <a href="http://127.0.0.1:5100/datasets/#{dataset.slug}">#{dataset.custom_title}</a>)
+               ~s(Vous êtes inscrit à des notifications pour le jeu de données <a href="http://127.0.0.1:5100/datasets/#{dataset.slug}">#{dataset.custom_title}</a>)
 
       assert html =~ "Les autres personnes inscrites à ces notifications sont : Marina Loiseau."
     end)
@@ -237,15 +215,6 @@ defmodule Transport.Test.Transport.Jobs.PeriodicReminderProducersNotificationJob
         ]
       })
 
-    insert_contact(%{
-      first_name: "Marina",
-      last_name: "Loiseau",
-      organizations: [
-        sample_org(%{"id" => org_id}),
-        sample_org()
-      ]
-    })
-
     dataset = insert(:dataset, custom_title: "Super JDD", organization_id: org_id)
 
     refute contact
@@ -263,12 +232,10 @@ defmodule Transport.Test.Transport.Jobs.PeriodicReminderProducersNotificationJob
       assert subject == "Notifications pour vos données sur transport.data.gouv.fr"
 
       assert html =~
-               ~s(Vous gérez le jeu de données <a href="http://127.0.0.1:5100/datasets/#{dataset.slug}">#{dataset.custom_title}</a>)
-
-      assert html =~ "Pour vous faciliter la gestion de ces données, vous pouvez activer des notifications"
+               ~s(Il est possible de vous inscrire à des notifications concernant le jeu de données que vous gérez sur transport.data.gouv.fr, <a href="http://127.0.0.1:5100/datasets/#{dataset.slug}">#{dataset.custom_title}</a>)
 
       assert html =~
-               "Les autres personnes pouvant s’inscrire à ces notifications et s’étant déjà connectées sont : Marina Loiseau."
+               ~s(Pour vous inscrire, rien de plus simple : rendez-vous sur votre <a href="http://127.0.0.1:5100/espace_producteur">Espace Producteur</a>)
     end)
 
     assert :ok == perform_job(PeriodicReminderProducersNotificationJob, %{"contact_id" => contact.id})
@@ -286,27 +253,7 @@ defmodule Transport.Test.Transport.Jobs.PeriodicReminderProducersNotificationJob
              perform_job(PeriodicReminderProducersNotificationJob, %{"contact_id" => contact.id})
   end
 
-  describe "manage_organization_url" do
-    test "single org" do
-      org_id = Ecto.UUID.generate()
-      contact = %{organizations: [sample_org(%{"id" => org_id})]} |> insert_contact() |> DB.Repo.preload(:organizations)
-      assert 1 == contact.organizations |> Enum.count()
-
-      assert "https://demo.data.gouv.fr/fr/admin/organization/#{org_id}/" ==
-               contact |> PeriodicReminderProducersNotificationJob.manage_organization_url()
-    end
-
-    test "multiple orgs" do
-      contact = %{organizations: [sample_org(), sample_org()]} |> insert_contact() |> DB.Repo.preload(:organizations)
-
-      assert 2 == contact.organizations |> Enum.count()
-
-      assert "https://demo.data.gouv.fr/fr/admin/" ==
-               contact |> PeriodicReminderProducersNotificationJob.manage_organization_url()
-    end
-  end
-
-  defp sample_org(%{} = args \\ %{}) do
+  defp sample_org(%{} = args) do
     Map.merge(
       %{
         "acronym" => nil,

From abc05ee11869ab102da71d19f959b485619e7e8a Mon Sep 17 00:00:00 2001
From: Antoine Augusti <antoine.augusti@transport.data.gouv.fr>
Date: Tue, 12 Dec 2023 09:03:00 +0100
Subject: [PATCH 02/25] Backoffice : ajout doc/config pour plug rate limiter
 (#3652)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Backoffice : ajout doc/config pour plug rate limiter

* Améliorations suite à PR

---------

Co-authored-by: Thibaut Barrère <thibaut.barrere@gmail.com>
---
 .../live/backoffice/rate_limiter_live.ex      |  69 ++++++++++++
 .../backoffice/rate_limiter_live.html.heex    | 101 ++++++++++++++++++
 apps/transport/lib/transport_web/router.ex    |   4 +
 .../templates/backoffice/page/index.html.heex |   4 +
 apps/transport/priv/gettext/backoffice.pot    |   4 +
 .../priv/gettext/en/LC_MESSAGES/backoffice.po |   4 +
 .../priv/gettext/fr/LC_MESSAGES/backoffice.po |   4 +
 .../live_views/rate_limiter_live_test.exs     |  25 +++++
 8 files changed, 215 insertions(+)
 create mode 100644 apps/transport/lib/transport_web/live/backoffice/rate_limiter_live.ex
 create mode 100644 apps/transport/lib/transport_web/live/backoffice/rate_limiter_live.html.heex
 create mode 100644 apps/transport/test/transport_web/live_views/rate_limiter_live_test.exs

diff --git a/apps/transport/lib/transport_web/live/backoffice/rate_limiter_live.ex b/apps/transport/lib/transport_web/live/backoffice/rate_limiter_live.ex
new file mode 100644
index 0000000000..733581f8a7
--- /dev/null
+++ b/apps/transport/lib/transport_web/live/backoffice/rate_limiter_live.ex
@@ -0,0 +1,69 @@
+defmodule TransportWeb.Backoffice.RateLimiterLive do
+  use Phoenix.LiveView
+  import TransportWeb.Backoffice.JobsLive, only: [ensure_admin_auth_or_redirect: 3]
+  import TransportWeb.Router.Helpers, only: [static_path: 2]
+  import Helpers, only: [format_number: 1]
+
+  @impl true
+  def mount(_params, %{"current_user" => current_user} = _session, socket) do
+    {:ok,
+     ensure_admin_auth_or_redirect(socket, current_user, fn socket ->
+       if connected?(socket), do: schedule_next_update_data()
+
+       socket
+       |> assign(%{
+         phoenix_ddos_max_2min_requests: env_value_to_int("PHOENIX_DDOS_MAX_2MIN_REQUESTS"),
+         phoenix_ddos_max_1hour_requests: env_value_to_int("PHOENIX_DDOS_MAX_1HOUR_REQUESTS"),
+         phoenix_ddos_safelist_ips: env_value_to_list("PHOENIX_DDOS_SAFELIST_IPS"),
+         phoenix_ddos_blocklist_ips: env_value_to_list("PHOENIX_DDOS_BLOCKLIST_IPS"),
+         log_user_agent: env_value("LOG_USER_AGENT"),
+         block_user_agent_keywords: env_value_to_list("BLOCK_USER_AGENT_KEYWORDS"),
+         allow_user_agents: env_value_to_list("ALLOW_USER_AGENTS")
+       })
+       |> update_data()
+     end)}
+  end
+
+  @impl true
+  def handle_info(:update_data, socket) do
+    schedule_next_update_data()
+    {:noreply, update_data(socket)}
+  end
+
+  defp schedule_next_update_data do
+    Process.send_after(self(), :update_data, 1000)
+  end
+
+  defp update_data(socket) do
+    assign(socket,
+      last_updated_at: (Time.utc_now() |> Time.truncate(:second) |> to_string()) <> " UTC",
+      ips_in_jail: ips_in_jail()
+    )
+  end
+
+  @impl true
+  def handle_event("bail_ip_from_jail", %{"ip" => ip}, socket) do
+    # See https://github.com/xward/phoenix_ddos/blob/feb07469ce318214cddb8e88ac18b5f94b3e31f2/lib/phoenix_ddos/core/jail.ex#L36
+    PhoenixDDoS.Jail.bail_out(ip)
+    {:noreply, socket}
+  end
+
+  defp ips_in_jail do
+    # See https://github.com/xward/phoenix_ddos/blob/master/lib/phoenix_ddos/core/jail.ex
+    {:ok, keys} = Cachex.keys(:phoenix_ddos_jail)
+    keys |> Enum.reject(&String.starts_with?(&1, "suspicious_"))
+  end
+
+  defp env_value(env_value), do: System.get_env(env_value)
+
+  defp env_value_to_int(env_name) do
+    env_name |> System.get_env("500") |> Integer.parse() |> elem(0)
+  end
+
+  defp env_value_to_list(env_name) do
+    case System.get_env(env_name, "") do
+      "" -> "<vide>"
+      value -> value
+    end
+  end
+end
diff --git a/apps/transport/lib/transport_web/live/backoffice/rate_limiter_live.html.heex b/apps/transport/lib/transport_web/live/backoffice/rate_limiter_live.html.heex
new file mode 100644
index 0000000000..851f63ba25
--- /dev/null
+++ b/apps/transport/lib/transport_web/live/backoffice/rate_limiter_live.html.heex
@@ -0,0 +1,101 @@
+<section class="pb-48">
+  <div class="container">
+    <h2>Plug</h2>
+    <p>
+      Le plug qui gère la logique de rate limiting, bloquer ou autoriser des requêtes est dans <a
+        href="https://github.com/etalab/transport-site/blob/master/apps/transport/lib/transport_web/plugs/rate_limiter.ex"
+        target="_blank"
+      ><code>TransportWeb.Plugs.RateLimiter</code></a>.
+    </p>
+    <p>
+      Le comptage des requêtes et le blocage d'une adresse IP est effectué par la librairie <a href="https://github.com/xward/phoenix_ddos"><code>phoenix_ddos</code></a>. Le backend est Cachex, qui utilise la RAM. Ainsi un redémarrage de l'application
+      <code>prod-site</code>
+      réinitialise les compteurs et les adresses IPs bloquées.
+    </p>
+
+    <h2>Configuration</h2>
+    <p>
+      Plusieurs variables d'environnement permettent de configurer le fonctionnement. Il faut changer ces variables pour ajuster le comportement puis redémarrer l'application.
+    </p>
+
+    <h4>Volume de requêtes</h4>
+    <ul>
+      <li>
+        <code>PHOENIX_DDOS_MAX_2MIN_REQUESTS</code>
+        : nombre de requêtes max autorisée par IP par période de 2 minutes. Valeur actuelle : <%= format_number(
+          @phoenix_ddos_max_2min_requests
+        ) %>
+      </li>
+      <li>
+        <code>PHOENIX_DDOS_MAX_1HOUR_REQUESTS</code>
+        : nombre de requêtes max autorisée par IP par période d'1 heure. Valeur actuelle : <%= format_number(
+          @phoenix_ddos_max_1hour_requests
+        ) %>
+      </li>
+    </ul>
+
+    <h4>Adresses IPs autorisées ou bloquées</h4>
+
+    <ul>
+      <li>
+        <code>PHOENIX_DDOS_SAFELIST_IPS</code>
+        : liste d'adresses IP <strong>toujours autorisées</strong>. Les valeurs doivent être séparées par des <code>|</code>. Valeur actuelle :
+        <code><%= @phoenix_ddos_safelist_ips %></code>
+      </li>
+      <li>
+        <code>PHOENIX_DDOS_BLOCKLIST_IPS</code>
+        : liste d'adresses IP <strong>toujours bloquées</strong>. Les valeurs doivent être séparées par des <code>|</code>. Valeur actuelle :
+        <code><%= @phoenix_ddos_blocklist_ips %></code>
+      </li>
+    </ul>
+
+    <h4>User-Agents</h4>
+
+    <ul>
+      <li>
+        <code>LOG_USER_AGENT</code>
+        : active ou désactive le fait de logguer les user agents. Valeurs possible : <code>true</code>
+        ou <code>false</code>. Valeur actuelle : <code><%= @log_user_agent %></code>
+      </li>
+      <li>
+        <code>ALLOW_USER_AGENTS</code>
+        : user agents <strong>toujours autorisés</strong>. Les valeurs doivent être séparées par des <code>|</code>. Valeur actuelle :
+        <code><%= @allow_user_agents %></code>
+      </li>
+      <li>
+        <code>BLOCK_USER_AGENT_KEYWORDS</code>
+        : user agents <strong>toujours bloqués</strong>. Les valeurs doivent être séparées par des <code>|</code>. Valeur actuelle :
+        <code><%= @block_user_agent_keywords %></code>
+      </li>
+    </ul>
+
+    <h2>Adresses IPs bloquées</h2>
+    <p>
+      <a href="https://github.com/xward/phoenix_ddos"><code>phoenix_ddos</code></a>
+      est la dépendance qui gère l'ajout/le retrait de la jail.
+    </p>
+
+    <p :if={Enum.empty?(@ips_in_jail)}>
+      Personne n'est bloqué actuellement.
+    </p>
+
+    <div :if={Enum.count(@ips_in_jail) > 0}>
+      <p>
+        Adresses IPs actuellement dans la jail :
+      </p>
+
+      <ul>
+        <%= for ip <- @ips_in_jail do %>
+          <li>
+            <%= ip %>
+            <button class="button small" phx-click="bail_ip_from_jail" phx-value-ip={ip}>
+              Retirer de la jail
+            </button>
+          </li>
+        <% end %>
+      </ul>
+    </div>
+    <p class="small">Dernière mise à jour: <%= @last_updated_at %></p>
+  </div>
+</section>
+<script defer type="text/javascript" src={static_path(@socket, "/js/app.js")} />
diff --git a/apps/transport/lib/transport_web/router.ex b/apps/transport/lib/transport_web/router.ex
index 9aa2afb447..fb968c2c3c 100644
--- a/apps/transport/lib/transport_web/router.ex
+++ b/apps/transport/lib/transport_web/router.ex
@@ -188,6 +188,10 @@ defmodule TransportWeb.Router do
         live("/cache", CacheLive)
       end
 
+      live_session :rate_limiter, root_layout: {TransportWeb.LayoutView, :app} do
+        live("/rate_limiter", RateLimiterLive)
+      end
+
       get("/import_aoms", PageController, :import_all_aoms)
 
       live_session :data_import_batch_report, root_layout: {TransportWeb.LayoutView, :app} do
diff --git a/apps/transport/lib/transport_web/templates/backoffice/page/index.html.heex b/apps/transport/lib/transport_web/templates/backoffice/page/index.html.heex
index 2ce8b82f4e..ab213285d0 100644
--- a/apps/transport/lib/transport_web/templates/backoffice/page/index.html.heex
+++ b/apps/transport/lib/transport_web/templates/backoffice/page/index.html.heex
@@ -27,6 +27,10 @@
     <%= dgettext("backoffice", "Cache debug") %>
   </a>
 
+  <a class="button" href={backoffice_live_path(@conn, TransportWeb.Backoffice.RateLimiterLive)}>
+    <%= dgettext("backoffice", "Rate limiter") %>
+  </a>
+
   <a class="button" href={backoffice_live_path(@conn, TransportWeb.Backoffice.DataImportBatchReportLive)}>
     <%= dgettext("backoffice", "GTFS data import") %>
   </a>
diff --git a/apps/transport/priv/gettext/backoffice.pot b/apps/transport/priv/gettext/backoffice.pot
index fa2ecf0bfb..bbe7a8facb 100644
--- a/apps/transport/priv/gettext/backoffice.pot
+++ b/apps/transport/priv/gettext/backoffice.pot
@@ -290,3 +290,7 @@ msgstr ""
 #, elixir-autogen, elixir-format
 msgid "AOM open data status"
 msgstr ""
+
+#, elixir-autogen, elixir-format
+msgid "Rate limiter"
+msgstr ""
diff --git a/apps/transport/priv/gettext/en/LC_MESSAGES/backoffice.po b/apps/transport/priv/gettext/en/LC_MESSAGES/backoffice.po
index b62cbcb734..e17f48f2f0 100644
--- a/apps/transport/priv/gettext/en/LC_MESSAGES/backoffice.po
+++ b/apps/transport/priv/gettext/en/LC_MESSAGES/backoffice.po
@@ -290,3 +290,7 @@ msgstr ""
 #, elixir-autogen, elixir-format
 msgid "AOM open data status"
 msgstr ""
+
+#, elixir-autogen, elixir-format
+msgid "Rate limiter"
+msgstr ""
diff --git a/apps/transport/priv/gettext/fr/LC_MESSAGES/backoffice.po b/apps/transport/priv/gettext/fr/LC_MESSAGES/backoffice.po
index eb98d94683..361cbde61f 100644
--- a/apps/transport/priv/gettext/fr/LC_MESSAGES/backoffice.po
+++ b/apps/transport/priv/gettext/fr/LC_MESSAGES/backoffice.po
@@ -290,3 +290,7 @@ msgstr "Conversions relancées"
 #, elixir-autogen, elixir-format
 msgid "AOM open data status"
 msgstr "Ouverture des données par AOM"
+
+#, elixir-autogen, elixir-format
+msgid "Rate limiter"
+msgstr ""
diff --git a/apps/transport/test/transport_web/live_views/rate_limiter_live_test.exs b/apps/transport/test/transport_web/live_views/rate_limiter_live_test.exs
new file mode 100644
index 0000000000..6dcdfa06e4
--- /dev/null
+++ b/apps/transport/test/transport_web/live_views/rate_limiter_live_test.exs
@@ -0,0 +1,25 @@
+defmodule TransportWeb.Backoffice.RateLimiterLiveTest do
+  use ExUnit.Case, async: true
+  use TransportWeb.LiveCase
+  import TransportWeb.ConnCase, only: [setup_admin_in_session: 1]
+
+  @endpoint TransportWeb.Endpoint
+  @url "/backoffice/rate_limiter"
+
+  setup do
+    {:ok, conn: build_conn()}
+  end
+
+  test "requires login", %{conn: conn} do
+    conn
+    |> get(@url)
+    |> html_response(302)
+  end
+
+  test "page can load", %{conn: conn} do
+    conn
+    |> setup_admin_in_session()
+    |> get(@url)
+    |> html_response(200)
+  end
+end

From 2dcb8f57f32aac5e2f02015710d9a4e7e1cb1dbe Mon Sep 17 00:00:00 2001
From: Antoine Augusti <antoine.augusti@transport.data.gouv.fr>
Date: Tue, 12 Dec 2023 09:13:40 +0100
Subject: [PATCH 03/25] =?UTF-8?q?ImportData=20:=20mise=20=C3=A0=20jour=20l?=
 =?UTF-8?q?ogique=20d=C3=A9tection=20ressource=20ODS=20(#3649)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* ImportData : mise à jour logique détection ressource ODS

* PR comments

---------

Co-authored-by: Thibaut Barrère <thibaut.barrere@gmail.com>
---
 apps/transport/lib/transport/import_data.ex | 38 +++++++++++++++++----
 1 file changed, 31 insertions(+), 7 deletions(-)

diff --git a/apps/transport/lib/transport/import_data.ex b/apps/transport/lib/transport/import_data.ex
index a630f8d971..c4614aa4c8 100644
--- a/apps/transport/lib/transport/import_data.ex
+++ b/apps/transport/lib/transport/import_data.ex
@@ -442,11 +442,27 @@ defmodule Transport.ImportData do
     end
   end
 
-  def is_ods_title?(%{"title" => title})
+  @doc """
+  iex> is_ods_resource?(%{"format" => "json", "title" => "GTFS (json)", "harvest" => %{"uri" => "https://data.angers.fr/api/explore/v2.1/catalog/datasets/angers-loire-metropole-horaires-reseau-irigo-gtfs-rt/exports/json"}})
+  true
+  iex> is_ods_resource?(%{"format" => "GTFS", "title" => "GTFS été"})
+  false
+  iex> is_ods_resource?(%{"format" => "csv", "title" => "Export au format CSV"})
+  true
+  """
+  # Will soon be legacy, after DCAT migration
+  # (see https://github.com/etalab/transport-site/issues/3647)
+  def is_ods_resource?(%{"title" => title})
       when title in ["Export au format CSV", "Export au format JSON"],
       do: true
 
-  def is_ods_title?(_), do: false
+  def is_ods_resource?(%{"harvest" => %{"uri" => uri}}) do
+    # Possible URL:
+    # https://data.angers.fr/api/explore/v2.1/catalog/datasets/angers-loire-metropole-horaires-reseau-irigo-gtfs-rt/exports/json
+    String.match?(uri, ~r{/api/explore/v(\d+\.\d+)/catalog/datasets/.*/exports/(json|csv)$}i)
+  end
+
+  def is_ods_resource?(_), do: false
 
   @doc """
   Is it a GTFS file?
@@ -467,6 +483,8 @@ defmodule Transport.ImportData do
   true
   iex> is_gtfs?(%{"description" => "gtfs", "title" => "Export au format CSV"})
   false
+  iex> is_gtfs?(%{"title" => "Angers GTFS (json)", "format" => "json", "harvest" => %{"uri" => "https://example.com/api/explore/v2.1/catalog/datasets/foo/exports/json"}})
+  false
   iex> is_gtfs?(%{"format" => "gtfs", "title" => "Export au format CSV"})
   true
   iex> is_gtfs?(%{"url" => "https://example.com/documentation-gtfs.pdf", "type" => "documentation"})
@@ -477,7 +495,7 @@ defmodule Transport.ImportData do
   def is_gtfs?(%{} = params) do
     cond do
       is_gtfs?(params["format"]) -> true
-      is_ods_title?(params) or is_documentation?(params) -> false
+      is_ods_resource?(params) or is_documentation?(params) -> false
       is_gtfs_rt?(params) -> false
       is_format?(params["url"], ["json", "csv", "shp", "pdf", "7z"]) -> false
       is_format?(params["format"], "NeTEx") -> false
@@ -507,6 +525,8 @@ defmodule Transport.ImportData do
   true
   iex> is_gtfs_rt?(%{"description" => "gtfs-rt", "title" => "Export au format CSV"})
   false
+  iex> is_gtfs_rt?(%{"format" => "json", "title" => "GTFS-RT vehicle positions", "description" => "gtfs-rt", "harvest" => %{"uri" => "https://example.com/api/explore/v2.1/catalog/datasets/foo/exports/json"}})
+  false
   iex> is_gtfs_rt?(%{"format" => "gtfs-rt", "title" => "Export au format CSV"})
   true
   """
@@ -514,7 +534,7 @@ defmodule Transport.ImportData do
   def is_gtfs_rt?(%{} = params) do
     cond do
       is_gtfs_rt?(params["format"]) -> true
-      is_ods_title?(params) or is_documentation?(params) -> false
+      is_ods_resource?(params) or is_documentation?(params) -> false
       is_gtfs_rt?(params["description"]) -> true
       is_gtfs_rt?(params["title"]) -> true
       is_gtfs_rt?(params["url"]) -> true
@@ -568,6 +588,8 @@ defmodule Transport.ImportData do
   true
   iex> is_siri?(%{"title" => "Export au format CSV", "format" => "SIRI"})
   false
+  iex> is_siri?(%{"title" => "Flux SIRI", "format" => "csv", "harvest" => %{"uri" => "https://example.com/api/explore/v2.1/catalog/datasets/foo/exports/json"}})
+  false
   iex> is_siri?(%{"title" => "https://api.okina.fr/gateway/cae/realtime", "format" => "bin", "description" => "API temps réel au format SIRI"})
   true
   iex> is_siri?(%{"type" => "documentation", "title" => "Documentation de l'API SIRI"})
@@ -577,7 +599,7 @@ defmodule Transport.ImportData do
   def is_siri?(%{} = params) do
     cond do
       is_siri_lite?(params) -> false
-      is_ods_title?(params) or is_documentation?(params) -> false
+      is_ods_resource?(params) or is_documentation?(params) -> false
       is_format?(params, "siri") -> true
       is_siri?(params["title"]) -> true
       is_siri?(params["description"]) -> true
@@ -601,7 +623,7 @@ defmodule Transport.ImportData do
   @spec is_siri_lite?(binary() | map()) :: boolean()
   def is_siri_lite?(params) do
     cond do
-      is_ods_title?(params) or is_documentation?(params) -> false
+      is_ods_resource?(params) or is_documentation?(params) -> false
       is_format?(params, "SIRI Lite") -> true
       true -> false
     end
@@ -680,12 +702,14 @@ defmodule Transport.ImportData do
   false
   iex> is_netex?(%{"title" => "Export au format CSV", "format" => "netex"})
   true
+  iex> is_netex?(%{"title" => "Angers NeTEx (json)", "format" => "json", "harvest" => %{"uri" => "https://example.com/api/explore/v2.1/catalog/datasets/foo/exports/json"}})
+  false
   """
   @spec is_netex?(binary() | map()) :: boolean()
   def is_netex?(%{} = params) do
     cond do
       is_netex?(params["format"]) -> true
-      is_ods_title?(params) or is_documentation?(params) -> false
+      is_ods_resource?(params) or is_documentation?(params) -> false
       is_netex?(params["title"]) -> true
       is_netex?(params["description"]) -> true
       is_netex?(params["url"]) -> true

From bf1577340710e54bcec3c056e403577042e7bdae Mon Sep 17 00:00:00 2001
From: Antoine Augusti <antoine.augusti@beta.gouv.fr>
Date: Tue, 12 Dec 2023 11:59:43 +0100
Subject: [PATCH 04/25] bail_ip_from_jail: convert to charlist

---
 .../lib/transport_web/live/backoffice/rate_limiter_live.ex      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/transport/lib/transport_web/live/backoffice/rate_limiter_live.ex b/apps/transport/lib/transport_web/live/backoffice/rate_limiter_live.ex
index 733581f8a7..a1e54bf52c 100644
--- a/apps/transport/lib/transport_web/live/backoffice/rate_limiter_live.ex
+++ b/apps/transport/lib/transport_web/live/backoffice/rate_limiter_live.ex
@@ -44,7 +44,7 @@ defmodule TransportWeb.Backoffice.RateLimiterLive do
   @impl true
   def handle_event("bail_ip_from_jail", %{"ip" => ip}, socket) do
     # See https://github.com/xward/phoenix_ddos/blob/feb07469ce318214cddb8e88ac18b5f94b3e31f2/lib/phoenix_ddos/core/jail.ex#L36
-    PhoenixDDoS.Jail.bail_out(ip)
+    ip |> to_charlist() |> PhoenixDDoS.Jail.bail_out()
     {:noreply, socket}
   end
 

From 2f288fbb048012157ab38529accb3caaa1085a44 Mon Sep 17 00:00:00 2001
From: Antoine Augusti <antoine.augusti@transport.data.gouv.fr>
Date: Tue, 12 Dec 2023 13:53:17 +0100
Subject: [PATCH 05/25] ImportData : adapte lecture des zones datagouv (#3658)

---
 apps/transport/lib/transport/import_data.ex   | 50 +++++++++----------
 apps/transport/test/support/factory.ex        |  4 ++
 .../test/transport/import_data_test.exs       | 42 ++++++++++++++++
 3 files changed, 70 insertions(+), 26 deletions(-)

diff --git a/apps/transport/lib/transport/import_data.ex b/apps/transport/lib/transport/import_data.ex
index c4614aa4c8..a2fa7cf59e 100644
--- a/apps/transport/lib/transport/import_data.ex
+++ b/apps/transport/lib/transport/import_data.ex
@@ -235,33 +235,31 @@ defmodule Transport.ImportData do
   end
 
   @spec read_datagouv_zone(map()) :: [binary()]
-  defp read_datagouv_zone(%{
-         "features" => [
-           %{
-             "properties" => %{
-               "level" => "fr:commune",
-               "keys" => %{
-                 "insee" => insee
-               }
-             }
-           }
-           | _
-         ]
-       }) do
+  def read_datagouv_zone(%{
+        "features" => [
+          %{
+            "properties" => %{
+              "level" => "fr:commune",
+              "code" => insee
+            }
+          }
+          | _
+        ]
+      }) do
     [insee]
   end
 
-  defp read_datagouv_zone(%{
-         "features" => [
-           %{
-             "properties" => %{
-               "level" => "fr:epci",
-               "code" => code
-             }
-           }
-           | _
-         ]
-       }) do
+  def read_datagouv_zone(%{
+        "features" => [
+          %{
+            "properties" => %{
+              "level" => "fr:epci",
+              "code" => code
+            }
+          }
+          | _
+        ]
+      }) do
     # For the EPCI we get the list of cities contained by the EPCI
     EPCI
     |> Repo.get_by(code: code)
@@ -275,12 +273,12 @@ defmodule Transport.ImportData do
     end
   end
 
-  defp read_datagouv_zone(%{"features" => [%{"id" => id} | _]}) do
+  def read_datagouv_zone(%{"features" => [%{"id" => id} | _]}) do
     Logger.info("For the moment we can only handle cities, we cannot handle the zone #{id}")
     []
   end
 
-  defp read_datagouv_zone(z) do
+  def read_datagouv_zone(z) do
     Logger.info("invalid format we cannot handle the zone #{inspect(z)}")
     []
   end
diff --git a/apps/transport/test/support/factory.ex b/apps/transport/test/support/factory.ex
index 170aef2e04..cdf90b6fe0 100644
--- a/apps/transport/test/support/factory.ex
+++ b/apps/transport/test/support/factory.ex
@@ -106,6 +106,10 @@ defmodule DB.Factory do
     }
   end
 
+  def epci_factory do
+    %DB.EPCI{}
+  end
+
   def data_import_factory do
     %DB.DataImport{}
   end
diff --git a/apps/transport/test/transport/import_data_test.exs b/apps/transport/test/transport/import_data_test.exs
index 1dee6963b3..4f06603b83 100644
--- a/apps/transport/test/transport/import_data_test.exs
+++ b/apps/transport/test/transport/import_data_test.exs
@@ -361,4 +361,46 @@ defmodule Transport.ImportDataTest do
     assert [%{"format" => "gtfs", "type" => "main"}, %{"format" => "svg", "type" => "documentation"}] ==
              ImportData.get_valid_resources(resources, "public-transit")
   end
+
+  describe "read_datagouv_zone" do
+    test "for a commune" do
+      # Example: https://www.data.gouv.fr/api/1/spatial/zones/fr:commune:38185/
+      assert ["38185"] ==
+               ImportData.read_datagouv_zone(%{
+                 "features" => [
+                   %{
+                     "id" => "fr:commune:38185",
+                     "properties" => %{
+                       "code" => "38185",
+                       "level" => "fr:commune",
+                       "name" => "Grenoble",
+                       "slug" => "Grenoble",
+                       "uri" => "http://id.insee.fr/geo/commune/f71595ba-1957-416a-83c2-c7f677a91ca4"
+                     }
+                   }
+                 ]
+               })
+    end
+
+    test "for an EPCI" do
+      commune = insert(:commune)
+      epci = insert(:epci, code: "242320109", nom: "Le Pays Dunois", communes_insee: [commune.insee])
+      # Example: https://www.data.gouv.fr/api/1/spatial/zones/fr:epci:242320109/
+      assert [commune.insee] ==
+               ImportData.read_datagouv_zone(%{
+                 "features" => [
+                   %{
+                     "id" => "fr:epci:#{epci.code}",
+                     "properties" => %{
+                       "code" => epci.code,
+                       "level" => "fr:epci",
+                       "name" => epci.nom,
+                       "slug" => "Le-Pays-Dunois",
+                       "uri" => "http://id.insee.fr/geo/intercommunalite/882b7908-51cf-401d-b0db-ae6ad708b670"
+                     }
+                   }
+                 ]
+               })
+    end
+  end
 end

From 008e6c621b720f7d81d369dbe28bbafe4cbb6b3c Mon Sep 17 00:00:00 2001
From: Antoine Augusti <antoine.augusti@transport.data.gouv.fr>
Date: Tue, 12 Dec 2023 14:26:45 +0100
Subject: [PATCH 06/25] RateLimiterLive : cast des IPs en string (#3659)

* RateLimiterLive : cast des IPs en string

* Add test

* bail_ip_from_jail: convert to charlist

* Add test: removing IP from jail

* PR comment
---
 .../live/backoffice/rate_limiter_live.ex      |  7 +++--
 .../live_views/rate_limiter_live_test.exs     | 26 +++++++++++++++++++
 2 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/apps/transport/lib/transport_web/live/backoffice/rate_limiter_live.ex b/apps/transport/lib/transport_web/live/backoffice/rate_limiter_live.ex
index a1e54bf52c..be9d8cec25 100644
--- a/apps/transport/lib/transport_web/live/backoffice/rate_limiter_live.ex
+++ b/apps/transport/lib/transport_web/live/backoffice/rate_limiter_live.ex
@@ -48,10 +48,13 @@ defmodule TransportWeb.Backoffice.RateLimiterLive do
     {:noreply, socket}
   end
 
-  defp ips_in_jail do
+  def ips_in_jail do
     # See https://github.com/xward/phoenix_ddos/blob/master/lib/phoenix_ddos/core/jail.ex
+    # The dependency does not a method for this feature at the moment, we're calling an
+    # internal API.
+    # https://github.com/xward/phoenix_ddos/issues/2
     {:ok, keys} = Cachex.keys(:phoenix_ddos_jail)
-    keys |> Enum.reject(&String.starts_with?(&1, "suspicious_"))
+    keys |> Enum.map(&to_string/1) |> Enum.reject(&String.starts_with?(&1, "suspicious_"))
   end
 
   defp env_value(env_value), do: System.get_env(env_value)
diff --git a/apps/transport/test/transport_web/live_views/rate_limiter_live_test.exs b/apps/transport/test/transport_web/live_views/rate_limiter_live_test.exs
index 6dcdfa06e4..c3b9682607 100644
--- a/apps/transport/test/transport_web/live_views/rate_limiter_live_test.exs
+++ b/apps/transport/test/transport_web/live_views/rate_limiter_live_test.exs
@@ -1,6 +1,7 @@
 defmodule TransportWeb.Backoffice.RateLimiterLiveTest do
   use ExUnit.Case, async: true
   use TransportWeb.LiveCase
+  import Phoenix.LiveViewTest
   import TransportWeb.ConnCase, only: [setup_admin_in_session: 1]
 
   @endpoint TransportWeb.Endpoint
@@ -22,4 +23,29 @@ defmodule TransportWeb.Backoffice.RateLimiterLiveTest do
     |> get(@url)
     |> html_response(200)
   end
+
+  test "ips_in_jail" do
+    assert [] == TransportWeb.Backoffice.RateLimiterLive.ips_in_jail()
+    PhoenixDDoS.Jail.send(~c"108.128.238.17", {nil, %{jail_time: {1, :hour}}})
+    assert ["108.128.238.17"] == TransportWeb.Backoffice.RateLimiterLive.ips_in_jail()
+  end
+
+  test "bail out IP", %{conn: conn} do
+    ip = "108.128.238.17"
+    ip |> to_charlist() |> PhoenixDDoS.Jail.send({nil, %{jail_time: {1, :hour}}})
+    {:ok, view, html} = conn |> setup_admin_in_session() |> live(@url)
+    assert [ip] == TransportWeb.Backoffice.RateLimiterLive.ips_in_jail()
+
+    assert html =~ ip
+
+    assert view
+           |> element("button", "Retirer de la jail")
+           |> render_click()
+
+    assert [] == TransportWeb.Backoffice.RateLimiterLive.ips_in_jail()
+
+    send(view.pid, :update_data)
+
+    refute render(view) =~ ip
+  end
 end

From 33aa142fa6b65cd2694ba4d3d15e8d4d46553fc5 Mon Sep 17 00:00:00 2001
From: Antoine Augusti <antoine.augusti@transport.data.gouv.fr>
Date: Mon, 18 Dec 2023 13:10:14 +0100
Subject: [PATCH 07/25] Import des stats mensuelles data.gouv.fr pour les JDDs
 (#3663)

* Add migration and model

* Improve migration

* Work on ImportDatasetMonthlyMetricsJob

* Require Logger

* Add perform

* Schedule in crontab

* sort

* PR comments
---
 .../lib/db/dataset_monthly_metric.ex          |  28 +++
 .../import_dataset_monthly_metrics_job.ex     |  87 +++++++++
 ...20231214145408_dataset_monthly_metrics.exs |  17 ++
 .../test/db/dataset_monthly_metric_test.exs   |  42 ++++
 apps/transport/test/support/factory.ex        |   4 +
 ...mport_dataset_monthly_metrics_job_test.exs | 180 ++++++++++++++++++
 config/runtime.exs                            |   3 +-
 7 files changed, 360 insertions(+), 1 deletion(-)
 create mode 100644 apps/transport/lib/db/dataset_monthly_metric.ex
 create mode 100644 apps/transport/lib/jobs/import_dataset_monthly_metrics_job.ex
 create mode 100644 apps/transport/priv/repo/migrations/20231214145408_dataset_monthly_metrics.exs
 create mode 100644 apps/transport/test/db/dataset_monthly_metric_test.exs
 create mode 100644 apps/transport/test/transport/jobs/import_dataset_monthly_metrics_job_test.exs

diff --git a/apps/transport/lib/db/dataset_monthly_metric.ex b/apps/transport/lib/db/dataset_monthly_metric.ex
new file mode 100644
index 0000000000..e89dae393f
--- /dev/null
+++ b/apps/transport/lib/db/dataset_monthly_metric.ex
@@ -0,0 +1,28 @@
+defmodule DB.DatasetMonthlyMetric do
+  @moduledoc """
+  Monthly metrics related to datasets as given by the data.gouv.fr
+  API.
+  Example: https://metric-api.data.gouv.fr/api/datasets/data/?metric_month__sort=asc&dataset_id__exact=5b3cc551c751df4822526c1c
+  """
+  use Ecto.Schema
+  use TypedEctoSchema
+  import Ecto.Changeset
+
+  typed_schema "dataset_monthly_metrics" do
+    # Foreign key constraint is not enforced on the dataset table
+    # See: https://github.com/etalab/transport-site/pull/3663/files#r1429890393
+    belongs_to(:dataset, DB.Dataset, foreign_key: :dataset_datagouv_id, references: :datagouv_id, type: :string)
+    field(:year_month, :string)
+    field(:metric_name, Ecto.Enum, values: [:views, :downloads])
+    field(:count, :integer)
+    timestamps(type: :utc_datetime_usec)
+  end
+
+  def changeset(struct, attrs \\ %{}) do
+    struct
+    |> cast(attrs, [:dataset_datagouv_id, :year_month, :metric_name, :count])
+    |> validate_required([:dataset_datagouv_id, :year_month, :metric_name, :count])
+    |> validate_format(:year_month, ~r/\A2\d{3}-(0[1-9]|1[012])\z/)
+    |> validate_number(:count, greater_than_or_equal_to: 0)
+  end
+end
diff --git a/apps/transport/lib/jobs/import_dataset_monthly_metrics_job.ex b/apps/transport/lib/jobs/import_dataset_monthly_metrics_job.ex
new file mode 100644
index 0000000000..73dc1c4a8e
--- /dev/null
+++ b/apps/transport/lib/jobs/import_dataset_monthly_metrics_job.ex
@@ -0,0 +1,87 @@
+defmodule Transport.Jobs.ImportDatasetMonthlyMetricsJob do
+  @moduledoc """
+  Import monthly metrics related to datasets coming from the data.gouv.fr's API.
+
+  This job is executed daily and imports metrics for all datasets for the last 2 years.
+  Records are not supposed to change in the past, except for the current month.
+  """
+  use Oban.Worker, max_attempts: 3
+  import Ecto.Query
+  require Logger
+
+  # Number of months to fetch for each dataset
+  # 12*2 = 24 months
+  @nb_records 12 * 2
+  # The number of workers to run in parallel when importing metrics
+  @task_concurrency 5
+  @api_base_url URI.new!("https://metric-api.data.gouv.fr/api/datasets/data/")
+
+  @impl Oban.Worker
+  def perform(%Oban.Job{}) do
+    dataset_datagouv_ids()
+    |> Task.async_stream(
+      &import_metrics/1,
+      max_concurrency: @task_concurrency,
+      on_timeout: :kill_task,
+      timeout: 10_000
+    )
+    |> Stream.run()
+  end
+
+  def dataset_datagouv_ids do
+    DB.Dataset.base_query() |> select([dataset: d], d.datagouv_id) |> DB.Repo.all()
+  end
+
+  def import_metrics(dataset_datagouv_id) do
+    url = api_url(dataset_datagouv_id)
+
+    case http_client().get(url, []) do
+      {:ok, %Req.Response{status: 200, body: body}} ->
+        body
+        |> Map.fetch!("data")
+        |> Enum.each(fn data -> insert_or_update(data, dataset_datagouv_id) end)
+
+      other ->
+        Logger.error(
+          "metric-api.data.gouv.fr unexpected HTTP response for Dataset##{dataset_datagouv_id}: #{inspect(other)}"
+        )
+    end
+  end
+
+  @doc """
+  iex> api_url("datagouv_id")
+  "https://metric-api.data.gouv.fr/api/datasets/data/?dataset_id__exact=datagouv_id&page_size=24&metric_month__sort=desc"
+  """
+  def api_url(dataset_datagouv_id) do
+    @api_base_url
+    |> URI.append_query(
+      URI.encode_query(dataset_id__exact: dataset_datagouv_id, page_size: @nb_records, metric_month__sort: "desc")
+    )
+    |> URI.to_string()
+  end
+
+  defp insert_or_update(
+         %{
+           "metric_month" => metric_month,
+           "monthly_visit" => monthly_visit,
+           "monthly_download_resource" => monthly_download_resource
+         },
+         dataset_datagouv_id
+       ) do
+    Enum.each([{:views, monthly_visit}, {:downloads, monthly_download_resource}], fn {metric_name, count} ->
+      %DB.DatasetMonthlyMetric{}
+      |> DB.DatasetMonthlyMetric.changeset(%{
+        dataset_datagouv_id: dataset_datagouv_id,
+        year_month: metric_month,
+        metric_name: metric_name,
+        count: count || 0
+      })
+      |> DB.Repo.insert!(
+        conflict_target: [:dataset_datagouv_id, :year_month, :metric_name],
+        on_conflict: {:replace, [:count]}
+      )
+    end)
+  end
+
+  defp http_client, do: Transport.Req.impl()
+end
diff --git a/apps/transport/priv/repo/migrations/20231214145408_dataset_monthly_metrics.exs b/apps/transport/priv/repo/migrations/20231214145408_dataset_monthly_metrics.exs
new file mode 100644
index 0000000000..95d6185f7c
--- /dev/null
+++ b/apps/transport/priv/repo/migrations/20231214145408_dataset_monthly_metrics.exs
@@ -0,0 +1,17 @@
+defmodule DB.Repo.Migrations.DatasetMonthlyMetrics do
+  use Ecto.Migration
+
+  def change do
+    create table(:dataset_monthly_metrics) do
+      # Not adding a foreign key: https://github.com/etalab/transport-site/pull/3663/files#r1429890393
+      add(:dataset_datagouv_id, :string, null: false, size: 50)
+      # Example: 2023-12
+      add(:year_month, :string, null: false, size: 7)
+      add(:metric_name, :string, null: false, size: 50)
+      add(:count, :integer, null: false)
+      timestamps(type: :utc_datetime_usec)
+    end
+
+    create(unique_index(:dataset_monthly_metrics, [:dataset_datagouv_id, :year_month, :metric_name]))
+  end
+end
diff --git a/apps/transport/test/db/dataset_monthly_metric_test.exs b/apps/transport/test/db/dataset_monthly_metric_test.exs
new file mode 100644
index 0000000000..e7b0abd3e0
--- /dev/null
+++ b/apps/transport/test/db/dataset_monthly_metric_test.exs
@@ -0,0 +1,42 @@
+defmodule DB.DatasetMonthlyMetricTest do
+  use ExUnit.Case, async: true
+  import DB.Factory
+
+  setup do
+    Ecto.Adapters.SQL.Sandbox.checkout(DB.Repo)
+  end
+
+  describe "changeset" do
+    test "can insert a record" do
+      dataset = insert(:dataset)
+
+      assert %Ecto.Changeset{valid?: true} =
+               changeset =
+               DB.DatasetMonthlyMetric.changeset(%DB.DatasetMonthlyMetric{}, %{
+                 dataset_datagouv_id: dataset.datagouv_id,
+                 metric_name: :views,
+                 count: 42,
+                 year_month: "2023-12"
+               })
+
+      DB.Repo.insert!(changeset)
+    end
+
+    test "identifies errors" do
+      assert %Ecto.Changeset{
+               valid?: false,
+               errors: [
+                 {:count, _},
+                 {:year_month, _},
+                 {:metric_name, _}
+               ]
+             } =
+               DB.DatasetMonthlyMetric.changeset(%DB.DatasetMonthlyMetric{}, %{
+                 dataset_datagouv_id: Ecto.UUID.generate(),
+                 metric_name: :foo,
+                 count: -1,
+                 year_month: "bar"
+               })
+    end
+  end
+end
diff --git a/apps/transport/test/support/factory.ex b/apps/transport/test/support/factory.ex
index cdf90b6fe0..2d81d9c016 100644
--- a/apps/transport/test/support/factory.ex
+++ b/apps/transport/test/support/factory.ex
@@ -63,6 +63,10 @@ defmodule DB.Factory do
     }
   end
 
+  def dataset_monthly_metric_factory do
+    %DB.DatasetMonthlyMetric{}
+  end
+
   def resource_factory do
     %DB.Resource{
       last_import: DateTime.utc_now(),
diff --git a/apps/transport/test/transport/jobs/import_dataset_monthly_metrics_job_test.exs b/apps/transport/test/transport/jobs/import_dataset_monthly_metrics_job_test.exs
new file mode 100644
index 0000000000..56db668120
--- /dev/null
+++ b/apps/transport/test/transport/jobs/import_dataset_monthly_metrics_job_test.exs
@@ -0,0 +1,180 @@
+defmodule Transport.Test.Transport.Jobs.ImportDatasetMonthlyMetricsTestJob do
+  use ExUnit.Case, async: true
+  import DB.Factory
+  import Mox
+  use Oban.Testing, repo: DB.Repo
+  alias Transport.Jobs.ImportDatasetMonthlyMetricsJob
+
+  doctest ImportDatasetMonthlyMetricsJob, import: true
+
+  setup :verify_on_exit!
+
+  setup do
+    Ecto.Adapters.SQL.Sandbox.checkout(DB.Repo)
+  end
+
+  describe "import_metrics" do
+    test "base case" do
+      %DB.Dataset{datagouv_id: datagouv_id} = insert(:dataset)
+
+      setup_http_response(datagouv_id, [
+        %{
+          "dataset_id" => datagouv_id,
+          "metric_month" => "2022-08",
+          "monthly_visit" => 2633,
+          "monthly_download_resource" => 557_626
+        },
+        %{
+          "dataset_id" => datagouv_id,
+          "metric_month" => "2022-07",
+          "monthly_visit" => 1475,
+          "monthly_download_resource" => 343_617
+        }
+      ])
+
+      assert DB.DatasetMonthlyMetric |> DB.Repo.all() |> Enum.empty?()
+
+      ImportDatasetMonthlyMetricsJob.import_metrics(datagouv_id)
+
+      assert [
+               %DB.DatasetMonthlyMetric{
+                 dataset_datagouv_id: ^datagouv_id,
+                 year_month: "2022-08",
+                 metric_name: :views,
+                 count: 2633
+               },
+               %DB.DatasetMonthlyMetric{
+                 dataset_datagouv_id: ^datagouv_id,
+                 year_month: "2022-08",
+                 metric_name: :downloads,
+                 count: 557_626
+               },
+               %DB.DatasetMonthlyMetric{
+                 dataset_datagouv_id: ^datagouv_id,
+                 year_month: "2022-07",
+                 metric_name: :views,
+                 count: 1475
+               },
+               %DB.DatasetMonthlyMetric{
+                 dataset_datagouv_id: ^datagouv_id,
+                 year_month: "2022-07",
+                 metric_name: :downloads,
+                 count: 343_617
+               }
+             ] = DB.Repo.all(DB.DatasetMonthlyMetric)
+    end
+
+    test "replaces existing records" do
+      %DB.Dataset{datagouv_id: datagouv_id} = insert(:dataset)
+
+      insert(:dataset_monthly_metric,
+        dataset_datagouv_id: datagouv_id,
+        year_month: "2023-12",
+        metric_name: :views,
+        count: 42
+      )
+
+      setup_http_response(datagouv_id, [
+        %{
+          "dataset_id" => datagouv_id,
+          "metric_month" => "2023-12",
+          "monthly_visit" => 1337,
+          "monthly_download_resource" => 43
+        }
+      ])
+
+      assert [
+               %DB.DatasetMonthlyMetric{
+                 id: metric_id,
+                 dataset_datagouv_id: ^datagouv_id,
+                 year_month: "2023-12",
+                 metric_name: :views,
+                 count: 42
+               }
+             ] = DB.Repo.all(DB.DatasetMonthlyMetric)
+
+      ImportDatasetMonthlyMetricsJob.import_metrics(datagouv_id)
+
+      assert [
+               # Count has been updated, primary key is still the same
+               %DB.DatasetMonthlyMetric{
+                 id: ^metric_id,
+                 dataset_datagouv_id: ^datagouv_id,
+                 year_month: "2023-12",
+                 metric_name: :views,
+                 count: 1337
+               },
+               # Has been inserted
+               %DB.DatasetMonthlyMetric{
+                 dataset_datagouv_id: ^datagouv_id,
+                 year_month: "2023-12",
+                 metric_name: :downloads,
+                 count: 43
+               }
+             ] = DB.Repo.all(DB.DatasetMonthlyMetric)
+    end
+  end
+
+  test "perform" do
+    %DB.Dataset{datagouv_id: d1_datagouv_id} = insert(:dataset)
+    %DB.Dataset{datagouv_id: d2_datagouv_id} = insert(:dataset)
+    insert(:dataset, is_active: false)
+
+    assert [d1_datagouv_id, d2_datagouv_id] == ImportDatasetMonthlyMetricsJob.dataset_datagouv_ids()
+
+    setup_http_response(d1_datagouv_id, [
+      %{
+        "dataset_id" => d1_datagouv_id,
+        "metric_month" => "2023-12",
+        "monthly_visit" => 1337,
+        "monthly_download_resource" => 43
+      }
+    ])
+
+    setup_http_response(d2_datagouv_id, [
+      %{
+        "dataset_id" => d2_datagouv_id,
+        "metric_month" => "2023-12",
+        "monthly_visit" => nil,
+        "monthly_download_resource" => 5
+      }
+    ])
+
+    assert :ok == perform_job(ImportDatasetMonthlyMetricsJob, %{})
+
+    assert [
+             %DB.DatasetMonthlyMetric{
+               dataset_datagouv_id: ^d1_datagouv_id,
+               year_month: "2023-12",
+               metric_name: :downloads,
+               count: 43
+             },
+             %DB.DatasetMonthlyMetric{
+               dataset_datagouv_id: ^d1_datagouv_id,
+               year_month: "2023-12",
+               metric_name: :views,
+               count: 1337
+             },
+             %DB.DatasetMonthlyMetric{
+               dataset_datagouv_id: ^d2_datagouv_id,
+               year_month: "2023-12",
+               metric_name: :downloads,
+               count: 5
+             },
+             %DB.DatasetMonthlyMetric{
+               dataset_datagouv_id: ^d2_datagouv_id,
+               year_month: "2023-12",
+               metric_name: :views,
+               count: 0
+             }
+           ] = DB.DatasetMonthlyMetric |> DB.Repo.all() |> Enum.sort_by(&{&1.dataset_datagouv_id, &1.metric_name})
+  end
+
+  defp setup_http_response(datagouv_id, data) do
+    metrics_api_url = ImportDatasetMonthlyMetricsJob.api_url(datagouv_id)
+
+    expect(Transport.Req.Mock, :get, fn ^metrics_api_url, [] ->
+      {:ok, %Req.Response{status: 200, body: %{"data" => data}}}
+    end)
+  end
+end
diff --git a/config/runtime.exs b/config/runtime.exs
index c976d3751d..cfc9e6d020 100644
--- a/config/runtime.exs
+++ b/config/runtime.exs
@@ -137,7 +137,8 @@ oban_prod_crontab = [
   {"10 5 * * *", Transport.Jobs.NotificationSubscriptionProducerJob},
   # "At 08:15 on Monday in March, June, and November.""
   # The job will make sure that it's executed only on the first Monday of these months
-  {"15 8 * 3,6,11 1", Transport.Jobs.PeriodicReminderProducersNotificationJob}
+  {"15 8 * 3,6,11 1", Transport.Jobs.PeriodicReminderProducersNotificationJob},
+  {"30 5 * * *", Transport.Jobs.ImportDatasetMonthlyMetricsJob}
 ]
 
 # Make sure that all modules exist

From a86ebb2f711cc85bfb0a50cdb8405c9c7d14bda8 Mon Sep 17 00:00:00 2001
From: Vincent Degove <vincent.degove@beta.gouv.fr>
Date: Mon, 18 Dec 2023 16:42:45 +0100
Subject: [PATCH 08/25] =?UTF-8?q?Am=C3=A9lioration=20du=20readme=20(#3665)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* improve readme

* Reorganize readme

* Apply suggestions from code review

Co-authored-by: Antoine Augusti <antoine.augusti@transport.data.gouv.fr>

---------

Co-authored-by: Antoine Augusti <antoine.augusti@transport.data.gouv.fr>
---
 README.md | 77 +++++++++++++++++++++++++++++++++----------------------
 1 file changed, 47 insertions(+), 30 deletions(-)

diff --git a/README.md b/README.md
index a551add298..d407f5db7c 100644
--- a/README.md
+++ b/README.md
@@ -20,10 +20,11 @@ You can install this 2 different ways:
 
 ## Manual installation <a name="manual_install"></a>
 
-  * Make sure you have **Elixir**, **Node**, **Yarn** and **Docker** installed and up-to-date
-    * **Elixir** is often installed with [asdf](https://asdf-vm.com/) since it makes it easy to handle different **Elixir** versions accross projects. The project needs at least **Elixir** 1.8 and **Erlang** 21.0
-  * Install Elixir dependencies with `mix deps.get`
-  * Install Node.js dependencies with `mix yarn install`
+### 1. Install Elixir, Node and Yarn
+
+Make sure you have **Elixir**, **Node.js** and **Yarn** installed and up-to-date. **Docker** is optionnally needed if you want to run on your machine the [extra transport tools](https://github.com/etalab/transport-tools).
+
+**Elixir** is often installed with [asdf](https://asdf-vm.com/) since it makes it easy to handle different **Elixir** versions accross projects.
 
 If you wish to use `asdf` (recommended), make sure to install the correct plugins:
 
@@ -31,40 +32,52 @@ If you wish to use `asdf` (recommended), make sure to install the correct plugin
 * `asdf plugin-add elixir` (https://github.com/asdf-vm/asdf-elixir)
 * `asdf plugin-add nodejs` (https://github.com/asdf-vm/asdf-nodejs)
 
-Installation can then be done with:
+Installation for Erlang, Elixir and Node.js can then be done with:
 * `asdf install`
 
-### Postgresql
+For Yarn, bring your version or also use asdf:
+* `asdf plugin-add yarn` (https://github.com/twuni/asdf-yarn)
+* `asdf install yarn 1.22.19` (or any other version)
+* `asdf global yarn 1.22.19`
 
-You also need an up to date postgresql with postgis installed. Version 14+ is recommended.
+### 2. Install PostgreSQL
+
+You also need an up-to-date PostgreSQL with Postgis installed. Version 14+ is recommended.
 
 For Mac users, you can use https://postgresapp.com/.
 
-#### Dependencies
+### 3. Build project
+
+  * Install Elixir dependencies with `mix deps.get`
+  * Install Node.js dependencies with `mix yarn install`
+
+## Docker installation
 
-Download depencies using `mix deps.get`.
+Alternatively, you can use Docker, see the [Docker section](#docker-installation-).
 
-Reply "Yes" to the question "Shall I install Hex? (if running non-interactively, use "mix local.hex --force")".
+## Prepare the PostgreSQL database
 
-#### Creating a database
+### Creating a database
+
+Make sure you have a postgres user with postgres password, and that the identification methode is set to md5 in your `pg_hba.conf` file.
 
 Create the database with the command `mix ecto.create`.
 
 Alternatively, you can create it manually. With the permission to create a database (on Debian based system, you need to be logged as `postgres`), type
 `createdb transport_repo`.
 
-#### Applying the migrations
+### Applying the migrations
 
 To have an up to date database schema run `mix ecto.migrate`.
 
-#### Restoring the production database
+### Restoring the production database
 
 The production database does not contains any sensitive data, you can retreive it for dev purpose.
 * You can retrieve the [latest clever-cloud backup](https://console.clever-cloud.com/organisations/orga_f33ebcbc-4403-4e4c-82f5-12305e0ecb1b/addons/addon_beebaa5e-c3a4-4c57-b124-cf9d1473450a) (you need some permissions to access it, if you don't have them, you can ask someone on the team to give you the database)
 * On the clever-cloud website, under transport-site-postgresql, there is a Backups section with download links.
 * restore the downloaded backup on you database: `./restore_db.sh <path_to_the_backup>`
 
-#### Binary CLI dependencies
+## Binary CLI dependencies (optional)
 
 The app uses a number of tools via [transport-tools](https://github.com/etalab/transport-tools).
 
@@ -86,7 +99,7 @@ For Rust binaries, you will have to compile them locally and copy them to the sa
 
 Once this is done, make sure to configure your configuration via `:transport_tools_folder`.
 
-## Usage
+# Usage
 
 Run the server with `mix phx.server` and you can visit [`127.0.0.1:5000`](http://127.0.0.1:5000) on your browser.
 
@@ -134,11 +147,11 @@ config :oauth2, Datagouvfr.Authentication,
   redirect_uri: "http://localhost:5000/login/callback"
 ```
 
-## Development
+# Development
 
-### Testing
+## Testing
 
-#### Running the tests
+### Running the tests
 
 Run the tests with `mix test`
 
@@ -159,7 +172,7 @@ mix cmd --app transport mix test --color test/transport_web/integrations/backoff
 
 The filenames must be relative to the app folder. This [will be improved](https://dockyard.com/blog/2019/06/17/testing-in-umbrella-apps-improves-in-elixir-1-9) when we upgrade to a more modern Elixir version.
 
-#### Measuring test coverage
+### Measuring test coverage
 
 We use [excoveralls](https://github.com/parroty/excoveralls) to measure which parts of the code are covered by testing (or not). This is useful to determine where we can improve the testing quality.
 
@@ -179,22 +192,22 @@ The coverage is written on screen by default, or in the `cover` subfolders for H
 
 Running in `--umbrella` mode will generate coverage report at the top-level `cover` folder, while running without it will generate reports under each umbrella sub-app (e.g. `apps/transport/cover`).
 
-### Linting
+## Linting
 
   * Run the elixir linter with `mix credo --strict`
   * Run the javascript linter with `mix npm "run linter:ecma"`
   * Run the sass linter with `mix npm "run linter:sass"`
 
-### Misc Elixir command
+## Misc Elixir command
 
-#### Translations
+### Translations
 
 To extract all translations from the source, you can run `mix gettext.extract --merge` (and then edit the modified .po files).
 
-#### Check all
+### Check all
 To perform all the checks done on the CI with a single command, you can run `mix check_all`. It will run the different linters, credo, check the translations are up-to-date, and launch the tests.
 
-#### DB migrations
+### DB migrations
 
 To generate a new migration file:
 `cd apps/transport && mix ecto.gen.migration <name of the migration> && cd ../..`
@@ -204,7 +217,7 @@ The generated [ecto](https://hexdocs.pm/ecto/Ecto.html) migration file will be `
 To apply all migrations on you database:
 `mix ecto.migrate`
 
-#### One shot tasks
+### One shot tasks
 
 Some custom one shot tasks are available.
 
@@ -214,13 +227,17 @@ To run a custom task: `mix <custom task>`
 * `Transport.ImportEPCI`: import the french EPCI from data.gouv
 * `Transport.OpenApiSpec`: generate an OpenAPI specification file
 
-### Testing emails
+## Testing emails
 
 To locally test emails in a dev environment, a Swoosh preview inbox available in your browser at `/dev/mailbox`. Your server needs to be run through iex : `iex -S mix phx.server`.
 
-## Docker installation <a name="docker_install"></a>
+## Learn more and debug
 
-### Development
+See the [learning track document](learning_track.md).
+
+# Docker installation <a name="docker_install"></a>
+
+## Development
 
 If you don't plan to work a lot on this project, the docker installation is way easier.
 
@@ -242,14 +259,14 @@ For the tests you also need to add an environment variable:
 
 `docker-compose run -e web mix test`
 
-### Production
+## Production
 
   The Dockerfile needed to run the continuous integration is in the project:
   https://github.com/etalab/transport-ops
 
   Update it if needed (e.g. updating Elixir’s version) and then update `.circleci/config.yml`.
 
-### Domain names
+# Domain names
 
 The following domain names are currently in use by the deployed Elixir app:
 

From fbe677b5461ed0312c3579e36af726a3bdf41261 Mon Sep 17 00:00:00 2001
From: Antoine Augusti <antoine.augusti@transport.data.gouv.fr>
Date: Mon, 18 Dec 2023 18:14:05 +0100
Subject: [PATCH 09/25] S3 : migration vers de l'upload en streaming (#3666)

* S3 : migration vers de l'upload en streaming

* Fix tests
---
 apps/transport/lib/S3/s3.ex                   | 11 ---
 .../lib/jobs/consolidate_bnlc_job.ex          |  3 +-
 .../conversions/gtfs_generic_converter.ex     |  3 +-
 apps/transport/lib/jobs/gtfs_diff_job.ex      | 23 ++---
 apps/transport/lib/transport/gtfs_diff.ex     | 10 +--
 .../controllers/validation_controller.ex      |  6 +-
 .../live/gtfs_diff_select_live.ex             |  6 +-
 .../lib/validators/gtfs_rt_validator.ex       | 25 +++---
 apps/transport/test/support/s3_test_utils.ex  | 15 ++--
 .../jobs/consolidate_bnlc_job_test.exs        | 23 +++--
 ...gle_gtfs_to_geojson_converter_job_test.exs |  5 +-
 ...ingle_gtfs_to_netex_converter_job_test.exs |  5 +-
 .../validators/gtfs_rt_validator_test.exs     | 86 ++++++++++++-------
 .../validation_controller_test.exs            |  4 +-
 scripts/download_resource_history_files.exs   |  9 +-
 15 files changed, 126 insertions(+), 108 deletions(-)

diff --git a/apps/transport/lib/S3/s3.ex b/apps/transport/lib/S3/s3.ex
index 4d156eb385..a1c8e9d504 100644
--- a/apps/transport/lib/S3/s3.ex
+++ b/apps/transport/lib/S3/s3.ex
@@ -48,15 +48,4 @@ defmodule Transport.S3 do
     |> ExAws.S3.upload(Transport.S3.bucket_name(feature), upload_path, options)
     |> Transport.Wrapper.ExAWS.impl().request!()
   end
-
-  @spec upload_to_s3!(bucket_feature(), binary(), binary(), acl: atom()) :: any()
-  def upload_to_s3!(feature, body, path, options \\ []) do
-    Logger.debug("Uploading file to #{path}")
-    options = Keyword.validate!(options, acl: :private)
-
-    feature
-    |> Transport.S3.bucket_name()
-    |> ExAws.S3.put_object(path, body, options)
-    |> Transport.Wrapper.ExAWS.impl().request!()
-  end
 end
diff --git a/apps/transport/lib/jobs/consolidate_bnlc_job.ex b/apps/transport/lib/jobs/consolidate_bnlc_job.ex
index e04aa5bb7c..9e0cec5a32 100644
--- a/apps/transport/lib/jobs/consolidate_bnlc_job.ex
+++ b/apps/transport/lib/jobs/consolidate_bnlc_job.ex
@@ -132,10 +132,9 @@ defmodule Transport.Jobs.ConsolidateBNLCJob do
   end
 
   defp upload_temporary_file do
-    content = File.read!(@bnlc_path)
     now = DateTime.utc_now() |> DateTime.truncate(:microsecond) |> DateTime.to_string() |> String.replace(" ", "_")
     filename = "bnlc-#{now}.csv"
-    Transport.S3.upload_to_s3!(@s3_bucket, content, filename, acl: :public_read)
+    Transport.S3.stream_to_s3!(@s3_bucket, @bnlc_path, filename, acl: :public_read)
     filename
   end
 
diff --git a/apps/transport/lib/jobs/conversions/gtfs_generic_converter.ex b/apps/transport/lib/jobs/conversions/gtfs_generic_converter.ex
index e925dfe3bb..cfcb5d0870 100644
--- a/apps/transport/lib/jobs/conversions/gtfs_generic_converter.ex
+++ b/apps/transport/lib/jobs/conversions/gtfs_generic_converter.ex
@@ -140,13 +140,12 @@ defmodule Transport.Jobs.GTFSGenericConverter do
               conversion_output_path
             end
 
-          file = File.read!(path)
           %File.Stat{size: filesize} = File.stat!(path)
 
           conversion_file_name =
             resource_filename |> conversion_file_name(format_lower) |> add_zip_extension(zip_conversion?)
 
-          Transport.S3.upload_to_s3!(:history, file, conversion_file_name, acl: :public_read)
+          Transport.S3.stream_to_s3!(:history, path, conversion_file_name, acl: :public_read)
 
           %DataConversion{
             convert_from: :GTFS,
diff --git a/apps/transport/lib/jobs/gtfs_diff_job.ex b/apps/transport/lib/jobs/gtfs_diff_job.ex
index 3fef89b370..a30f7bf489 100644
--- a/apps/transport/lib/jobs/gtfs_diff_job.ex
+++ b/apps/transport/lib/jobs/gtfs_diff_job.ex
@@ -29,18 +29,19 @@ defmodule Transport.Jobs.GTFSDiff do
     diff = Transport.GTFSDiff.diff(unzip_1, unzip_2, notify)
 
     diff_file_name = "gtfs-diff-#{DateTime.utc_now() |> DateTime.to_unix()}.csv"
+    filepath = System.tmp_dir!() |> Path.join(diff_file_name)
 
-    Transport.S3.upload_to_s3!(
-      :gtfs_diff,
-      diff |> Transport.GTFSDiff.dump_diff(),
-      diff_file_name,
-      acl: :public_read
-    )
-
-    Oban.Notifier.notify(Oban, :gossip, %{
-      complete: job.id,
-      diff_file_url: Transport.S3.permanent_url(:gtfs_diff, diff_file_name)
-    })
+    try do
+      Transport.GTFSDiff.dump_diff(diff, filepath)
+      Transport.S3.stream_to_s3!(:gtfs_diff, filepath, diff_file_name, acl: :public_read)
+
+      Oban.Notifier.notify(Oban, :gossip, %{
+        complete: job.id,
+        diff_file_url: Transport.S3.permanent_url(:gtfs_diff, diff_file_name)
+      })
+    after
+      File.rm(filepath)
+    end
 
     Transport.S3.delete_object!(:gtfs_diff, gtfs_file_name_1)
     Transport.S3.delete_object!(:gtfs_diff, gtfs_file_name_2)
diff --git a/apps/transport/lib/transport/gtfs_diff.ex b/apps/transport/lib/transport/gtfs_diff.ex
index f18447d196..4f4f4b6e8c 100644
--- a/apps/transport/lib/transport/gtfs_diff.ex
+++ b/apps/transport/lib/transport/gtfs_diff.ex
@@ -307,7 +307,7 @@ defmodule Transport.GTFSDiff do
     diff |> Enum.zip_with(id_range, &Map.merge(&1, %{id: &2}))
   end
 
-  def dump_diff(diff) do
+  def dump_diff(diff, filepath) do
     headers = ["id", "file", "action", "target", "identifier", "initial_value", "new_value", "note"]
 
     body =
@@ -331,11 +331,9 @@ defmodule Transport.GTFSDiff do
         ]
       end)
 
-    res = [headers | body]
-
-    res
-    |> CSV.dump_to_iodata()
-    |> IO.iodata_to_binary()
+    [headers | body]
+    |> CSV.dump_to_stream()
+    |> Stream.into(File.stream!(filepath))
   end
 
   def apply_delete(file, diff, primary_key) do
diff --git a/apps/transport/lib/transport_web/controllers/validation_controller.ex b/apps/transport/lib/transport_web/controllers/validation_controller.ex
index 6f2b3534bd..7b4c5f286c 100644
--- a/apps/transport/lib/transport_web/controllers/validation_controller.ex
+++ b/apps/transport/lib/transport_web/controllers/validation_controller.ex
@@ -56,7 +56,7 @@ defmodule TransportWeb.ValidationController do
       }) do
     if is_valid_type?(type) do
       oban_args = build_oban_args(type)
-      upload_to_s3(file_path, Map.fetch!(oban_args, "filename"))
+      stream_to_s3(file_path, Map.fetch!(oban_args, "filename"))
 
       validation =
         %MultiValidation{
@@ -193,8 +193,8 @@ defmodule TransportWeb.ValidationController do
 
   def is_valid_type?(type), do: type in (select_options() |> Enum.map(&elem(&1, 1)))
 
-  defp upload_to_s3(file_path, path) do
-    Transport.S3.upload_to_s3!(:on_demand_validation, File.read!(file_path), path, acl: :public_read)
+  defp stream_to_s3(local_filepath, path) do
+    Transport.S3.stream_to_s3!(:on_demand_validation, local_filepath, path, acl: :public_read)
   end
 
   defp build_oban_args(%{"url" => url, "feed_url" => feed_url, "type" => "gtfs-rt"}) do
diff --git a/apps/transport/lib/transport_web/live/gtfs_diff_select_live.ex b/apps/transport/lib/transport_web/live/gtfs_diff_select_live.ex
index 8cec1a8db1..578901b6ea 100644
--- a/apps/transport/lib/transport_web/live/gtfs_diff_select_live.ex
+++ b/apps/transport/lib/transport_web/live/gtfs_diff_select_live.ex
@@ -49,7 +49,7 @@ defmodule TransportWeb.Live.GTFSDiffSelectLive do
     [gtfs_file_name_2, gtfs_file_name_1] =
       consume_uploaded_entries(socket, :gtfs, fn %{path: path}, _entry ->
         file_name = Path.basename(path)
-        upload_to_s3(path, file_name)
+        stream_to_s3(path, file_name)
         {:ok, file_name}
       end)
 
@@ -138,8 +138,8 @@ defmodule TransportWeb.Live.GTFSDiffSelectLive do
     {:noreply, socket}
   end
 
-  defp upload_to_s3(file_path, path) do
-    Transport.S3.upload_to_s3!(:gtfs_diff, File.read!(file_path), path, acl: :public_read)
+  defp stream_to_s3(file_path, path) do
+    Transport.S3.stream_to_s3!(:gtfs_diff, file_path, path, acl: :public_read)
   end
 
   def uploads_are_valid(%{gtfs: %{entries: gtfs}}) do
diff --git a/apps/transport/lib/validators/gtfs_rt_validator.ex b/apps/transport/lib/validators/gtfs_rt_validator.ex
index 2bddea4c14..fa19e6158b 100644
--- a/apps/transport/lib/validators/gtfs_rt_validator.ex
+++ b/apps/transport/lib/validators/gtfs_rt_validator.ex
@@ -313,24 +313,26 @@ defmodule Transport.Validators.GTFSRT do
   end
 
   defp download_latest_gtfs(%ResourceHistory{payload: %{"permanent_url" => url, "format" => "GTFS"}}, tmp_path) do
+    req_options = [compressed: false, decode_body: false, into: File.stream!(tmp_path)]
+
     unless File.exists?(tmp_path) do
-      %HTTPoison.Response{status_code: 200, body: body} = http_client().get!(url, [], follow_redirect: true)
-      File.write!(tmp_path, body)
+      {:ok, %Req.Response{status: 200}} = Transport.Req.impl().get(url, req_options)
     end
   end
 
   defp download_resource(%Resource{id: resource_id, url: url, is_available: true, format: "gtfs-rt"}, tmp_path) do
-    case http_client().get(url, [], follow_redirect: true) do
-      {:ok, %HTTPoison.Response{status_code: 200, body: body}} ->
+    req_options = [compressed: false, decode_body: false, into: File.stream!(tmp_path)]
+
+    case Transport.Req.impl().get(url, req_options) do
+      {:ok, %Req.Response{status: 200}} ->
         Logger.debug("Saving resource #{resource_id} to #{tmp_path}")
-        File.write!(tmp_path, body)
-        {:ok, tmp_path, body}
+        {:ok, tmp_path}
 
-      {:ok, %HTTPoison.Response{status_code: status}} ->
+      {:ok, %Req.Response{status: status}} ->
         {:error, "Got a non 200 status: #{status}"}
 
-      {:error, %HTTPoison.Error{reason: reason}} ->
-        {:error, "Got an error: #{reason}"}
+      error ->
+        {:error, "Got an error: #{inspect(error)}"}
     end
   end
 
@@ -339,9 +341,9 @@ defmodule Transport.Validators.GTFSRT do
     :error
   end
 
-  defp process_download({:ok, tmp_path, body}, %Resource{} = resource) do
+  defp process_download({:ok, tmp_path}, %Resource{} = resource) do
     cellar_filename = upload_filename(resource, DateTime.utc_now())
-    Transport.S3.upload_to_s3!(:history, body, cellar_filename, acl: :public_read)
+    Transport.S3.stream_to_s3!(:history, tmp_path, cellar_filename, acl: :public_read)
     {:ok, tmp_path, cellar_filename}
   end
 
@@ -357,6 +359,5 @@ defmodule Transport.Validators.GTFSRT do
     "#{download_path(resource)}.results.json"
   end
 
-  defp http_client, do: Transport.Shared.Wrapper.HTTPoison.impl()
   defp remove_file(path), do: File.rm(path)
 end
diff --git a/apps/transport/test/support/s3_test_utils.ex b/apps/transport/test/support/s3_test_utils.ex
index d1acc35f17..a295e1d749 100644
--- a/apps/transport/test/support/s3_test_utils.ex
+++ b/apps/transport/test/support/s3_test_utils.ex
@@ -19,17 +19,16 @@ defmodule Transport.Test.S3TestUtils do
     end)
   end
 
-  def s3_mocks_upload_file(assert_path) do
+  def s3_mock_stream_file(start_path: expected_start_path, bucket: expected_bucket) do
     Transport.ExAWS.Mock
-    |> expect(:request!, fn %{
-                              service: :s3,
-                              http_method: :put,
+    |> expect(:request!, fn %ExAws.S3.Upload{
+                              src: %File.Stream{},
+                              bucket: ^expected_bucket,
                               path: path,
-                              bucket: _bucket_name,
-                              body: _content,
-                              headers: %{"x-amz-acl" => "public-read"}
+                              opts: [acl: :public_read],
+                              service: :s3
                             } ->
-      assert(path |> String.starts_with?(assert_path))
+      assert String.starts_with?(path, expected_start_path)
     end)
   end
 
diff --git a/apps/transport/test/transport/jobs/consolidate_bnlc_job_test.exs b/apps/transport/test/transport/jobs/consolidate_bnlc_job_test.exs
index 3aead04cf6..f90c6f863a 100644
--- a/apps/transport/test/transport/jobs/consolidate_bnlc_job_test.exs
+++ b/apps/transport/test/transport/jobs/consolidate_bnlc_job_test.exs
@@ -558,7 +558,7 @@ defmodule Transport.Test.Transport.Jobs.ConsolidateBNLCJobTest do
         end
       )
 
-      expect_s3_upload()
+      expect_s3_stream_upload()
       expect_ok_email_sent()
 
       assert :ok == perform_job(ConsolidateBNLCJob, %{})
@@ -723,7 +723,7 @@ defmodule Transport.Test.Transport.Jobs.ConsolidateBNLCJobTest do
         end
       )
 
-      expect_s3_upload()
+      expect_s3_stream_upload()
 
       Transport.EmailSender.Mock
       |> expect(:send_mail, fn "transport.data.gouv.fr" = _display_name,
@@ -791,7 +791,7 @@ defmodule Transport.Test.Transport.Jobs.ConsolidateBNLCJobTest do
       end
     )
 
-    expect_s3_upload()
+    expect_s3_stream_upload()
     expect_ok_email_sent()
     expect_datagouv_upload_file_http_call()
 
@@ -827,16 +827,15 @@ defmodule Transport.Test.Transport.Jobs.ConsolidateBNLCJobTest do
     end
   end
 
-  defp expect_s3_upload do
+  defp expect_s3_stream_upload do
     Transport.ExAWS.Mock
-    |> expect(:request!, fn %ExAws.Operation.S3{} = operation ->
-      assert %ExAws.Operation.S3{
-               bucket: "transport-data-gouv-fr-on-demand-validation-test",
-               path: path,
-               http_method: :put,
-               service: :s3
-             } = operation
-
+    |> expect(:request!, fn %ExAws.S3.Upload{
+                              src: %File.Stream{},
+                              bucket: "transport-data-gouv-fr-on-demand-validation-test",
+                              path: path,
+                              opts: [acl: :public_read],
+                              service: :s3
+                            } ->
       assert path =~ ~r"^bnlc-.*\.csv$"
     end)
   end
diff --git a/apps/transport/test/transport/jobs/conversions/single_gtfs_to_geojson_converter_job_test.exs b/apps/transport/test/transport/jobs/conversions/single_gtfs_to_geojson_converter_job_test.exs
index 6a766dfd3d..662e269896 100644
--- a/apps/transport/test/transport/jobs/conversions/single_gtfs_to_geojson_converter_job_test.exs
+++ b/apps/transport/test/transport/jobs/conversions/single_gtfs_to_geojson_converter_job_test.exs
@@ -63,7 +63,10 @@ defmodule Transport.Jobs.SingleGTFSToGeoJSONConverterJobTest do
       {:ok, "this my geojson content"}
     end)
 
-    Transport.Test.S3TestUtils.s3_mocks_upload_file("conversions/gtfs-to-geojson/")
+    Transport.Test.S3TestUtils.s3_mock_stream_file(
+      start_path: "conversions/gtfs-to-geojson/",
+      bucket: "transport-data-gouv-fr-resource-history-test"
+    )
 
     # job succeed
     assert :ok ==
diff --git a/apps/transport/test/transport/jobs/conversions/single_gtfs_to_netex_converter_job_test.exs b/apps/transport/test/transport/jobs/conversions/single_gtfs_to_netex_converter_job_test.exs
index 14857893d6..8abd7f003d 100644
--- a/apps/transport/test/transport/jobs/conversions/single_gtfs_to_netex_converter_job_test.exs
+++ b/apps/transport/test/transport/jobs/conversions/single_gtfs_to_netex_converter_job_test.exs
@@ -69,7 +69,10 @@ defmodule Transport.Jobs.SingleGTFSToNeTExHoveConverterJobTest do
       {:ok, ""}
     end)
 
-    Transport.Test.S3TestUtils.s3_mocks_upload_file("conversions/gtfs-to-netex/")
+    Transport.Test.S3TestUtils.s3_mock_stream_file(
+      start_path: "conversions/gtfs-to-netex/",
+      bucket: "transport-data-gouv-fr-resource-history-test"
+    )
 
     # job succeed
     assert :ok ==
diff --git a/apps/transport/test/transport/validators/gtfs_rt_validator_test.exs b/apps/transport/test/transport/validators/gtfs_rt_validator_test.exs
index dadcd4e79a..4f0cf16d34 100644
--- a/apps/transport/test/transport/validators/gtfs_rt_validator_test.exs
+++ b/apps/transport/test/transport/validators/gtfs_rt_validator_test.exs
@@ -3,7 +3,6 @@ defmodule Transport.Validators.GTFSRTTest do
   use Oban.Testing, repo: DB.Repo
   import Ecto.Query
   import DB.Factory
-  alias Transport.Test.S3TestUtils
   alias Transport.Validators.GTFSRT
   import Mox
 
@@ -120,23 +119,28 @@ defmodule Transport.Validators.GTFSRTTest do
           url: gtfs_rt_no_errors_url
         )
 
-      Transport.HTTPoison.Mock
-      |> expect(:get!, fn ^gtfs_permanent_url, [], [follow_redirect: true] ->
-        %HTTPoison.Response{status_code: 200, body: "gtfs"}
+      Transport.Req.Mock
+      |> expect(:get, fn ^gtfs_rt_url, [compressed: false, decode_body: false, into: %File.Stream{path: stream_path}] ->
+        File.write!(stream_path, body = "gtfs-rt")
+        {:ok, %Req.Response{status: 200, body: body}}
       end)
 
-      Transport.HTTPoison.Mock
-      |> expect(:get, fn ^gtfs_rt_url, [], [follow_redirect: true] ->
-        {:ok, %HTTPoison.Response{status_code: 200, body: "gtfs-rt"}}
+      Transport.Req.Mock
+      |> expect(:get, fn ^gtfs_rt_no_errors_url,
+                         [compressed: false, decode_body: false, into: %File.Stream{path: stream_path}] ->
+        File.write!(stream_path, body = "gtfs-rt")
+        {:ok, %Req.Response{status: 200, body: body}}
       end)
 
-      Transport.HTTPoison.Mock
-      |> expect(:get, fn ^gtfs_rt_no_errors_url, [], [follow_redirect: true] ->
-        {:ok, %HTTPoison.Response{status_code: 200, body: "gtfs-rt"}}
+      Transport.Req.Mock
+      |> expect(:get, fn ^gtfs_permanent_url,
+                         [compressed: false, decode_body: false, into: %File.Stream{path: stream_path}] ->
+        File.write!(stream_path, "gtfs_content")
+        {:ok, %Req.Response{status: 200}}
       end)
 
-      S3TestUtils.s3_mocks_upload_file(gtfs_rt.id |> to_string())
-      S3TestUtils.s3_mocks_upload_file(gtfs_rt_no_errors.id |> to_string())
+      mock_s3_stream_upload(gtfs_rt)
+      mock_s3_stream_upload(gtfs_rt_no_errors)
 
       gtfs_path = GTFSRT.download_path(gtfs)
       gtfs_rt_path = GTFSRT.download_path(gtfs_rt)
@@ -287,17 +291,20 @@ defmodule Transport.Validators.GTFSRTTest do
           url: gtfs_rt_no_errors_url
         )
 
-      Transport.HTTPoison.Mock
-      |> expect(:get!, fn ^gtfs_permanent_url, [], [follow_redirect: true] ->
-        %HTTPoison.Response{status_code: 200, body: "gtfs"}
+      Transport.Req.Mock
+      |> expect(:get, fn ^gtfs_rt_url, [compressed: false, decode_body: false, into: %File.Stream{path: stream_path}] ->
+        File.write!(stream_path, body = "gtfs-rt")
+        {:ok, %Req.Response{status: 200, body: body}}
       end)
 
-      Transport.HTTPoison.Mock
-      |> expect(:get, fn ^gtfs_rt_url, [], [follow_redirect: true] ->
-        {:ok, %HTTPoison.Response{status_code: 200, body: "gtfs-rt"}}
+      Transport.Req.Mock
+      |> expect(:get, fn ^gtfs_permanent_url,
+                         [compressed: false, decode_body: false, into: %File.Stream{path: stream_path}] ->
+        File.write!(stream_path, "gtfs_content")
+        {:ok, %Req.Response{status: 200}}
       end)
 
-      S3TestUtils.s3_mocks_upload_file(gtfs_rt.id |> to_string())
+      mock_s3_stream_upload(gtfs_rt)
 
       gtfs_path = GTFSRT.download_path(gtfs)
       gtfs_rt_path = GTFSRT.download_path(gtfs_rt)
@@ -390,17 +397,20 @@ defmodule Transport.Validators.GTFSRTTest do
           url: gtfs_rt_url
         )
 
-      Transport.HTTPoison.Mock
-      |> expect(:get!, fn ^gtfs_permanent_url, [], [follow_redirect: true] ->
-        %HTTPoison.Response{status_code: 200, body: "gtfs"}
+      Transport.Req.Mock
+      |> expect(:get, fn ^gtfs_rt_url, [compressed: false, decode_body: false, into: %File.Stream{path: stream_path}] ->
+        File.write!(stream_path, body = "gtfs-rt")
+        {:ok, %Req.Response{status: 200, body: body}}
       end)
 
-      Transport.HTTPoison.Mock
-      |> expect(:get, fn ^gtfs_rt_url, [], [follow_redirect: true] ->
-        {:ok, %HTTPoison.Response{status_code: 200, body: "gtfs-rt"}}
+      Transport.Req.Mock
+      |> expect(:get, fn ^gtfs_permanent_url,
+                         [compressed: false, decode_body: false, into: %File.Stream{path: stream_path}] ->
+        File.write!(stream_path, "gtfs_content")
+        {:ok, %Req.Response{status: 200}}
       end)
 
-      S3TestUtils.s3_mocks_upload_file(gtfs_rt.id |> to_string())
+      mock_s3_stream_upload(gtfs_rt)
 
       gtfs_path = GTFSRT.download_path(gtfs)
       gtfs_rt_path = GTFSRT.download_path(gtfs_rt)
@@ -458,17 +468,20 @@ defmodule Transport.Validators.GTFSRTTest do
           url: gtfs_rt_url
         )
 
-      Transport.HTTPoison.Mock
-      |> expect(:get!, fn ^gtfs_permanent_url, [], [follow_redirect: true] ->
-        %HTTPoison.Response{status_code: 200, body: "gtfs"}
+      Transport.Req.Mock
+      |> expect(:get, fn ^gtfs_rt_url, [compressed: false, decode_body: false, into: %File.Stream{path: stream_path}] ->
+        File.write!(stream_path, body = "gtfs-rt")
+        {:ok, %Req.Response{status: 200, body: body}}
       end)
 
-      Transport.HTTPoison.Mock
-      |> expect(:get, fn ^gtfs_rt_url, [], [follow_redirect: true] ->
-        {:ok, %HTTPoison.Response{status_code: 200, body: "gtfs-rt"}}
+      Transport.Req.Mock
+      |> expect(:get, fn ^gtfs_permanent_url,
+                         [compressed: false, decode_body: false, into: %File.Stream{path: stream_path}] ->
+        File.write!(stream_path, "gtfs_content")
+        {:ok, %Req.Response{status: 200}}
       end)
 
-      S3TestUtils.s3_mocks_upload_file(gtfs_rt.id |> to_string())
+      mock_s3_stream_upload(gtfs_rt)
 
       gtfs_path = GTFSRT.download_path(gtfs)
       gtfs_rt_path = GTFSRT.download_path(gtfs_rt)
@@ -576,4 +589,11 @@ defmodule Transport.Validators.GTFSRTTest do
   end
 
   defp validator_path, do: Path.join(Application.fetch_env!(:transport, :transport_tools_folder), @validator_filename)
+
+  defp mock_s3_stream_upload(%DB.Resource{id: resource_id}) do
+    Transport.Test.S3TestUtils.s3_mock_stream_file(
+      start_path: to_string(resource_id),
+      bucket: "transport-data-gouv-fr-resource-history-test"
+    )
+  end
 end
diff --git a/apps/transport/test/transport_web/controllers/validation_controller_test.exs b/apps/transport/test/transport_web/controllers/validation_controller_test.exs
index 10cc3e0fbf..7f699cfb06 100644
--- a/apps/transport/test/transport_web/controllers/validation_controller_test.exs
+++ b/apps/transport/test/transport_web/controllers/validation_controller_test.exs
@@ -88,7 +88,7 @@ defmodule TransportWeb.ValidationControllerTest do
 
     test "with a GTFS", %{conn: conn} do
       Transport.Shared.Schemas.Mock |> expect(:transport_schemas, fn -> %{} end)
-      S3TestUtils.s3_mocks_upload_file("")
+      S3TestUtils.s3_mock_stream_file(start_path: "", bucket: "transport-data-gouv-fr-on-demand-validation-test")
       assert 0 == count_validations()
 
       conn =
@@ -154,7 +154,7 @@ defmodule TransportWeb.ValidationControllerTest do
       Transport.Shared.Schemas.Mock
       |> expect(:transport_schemas, 2, fn -> %{schema_name => %{"schema_type" => "tableschema", "title" => "foo"}} end)
 
-      S3TestUtils.s3_mocks_upload_file("")
+      S3TestUtils.s3_mock_stream_file(start_path: "", bucket: "transport-data-gouv-fr-on-demand-validation-test")
       assert 0 == count_validations()
 
       conn =
diff --git a/scripts/download_resource_history_files.exs b/scripts/download_resource_history_files.exs
index 2677a93270..48e963ab81 100644
--- a/scripts/download_resource_history_files.exs
+++ b/scripts/download_resource_history_files.exs
@@ -45,7 +45,14 @@ defmodule SyncS3LatestResourceHistory do
         %HTTPoison.Response{status_code: 200, body: body} =
           Transport.Shared.Wrapper.HTTPoison.impl().get!(rh.payload["permanent_url"])
 
-        Transport.S3.upload_to_s3!(:history, body, rh.payload["filename"], acl: :public_read)
+        tmp_path = System.tmp_dir!() |> Path.join(Ecto.UUID.generate())
+
+        try do
+          File.write!(tmp_path, body)
+          Transport.S3.stream_to_s3!(:history, tmp_path, rh.payload["filename"], acl: :public_read)
+        after
+          File.rm(tmp_path)
+        end
       end
     end)
   end

From 729cd7745185bb031368b9589e6fb0debe34037a Mon Sep 17 00:00:00 2001
From: Antoine Augusti <antoine.augusti@transport.data.gouv.fr>
Date: Mon, 18 Dec 2023 18:48:23 +0100
Subject: [PATCH 10/25] RateLimiterLive : utilise PhoenixDDoS.Jail.ips_in_jail
 (#3664)

---
 .../live/backoffice/rate_limiter_live.ex           | 14 ++------------
 .../live_views/rate_limiter_live_test.exs          |  8 ++++----
 mix.lock                                           |  4 ++--
 3 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/apps/transport/lib/transport_web/live/backoffice/rate_limiter_live.ex b/apps/transport/lib/transport_web/live/backoffice/rate_limiter_live.ex
index be9d8cec25..6dcb0a687c 100644
--- a/apps/transport/lib/transport_web/live/backoffice/rate_limiter_live.ex
+++ b/apps/transport/lib/transport_web/live/backoffice/rate_limiter_live.ex
@@ -37,26 +37,16 @@ defmodule TransportWeb.Backoffice.RateLimiterLive do
   defp update_data(socket) do
     assign(socket,
       last_updated_at: (Time.utc_now() |> Time.truncate(:second) |> to_string()) <> " UTC",
-      ips_in_jail: ips_in_jail()
+      ips_in_jail: PhoenixDDoS.Jail.ips_in_jail()
     )
   end
 
   @impl true
   def handle_event("bail_ip_from_jail", %{"ip" => ip}, socket) do
-    # See https://github.com/xward/phoenix_ddos/blob/feb07469ce318214cddb8e88ac18b5f94b3e31f2/lib/phoenix_ddos/core/jail.ex#L36
-    ip |> to_charlist() |> PhoenixDDoS.Jail.bail_out()
+    PhoenixDDoS.Jail.bail_out(ip)
     {:noreply, socket}
   end
 
-  def ips_in_jail do
-    # See https://github.com/xward/phoenix_ddos/blob/master/lib/phoenix_ddos/core/jail.ex
-    # The dependency does not a method for this feature at the moment, we're calling an
-    # internal API.
-    # https://github.com/xward/phoenix_ddos/issues/2
-    {:ok, keys} = Cachex.keys(:phoenix_ddos_jail)
-    keys |> Enum.map(&to_string/1) |> Enum.reject(&String.starts_with?(&1, "suspicious_"))
-  end
-
   defp env_value(env_value), do: System.get_env(env_value)
 
   defp env_value_to_int(env_name) do
diff --git a/apps/transport/test/transport_web/live_views/rate_limiter_live_test.exs b/apps/transport/test/transport_web/live_views/rate_limiter_live_test.exs
index c3b9682607..560ca42b02 100644
--- a/apps/transport/test/transport_web/live_views/rate_limiter_live_test.exs
+++ b/apps/transport/test/transport_web/live_views/rate_limiter_live_test.exs
@@ -25,16 +25,16 @@ defmodule TransportWeb.Backoffice.RateLimiterLiveTest do
   end
 
   test "ips_in_jail" do
-    assert [] == TransportWeb.Backoffice.RateLimiterLive.ips_in_jail()
+    assert [] == PhoenixDDoS.Jail.ips_in_jail()
     PhoenixDDoS.Jail.send(~c"108.128.238.17", {nil, %{jail_time: {1, :hour}}})
-    assert ["108.128.238.17"] == TransportWeb.Backoffice.RateLimiterLive.ips_in_jail()
+    assert ["108.128.238.17"] == PhoenixDDoS.Jail.ips_in_jail()
   end
 
   test "bail out IP", %{conn: conn} do
     ip = "108.128.238.17"
     ip |> to_charlist() |> PhoenixDDoS.Jail.send({nil, %{jail_time: {1, :hour}}})
     {:ok, view, html} = conn |> setup_admin_in_session() |> live(@url)
-    assert [ip] == TransportWeb.Backoffice.RateLimiterLive.ips_in_jail()
+    assert [ip] == PhoenixDDoS.Jail.ips_in_jail()
 
     assert html =~ ip
 
@@ -42,7 +42,7 @@ defmodule TransportWeb.Backoffice.RateLimiterLiveTest do
            |> element("button", "Retirer de la jail")
            |> render_click()
 
-    assert [] == TransportWeb.Backoffice.RateLimiterLive.ips_in_jail()
+    assert [] == PhoenixDDoS.Jail.ips_in_jail()
 
     send(view.pid, :update_data)
 
diff --git a/mix.lock b/mix.lock
index 15a32076e6..47555dc179 100644
--- a/mix.lock
+++ b/mix.lock
@@ -83,7 +83,7 @@
   "parallel_stream": {:hex, :parallel_stream, "1.1.0", "f52f73eb344bc22de335992377413138405796e0d0ad99d995d9977ac29f1ca9", [:mix], [], "hexpm", "684fd19191aedfaf387bbabbeb8ff3c752f0220c8112eb907d797f4592d6e871"},
   "parse_trans": {:hex, :parse_trans, "3.4.1", "6e6aa8167cb44cc8f39441d05193be6e6f4e7c2946cb2759f015f8c56b76e5ff", [:rebar3], [], "hexpm", "620a406ce75dada827b82e453c19cf06776be266f5a67cff34e1ef2cbb60e49a"},
   "phoenix": {:hex, :phoenix, "1.6.16", "e5bdd18c7a06da5852a25c7befb72246de4ddc289182285f8685a40b7b5f5451", [:mix], [{:castore, ">= 0.0.0", [hex: :castore, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:phoenix_pubsub, "~> 2.0", [hex: :phoenix_pubsub, repo: "hexpm", optional: false]}, {:phoenix_view, "~> 1.0 or ~> 2.0", [hex: :phoenix_view, repo: "hexpm", optional: false]}, {:plug, "~> 1.10", [hex: :plug, repo: "hexpm", optional: false]}, {:plug_cowboy, "~> 2.2", [hex: :plug_cowboy, repo: "hexpm", optional: true]}, {:plug_crypto, "~> 1.2", [hex: :plug_crypto, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "e15989ff34f670a96b95ef6d1d25bad0d9c50df5df40b671d8f4a669e050ac39"},
-  "phoenix_ddos": {:hex, :phoenix_ddos, "1.1.10", "94baf202437a16a427e4401abd6b17abd78e9bf50fdc59551f38503f04108171", [:mix], [{:cachex, ">= 3.0.0", [hex: :cachex, repo: "hexpm", optional: false]}, {:plug, "~> 1.14", [hex: :plug, repo: "hexpm", optional: false]}, {:telemetry, ">= 0.0.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "d2e3e251c3589642f88172b27911bf0ff71e9452ebc49a87b2073d48dc291bd9"},
+  "phoenix_ddos": {:hex, :phoenix_ddos, "1.1.14", "8bc29595f221361cec86f798d15ca7ac8228a0ce30fea25dd75d99027e73762c", [:mix], [{:cachex, ">= 3.0.0", [hex: :cachex, repo: "hexpm", optional: false]}, {:plug, "~> 1.14", [hex: :plug, repo: "hexpm", optional: false]}, {:telemetry, ">= 0.0.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "c0f7e2debd72af4fe90d5083a569f3f576bced9d38010b1a8631bb43c70a005d"},
   "phoenix_ecto": {:hex, :phoenix_ecto, "4.4.2", "b21bd01fdeffcfe2fab49e4942aa938b6d3e89e93a480d4aee58085560a0bc0d", [:mix], [{:ecto, "~> 3.5", [hex: :ecto, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 2.14.2 or ~> 3.0", [hex: :phoenix_html, repo: "hexpm", optional: true]}, {:plug, "~> 1.9", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "70242edd4601d50b69273b057ecf7b684644c19ee750989fd555625ae4ce8f5d"},
   "phoenix_html": {:hex, :phoenix_html, "3.3.3", "380b8fb45912b5638d2f1d925a3771b4516b9a78587249cabe394e0a5d579dc9", [:mix], [{:plug, "~> 1.5", [hex: :plug, repo: "hexpm", optional: true]}], "hexpm", "923ebe6fec6e2e3b3e569dfbdc6560de932cd54b000ada0208b5f45024bdd76c"},
   "phoenix_live_dashboard": {:hex, :phoenix_live_dashboard, "0.7.2", "97cc4ff2dba1ebe504db72cb45098cb8e91f11160528b980bd282cc45c73b29c", [:mix], [{:ecto, "~> 3.6.2 or ~> 3.7", [hex: :ecto, repo: "hexpm", optional: true]}, {:ecto_mysql_extras, "~> 0.5", [hex: :ecto_mysql_extras, repo: "hexpm", optional: true]}, {:ecto_psql_extras, "~> 0.7", [hex: :ecto_psql_extras, repo: "hexpm", optional: true]}, {:mime, "~> 1.6 or ~> 2.0", [hex: :mime, repo: "hexpm", optional: false]}, {:phoenix_live_view, "~> 0.18.3", [hex: :phoenix_live_view, repo: "hexpm", optional: false]}, {:telemetry_metrics, "~> 0.6 or ~> 1.0", [hex: :telemetry_metrics, repo: "hexpm", optional: false]}], "hexpm", "0e5fdf063c7a3b620c566a30fcf68b7ee02e5e46fe48ee46a6ec3ba382dc05b7"},
@@ -94,7 +94,7 @@
   "phoenix_swoosh": {:hex, :phoenix_swoosh, "1.2.0", "a544d83fde4a767efb78f45404a74c9e37b2a9c5ea3339692e65a6966731f935", [:mix], [{:finch, "~> 0.8", [hex: :finch, repo: "hexpm", optional: true]}, {:hackney, "~> 1.10", [hex: :hackney, repo: "hexpm", optional: true]}, {:phoenix, "~> 1.6", [hex: :phoenix, repo: "hexpm", optional: true]}, {:phoenix_html, "~> 3.0", [hex: :phoenix_html, repo: "hexpm", optional: true]}, {:phoenix_view, "~> 1.0 or ~> 2.0", [hex: :phoenix_view, repo: "hexpm", optional: false]}, {:swoosh, "~> 1.5", [hex: :swoosh, repo: "hexpm", optional: false]}], "hexpm", "e88d117251e89a16b92222415a6d87b99a96747ddf674fc5c7631de734811dba"},
   "phoenix_template": {:hex, :phoenix_template, "1.0.3", "32de561eefcefa951aead30a1f94f1b5f0379bc9e340bb5c667f65f1edfa4326", [:mix], [{:phoenix_html, "~> 2.14.2 or ~> 3.0", [hex: :phoenix_html, repo: "hexpm", optional: true]}], "hexpm", "16f4b6588a4152f3cc057b9d0c0ba7e82ee23afa65543da535313ad8d25d8e2c"},
   "phoenix_view": {:hex, :phoenix_view, "2.0.2", "6bd4d2fd595ef80d33b439ede6a19326b78f0f1d8d62b9a318e3d9c1af351098", [:mix], [{:phoenix_html, "~> 2.14.2 or ~> 3.0", [hex: :phoenix_html, repo: "hexpm", optional: true]}, {:phoenix_template, "~> 1.0", [hex: :phoenix_template, repo: "hexpm", optional: false]}], "hexpm", "a929e7230ea5c7ee0e149ffcf44ce7cf7f4b6d2bfe1752dd7c084cdff152d36f"},
-  "plug": {:hex, :plug, "1.15.1", "b7efd81c1a1286f13efb3f769de343236bd8b7d23b4a9f40d3002fc39ad8f74c", [:mix], [{:mime, "~> 1.0 or ~> 2.0", [hex: :mime, repo: "hexpm", optional: false]}, {:plug_crypto, "~> 1.1.1 or ~> 1.2 or ~> 2.0", [hex: :plug_crypto, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4.3 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "459497bd94d041d98d948054ec6c0b76feacd28eec38b219ca04c0de13c79d30"},
+  "plug": {:hex, :plug, "1.15.2", "94cf1fa375526f30ff8770837cb804798e0045fd97185f0bb9e5fcd858c792a3", [:mix], [{:mime, "~> 1.0 or ~> 2.0", [hex: :mime, repo: "hexpm", optional: false]}, {:plug_crypto, "~> 1.1.1 or ~> 1.2 or ~> 2.0", [hex: :plug_crypto, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4.3 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "02731fa0c2dcb03d8d21a1d941bdbbe99c2946c0db098eee31008e04c6283615"},
   "plug_canonical_host": {:hex, :plug_canonical_host, "2.0.3", "3d96c3340cc8a434eb6758a4a34de6c152bd781be96bb8439545da2d17ecf576", [:make, :mix], [{:plug, "~> 1.0", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "aca98ac6d0036391b84d5a40af6f946c839fb0d588bf0064029a2e8931431ea6"},
   "plug_cowboy": {:hex, :plug_cowboy, "2.6.1", "9a3bbfceeb65eff5f39dab529e5cd79137ac36e913c02067dba3963a26efe9b2", [:mix], [{:cowboy, "~> 2.7", [hex: :cowboy, repo: "hexpm", optional: false]}, {:cowboy_telemetry, "~> 0.3", [hex: :cowboy_telemetry, repo: "hexpm", optional: false]}, {:plug, "~> 1.14", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "de36e1a21f451a18b790f37765db198075c25875c64834bcc82d90b309eb6613"},
   "plug_crypto": {:hex, :plug_crypto, "1.2.5", "918772575e48e81e455818229bf719d4ab4181fcbf7f85b68a35620f78d89ced", [:mix], [], "hexpm", "26549a1d6345e2172eb1c233866756ae44a9609bd33ee6f99147ab3fd87fd842"},

From fcc46f0a68a6208ea21184874d5b8c1d76f953a0 Mon Sep 17 00:00:00 2001
From: Antoine Augusti <antoine.augusti@transport.data.gouv.fr>
Date: Tue, 19 Dec 2023 10:07:55 +0100
Subject: [PATCH 11/25] =?UTF-8?q?R=C3=A9pare=20GTFSDiff.dump=5Fdiff=20(#36?=
 =?UTF-8?q?68)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Add tests for GTFSDiff.dump_diff

* Run Stream
---
 apps/transport/lib/transport/gtfs_diff.ex     |  9 +---
 .../test/transport/gtfs_diff_test.exs         | 45 ++++++++++++++++---
 2 files changed, 40 insertions(+), 14 deletions(-)

diff --git a/apps/transport/lib/transport/gtfs_diff.ex b/apps/transport/lib/transport/gtfs_diff.ex
index 4f4f4b6e8c..98c28e0d15 100644
--- a/apps/transport/lib/transport/gtfs_diff.ex
+++ b/apps/transport/lib/transport/gtfs_diff.ex
@@ -334,6 +334,7 @@ defmodule Transport.GTFSDiff do
     [headers | body]
     |> CSV.dump_to_stream()
     |> Stream.into(File.stream!(filepath))
+    |> Stream.run()
   end
 
   def apply_delete(file, diff, primary_key) do
@@ -410,11 +411,3 @@ defmodule Transport.GTFSDiff do
     |> IO.iodata_to_binary()
   end
 end
-
-# usage
-
-# unzip_1 = Transport.GTFSDiff.unzip("path/to/gtfs_1.zip")
-# unzip_2 = Transport.GTFSDiff.unzip("path/to/gtfs_2.zip")
-
-# diff = Transport.GTFSDiff.diff(unzip_1, unzip_2)
-# File.write!("diff_output.txt", diff |> Transport.GTFSDiff.dump_diff())
diff --git a/apps/transport/test/transport/gtfs_diff_test.exs b/apps/transport/test/transport/gtfs_diff_test.exs
index 7a76b9c101..09661aeabb 100644
--- a/apps/transport/test/transport/gtfs_diff_test.exs
+++ b/apps/transport/test/transport/gtfs_diff_test.exs
@@ -1,12 +1,6 @@
 defmodule Transport.GTFSDiffTest do
   use ExUnit.Case, async: true
 
-  defp unzip(path) do
-    zip_file = Unzip.LocalFile.open(path)
-    {:ok, unzip} = Unzip.new(zip_file)
-    unzip
-  end
-
   describe "GTFS Diff" do
     test "2 identical files" do
       unzip_1 = unzip("test/fixture/files/gtfs_diff/gtfs.zip")
@@ -128,4 +122,43 @@ defmodule Transport.GTFSDiffTest do
              ]
     end
   end
+
+  describe "dump_diff" do
+    test "empty diff, file is created" do
+      tmp_path = System.tmp_dir!() |> Path.join(Ecto.UUID.generate())
+      refute File.exists?(tmp_path)
+      Transport.GTFSDiff.dump_diff([], tmp_path)
+      assert File.exists?(tmp_path)
+
+      assert [["id", "file", "action", "target", "identifier", "initial_value", "new_value", "note"]] ==
+               read_csv(tmp_path)
+
+      File.rm(tmp_path)
+    end
+
+    test "simple diff" do
+      diff = [%{action: "delete", file: "stops.txt", id: 1, identifier: %{"stop_id" => "near1"}, target: "row"}]
+      tmp_path = System.tmp_dir!() |> Path.join(Ecto.UUID.generate())
+      refute File.exists?(tmp_path)
+      Transport.GTFSDiff.dump_diff(diff, tmp_path)
+      assert File.exists?(tmp_path)
+
+      assert [
+               ["id", "file", "action", "target", "identifier", "initial_value", "new_value", "note"],
+               ["1", "stops.txt", "delete", "row", ~s({"stop_id":"near1"}), "", "", ""]
+             ] == read_csv(tmp_path)
+
+      File.rm(tmp_path)
+    end
+  end
+
+  defp unzip(path) do
+    zip_file = Unzip.LocalFile.open(path)
+    {:ok, unzip} = Unzip.new(zip_file)
+    unzip
+  end
+
+  defp read_csv(filepath) do
+    filepath |> File.read!() |> NimbleCSV.RFC4180.parse_string(skip_headers: false)
+  end
 end

From c7e2a047433e1a3c4274d5b0b1c875c815bd7329 Mon Sep 17 00:00:00 2001
From: Antoine Augusti <antoine.augusti@transport.data.gouv.fr>
Date: Tue, 19 Dec 2023 16:53:12 +0100
Subject: [PATCH 12/25] Fix flaky test in
 TransportWeb.API.GeoQueryControllerTest (#3671)

---
 .../api/geo_query_controller_test.exs         | 169 +++++++++---------
 1 file changed, 85 insertions(+), 84 deletions(-)

diff --git a/apps/transport/test/transport_web/controllers/api/geo_query_controller_test.exs b/apps/transport/test/transport_web/controllers/api/geo_query_controller_test.exs
index feb79cee1f..038d6fd8f0 100644
--- a/apps/transport/test/transport_web/controllers/api/geo_query_controller_test.exs
+++ b/apps/transport/test/transport_web/controllers/api/geo_query_controller_test.exs
@@ -26,23 +26,21 @@ defmodule TransportWeb.API.GeoQueryControllerTest do
 
     insert(:geo_data, %{geo_data_import_id: geo_data_import_id_ko, geom: point2, payload: %{"nom_lieu" => "Bastia"}})
 
-    conn = conn |> get(TransportWeb.API.Router.Helpers.geo_query_path(conn, :index, data: "bnlc"))
-
-    assert json_response(conn, 200) == %{
-             "type" => "FeatureCollection",
-             "features" => [
-               %{
-                 "geometry" => %{"coordinates" => [1, 1], "type" => "Point"},
-                 "properties" => %{"nom_lieu" => "Ajaccio"},
-                 "type" => "Feature"
-               },
-               %{
-                 "geometry" => %{"coordinates" => [2, 2], "type" => "Point"},
-                 "properties" => %{"nom_lieu" => "Coti-Chiavari"},
-                 "type" => "Feature"
-               }
-             ]
-           }
+    assert_expected_geojson(conn,
+      data: "bnlc",
+      expected_features: [
+        %{
+          "geometry" => %{"coordinates" => [1, 1], "type" => "Point"},
+          "properties" => %{"nom_lieu" => "Ajaccio"},
+          "type" => "Feature"
+        },
+        %{
+          "geometry" => %{"coordinates" => [2, 2], "type" => "Point"},
+          "properties" => %{"nom_lieu" => "Coti-Chiavari"},
+          "type" => "Feature"
+        }
+      ]
+    )
   end
 
   test "a parkings relais geo query", %{conn: conn} do
@@ -77,23 +75,21 @@ defmodule TransportWeb.API.GeoQueryControllerTest do
       payload: %{"nom" => "Rouen", "nb_pr" => 50}
     })
 
-    conn = conn |> get(TransportWeb.API.Router.Helpers.geo_query_path(conn, :index, data: "parkings-relais"))
-
-    assert json_response(conn, 200) == %{
-             "type" => "FeatureCollection",
-             "features" => [
-               %{
-                 "geometry" => %{"coordinates" => [1, 1], "type" => "Point"},
-                 "properties" => %{"nom" => "Nuits-Saint-Georges", "nb_pr" => 22},
-                 "type" => "Feature"
-               },
-               %{
-                 "geometry" => %{"coordinates" => [2, 2], "type" => "Point"},
-                 "properties" => %{"nom" => "Gevrey-Chambertin", "nb_pr" => 23},
-                 "type" => "Feature"
-               }
-             ]
-           }
+    assert_expected_geojson(conn,
+      data: "parkings-relais",
+      expected_features: [
+        %{
+          "geometry" => %{"coordinates" => [1, 1], "type" => "Point"},
+          "properties" => %{"nom" => "Nuits-Saint-Georges", "nb_pr" => 22},
+          "type" => "Feature"
+        },
+        %{
+          "geometry" => %{"coordinates" => [2, 2], "type" => "Point"},
+          "properties" => %{"nom" => "Gevrey-Chambertin", "nb_pr" => 23},
+          "type" => "Feature"
+        }
+      ]
+    )
   end
 
   test "a ZFE geo query", %{conn: conn} do
@@ -128,29 +124,27 @@ defmodule TransportWeb.API.GeoQueryControllerTest do
       payload: %{}
     })
 
-    conn = conn |> get(TransportWeb.API.Router.Helpers.geo_query_path(conn, :index, data: "zfe"))
-
-    assert json_response(conn, 200) == %{
-             "features" => [
-               %{
-                 "geometry" => %{
-                   "coordinates" => [[[102, 2], [103, 2], [103, 3], [102, 3], [102, 2]]],
-                   "type" => "Polygon"
-                 },
-                 "properties" => %{},
-                 "type" => "Feature"
-               },
-               %{
-                 "geometry" => %{
-                   "coordinates" => [[[42, 2], [103, 2], [103, 3], [42, 3], [42, 2]]],
-                   "type" => "Polygon"
-                 },
-                 "properties" => %{},
-                 "type" => "Feature"
-               }
-             ],
-             "type" => "FeatureCollection"
-           }
+    assert_expected_geojson(conn,
+      data: "zfe",
+      expected_features: [
+        %{
+          "geometry" => %{
+            "coordinates" => [[[102, 2], [103, 2], [103, 3], [102, 3], [102, 2]]],
+            "type" => "Polygon"
+          },
+          "properties" => %{},
+          "type" => "Feature"
+        },
+        %{
+          "geometry" => %{
+            "coordinates" => [[[42, 2], [103, 2], [103, 3], [42, 3], [42, 2]]],
+            "type" => "Polygon"
+          },
+          "properties" => %{},
+          "type" => "Feature"
+        }
+      ]
+    )
   end
 
   test "a IRVE geo query", %{conn: conn} do
@@ -187,33 +181,31 @@ defmodule TransportWeb.API.GeoQueryControllerTest do
       }
     })
 
-    conn = conn |> get(TransportWeb.API.Router.Helpers.geo_query_path(conn, :index, data: "irve"))
-
-    assert json_response(conn, 200) == %{
-             "type" => "FeatureCollection",
-             "features" => [
-               %{
-                 "geometry" => %{"coordinates" => [1, 1], "type" => "Point"},
-                 "properties" => %{
-                   "nom_enseigne" => "Recharge Super 95",
-                   "id_station_itinerance" => "FRELCPEYSPC",
-                   "nom_station" => "Dehaven Centre",
-                   "nbre_pdc" => "2"
-                 },
-                 "type" => "Feature"
-               },
-               %{
-                 "geometry" => %{"coordinates" => [2, 2], "type" => "Point"},
-                 "properties" => %{
-                   "nom_enseigne" => "Recharge Super 95",
-                   "id_station_itinerance" => "FRELCPBLOHM",
-                   "nom_station" => "Gemina Port",
-                   "nbre_pdc" => "3"
-                 },
-                 "type" => "Feature"
-               }
-             ]
-           }
+    assert_expected_geojson(conn,
+      data: "irve",
+      expected_features: [
+        %{
+          "geometry" => %{"coordinates" => [1, 1], "type" => "Point"},
+          "properties" => %{
+            "nom_enseigne" => "Recharge Super 95",
+            "id_station_itinerance" => "FRELCPEYSPC",
+            "nom_station" => "Dehaven Centre",
+            "nbre_pdc" => "2"
+          },
+          "type" => "Feature"
+        },
+        %{
+          "geometry" => %{"coordinates" => [2, 2], "type" => "Point"},
+          "properties" => %{
+            "nom_enseigne" => "Recharge Super 95",
+            "id_station_itinerance" => "FRELCPBLOHM",
+            "nom_station" => "Gemina Port",
+            "nbre_pdc" => "3"
+          },
+          "type" => "Feature"
+        }
+      ]
+    )
   end
 
   test "404 cases", %{conn: conn} do
@@ -231,6 +223,15 @@ defmodule TransportWeb.API.GeoQueryControllerTest do
     |> json_response(404)
   end
 
+  defp assert_expected_geojson(%Plug.Conn{} = conn, data: data, expected_features: expected_features) do
+    %{"type" => "FeatureCollection", "features" => features} =
+      conn
+      |> get(TransportWeb.API.Router.Helpers.geo_query_path(conn, :index, data: data))
+      |> json_response(200)
+
+    assert MapSet.new(features) == MapSet.new(expected_features)
+  end
+
   defp insert_bnlc_dataset do
     insert(:dataset, %{
       type: "carpooling-areas",

From d00a8e98ab7dcc8fe99873055288e46aa0371d73 Mon Sep 17 00:00:00 2001
From: Antoine Augusti <antoine.augusti@transport.data.gouv.fr>
Date: Wed, 20 Dec 2023 17:34:42 +0100
Subject: [PATCH 13/25] =?UTF-8?q?ImportDatasetMonthlyMetricsTestJob:=20r?=
 =?UTF-8?q?=C3=A9pare=20test=20instable=20(#3673)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...import_dataset_monthly_metrics_job_test.exs | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/apps/transport/test/transport/jobs/import_dataset_monthly_metrics_job_test.exs b/apps/transport/test/transport/jobs/import_dataset_monthly_metrics_job_test.exs
index 56db668120..20114f6dd7 100644
--- a/apps/transport/test/transport/jobs/import_dataset_monthly_metrics_job_test.exs
+++ b/apps/transport/test/transport/jobs/import_dataset_monthly_metrics_job_test.exs
@@ -1,6 +1,7 @@
 defmodule Transport.Test.Transport.Jobs.ImportDatasetMonthlyMetricsTestJob do
   use ExUnit.Case, async: true
   import DB.Factory
+  import Ecto.Query
   import Mox
   use Oban.Testing, repo: DB.Repo
   alias Transport.Jobs.ImportDatasetMonthlyMetricsJob
@@ -142,6 +143,8 @@ defmodule Transport.Test.Transport.Jobs.ImportDatasetMonthlyMetricsTestJob do
 
     assert :ok == perform_job(ImportDatasetMonthlyMetricsJob, %{})
 
+    assert 4 == DB.Repo.aggregate(DB.DatasetMonthlyMetric, :count, :id)
+
     assert [
              %DB.DatasetMonthlyMetric{
                dataset_datagouv_id: ^d1_datagouv_id,
@@ -154,7 +157,14 @@ defmodule Transport.Test.Transport.Jobs.ImportDatasetMonthlyMetricsTestJob do
                year_month: "2023-12",
                metric_name: :views,
                count: 1337
-             },
+             }
+           ] =
+             DB.DatasetMonthlyMetric
+             |> where([dmm], dmm.dataset_datagouv_id == ^d1_datagouv_id)
+             |> order_by([dmm], dmm.metric_name)
+             |> DB.Repo.all()
+
+    assert [
              %DB.DatasetMonthlyMetric{
                dataset_datagouv_id: ^d2_datagouv_id,
                year_month: "2023-12",
@@ -167,7 +177,11 @@ defmodule Transport.Test.Transport.Jobs.ImportDatasetMonthlyMetricsTestJob do
                metric_name: :views,
                count: 0
              }
-           ] = DB.DatasetMonthlyMetric |> DB.Repo.all() |> Enum.sort_by(&{&1.dataset_datagouv_id, &1.metric_name})
+           ] =
+             DB.DatasetMonthlyMetric
+             |> where([dmm], dmm.dataset_datagouv_id == ^d2_datagouv_id)
+             |> order_by([dmm], dmm.metric_name)
+             |> DB.Repo.all()
   end
 
   defp setup_http_response(datagouv_id, data) do

From 765e30fa09f4c3eed326dd769e517b2e3419df9d Mon Sep 17 00:00:00 2001
From: Antoine Augusti <antoine.augusti@transport.data.gouv.fr>
Date: Wed, 20 Dec 2023 17:37:26 +0100
Subject: [PATCH 14/25] =?UTF-8?q?ConsolidateBNLCJob=20:=20retours=20=C3=A0?=
 =?UTF-8?q?=20la=20ligne=20dans=20rapport=20de=20consolidation=20(#3675)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/transport/lib/jobs/consolidate_bnlc_job.ex           | 8 ++++----
 .../test/transport/jobs/consolidate_bnlc_job_test.exs     | 3 +--
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/apps/transport/lib/jobs/consolidate_bnlc_job.ex b/apps/transport/lib/jobs/consolidate_bnlc_job.ex
index 9e0cec5a32..7479d22a69 100644
--- a/apps/transport/lib/jobs/consolidate_bnlc_job.ex
+++ b/apps/transport/lib/jobs/consolidate_bnlc_job.ex
@@ -207,7 +207,7 @@ defmodule Transport.Jobs.ConsolidateBNLCJob do
 
     """
     <h2>Erreurs liées aux jeux de données</h2>
-    #{Enum.map_join(dataset_errors, "\n", fn el -> format.(el) end)}
+    #{Enum.map_join(dataset_errors, "<br/>", fn el -> format.(el) end)}
     """
   end
 
@@ -216,7 +216,7 @@ defmodule Transport.Jobs.ConsolidateBNLCJob do
   def format_validation_errors(%{validation_errors: validation_errors}) do
     """
     <h2>Ressources non valides par rapport au schéma #{@schema_name}</h2>
-    #{Enum.map_join(validation_errors, "\n", &link_to_resource/1)}
+    #{Enum.map_join(validation_errors, "<br/>", &link_to_resource/1)}
     """
   end
 
@@ -231,7 +231,7 @@ defmodule Transport.Jobs.ConsolidateBNLCJob do
 
     """
     <h2>Impossible de télécharger les ressources suivantes</h2>
-    #{Enum.map_join(errors, "\n", &link_to_resource/1)}
+    #{Enum.map_join(errors, "<br/>", &link_to_resource/1)}
     """
   end
 
@@ -246,7 +246,7 @@ defmodule Transport.Jobs.ConsolidateBNLCJob do
 
     """
     <h2>Impossible de décoder les fichiers CSV suivants</h2>
-    #{Enum.map_join(errors, "\n", &link_to_resource/1)}
+    #{Enum.map_join(errors, "<br/>", &link_to_resource/1)}
     """
   end
 
diff --git a/apps/transport/test/transport/jobs/consolidate_bnlc_job_test.exs b/apps/transport/test/transport/jobs/consolidate_bnlc_job_test.exs
index f90c6f863a..fee72d6f5e 100644
--- a/apps/transport/test/transport/jobs/consolidate_bnlc_job_test.exs
+++ b/apps/transport/test/transport/jobs/consolidate_bnlc_job_test.exs
@@ -95,8 +95,7 @@ defmodule Transport.Test.Transport.Jobs.ConsolidateBNLCJobTest do
 
       assert """
              <h2>Erreurs liées aux jeux de données</h2>
-             Le slug du jeu de données `404-slug` est introuvable via l'API
-             Pas de ressources avec le schéma etalab/schema-lieux-covoiturage pour <a href=\"https://example.com/jdd\">JDD sans ressources</a>
+             Le slug du jeu de données `404-slug` est introuvable via l'API<br/>Pas de ressources avec le schéma etalab/schema-lieux-covoiturage pour <a href=\"https://example.com/jdd\">JDD sans ressources</a>
 
 
              <h2>Ressources non valides par rapport au schéma etalab/schema-lieux-covoiturage</h2>

From 7d9bb4936bc046f07db4de4215c415d03d4ef730 Mon Sep 17 00:00:00 2001
From: Antoine Augusti <antoine.augusti@transport.data.gouv.fr>
Date: Wed, 20 Dec 2023 17:38:38 +0100
Subject: [PATCH 15/25] BNLCJobToGeoData : utilise nouvelle BNLC (#3674)

---
 .../lib/jobs/geo_data/bnlc_to_geo_data.ex         | 10 +++++++++-
 .../transport/jobs/consolidate_bnlc_job_test.exs  |  2 +-
 .../transport/jobs/consolidate_lez_job_test.exs   |  4 ++--
 .../jobs/geo_data/bnlc_to_geodata_test.exs        |  3 ++-
 config/test.exs                                   | 15 ++++++++++++++-
 5 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/apps/transport/lib/jobs/geo_data/bnlc_to_geo_data.ex b/apps/transport/lib/jobs/geo_data/bnlc_to_geo_data.ex
index 32cfe30adc..6d24ee078d 100644
--- a/apps/transport/lib/jobs/geo_data/bnlc_to_geo_data.ex
+++ b/apps/transport/lib/jobs/geo_data/bnlc_to_geo_data.ex
@@ -9,7 +9,10 @@ defmodule Transport.Jobs.BNLCToGeoData do
 
   @impl Oban.Worker
   def perform(%{}) do
-    [%DB.Resource{} = resource] = relevant_dataset() |> DB.Dataset.official_resources()
+    [%DB.Resource{} = resource] =
+      relevant_dataset()
+      |> Map.fetch!(:resources)
+      |> Enum.filter(fn %DB.Resource{datagouv_id: datagouv_id} -> datagouv_id == bnlc_datagouv_id() end)
 
     Transport.Jobs.BaseGeoData.import_replace_data(resource, &prepare_data_for_insert/2)
     :ok
@@ -40,4 +43,9 @@ defmodule Transport.Jobs.BNLCToGeoData do
 
     Transport.Jobs.BaseGeoData.prepare_csv_data_for_import(body, prepare_data_fn)
   end
+
+  defp bnlc_datagouv_id do
+    %{resource_id: resource_id} = Map.fetch!(Application.fetch_env!(:transport, :consolidation), :bnlc)
+    resource_id
+  end
 end
diff --git a/apps/transport/test/transport/jobs/consolidate_bnlc_job_test.exs b/apps/transport/test/transport/jobs/consolidate_bnlc_job_test.exs
index fee72d6f5e..7cf2b49cca 100644
--- a/apps/transport/test/transport/jobs/consolidate_bnlc_job_test.exs
+++ b/apps/transport/test/transport/jobs/consolidate_bnlc_job_test.exs
@@ -843,7 +843,7 @@ defmodule Transport.Test.Transport.Jobs.ConsolidateBNLCJobTest do
     tmp_path = @tmp_path
 
     expected_url =
-      "https://demo.data.gouv.fr/api/1/datasets/5d6eaffc8b4c417cdc452ac3/resources/4fd78dee-e122-4c0d-8bf6-ff55d79f3af1/upload/"
+      "https://demo.data.gouv.fr/api/1/datasets/bnlc_fake_dataset_id/resources/bnlc_fake_resource_id/upload/"
 
     Transport.HTTPoison.Mock
     |> expect(:request, fn :post,
diff --git a/apps/transport/test/transport/jobs/consolidate_lez_job_test.exs b/apps/transport/test/transport/jobs/consolidate_lez_job_test.exs
index 316109ea08..29e93d0596 100644
--- a/apps/transport/test/transport/jobs/consolidate_lez_job_test.exs
+++ b/apps/transport/test/transport/jobs/consolidate_lez_job_test.exs
@@ -245,7 +245,7 @@ defmodule Transport.Test.Transport.Jobs.ConsolidateLEZsJobTest do
       assert String.ends_with?(path, "aires.geojson")
 
       assert url ==
-               "https://demo.data.gouv.fr/api/1/datasets/624ff4b1bbb449a550264040/resources/3ddd29ee-00dd-40af-bc98-3367adbd0289/upload/"
+               "https://demo.data.gouv.fr/api/1/datasets/zfe_fake_dataset_id/resources/zfe_aires_fake_resource_id/upload/"
 
       assert headers == [{"content-type", "multipart/form-data"}, {"X-API-KEY", "fake-datagouv-api-key"}]
       {:ok, %HTTPoison.Response{body: "", status_code: 200}}
@@ -257,7 +257,7 @@ defmodule Transport.Test.Transport.Jobs.ConsolidateLEZsJobTest do
       assert String.ends_with?(path, "voies.geojson")
 
       assert url ==
-               "https://demo.data.gouv.fr/api/1/datasets/624ff4b1bbb449a550264040/resources/98c6bcdb-1205-4481-8859-f885290763f2/upload/"
+               "https://demo.data.gouv.fr/api/1/datasets/zfe_fake_dataset_id/resources/zfe_voies_fake_resource_id/upload/"
 
       assert headers == [{"content-type", "multipart/form-data"}, {"X-API-KEY", "fake-datagouv-api-key"}]
       {:ok, %HTTPoison.Response{body: "", status_code: 200}}
diff --git a/apps/transport/test/transport/jobs/geo_data/bnlc_to_geodata_test.exs b/apps/transport/test/transport/jobs/geo_data/bnlc_to_geodata_test.exs
index 88dec4a46c..8bb8310f35 100644
--- a/apps/transport/test/transport/jobs/geo_data/bnlc_to_geodata_test.exs
+++ b/apps/transport/test/transport/jobs/geo_data/bnlc_to_geodata_test.exs
@@ -11,6 +11,7 @@ defmodule Transport.Jobs.BNLCToGeoDataTest do
 
   setup :verify_on_exit!
 
+  @bnlc_datagouv_id "bnlc_fake_resource_id"
   @bnlc_content ~s("id_lieu","Xlong","Ylat","nbre_pl"\n"2A004-C-001","8.783403","41.9523692","0"\n"01024-C-001","5.158352778","46.28957222","5")
 
   test "import a BNLC to the DB" do
@@ -54,7 +55,7 @@ defmodule Transport.Jobs.BNLCToGeoDataTest do
 
     # insert bnlc resources
     insert(:resource, %{dataset_id: dataset_id, is_community_resource: true})
-    %{id: resource_id} = insert(:resource, %{dataset_id: dataset_id})
+    %{id: resource_id} = insert(:resource, %{dataset_id: dataset_id, datagouv_id: @bnlc_datagouv_id})
     # insert bnlc resource history
     %{id: id_0} =
       insert(:resource_history, %{
diff --git a/config/test.exs b/config/test.exs
index 83dc77cbd5..3a37427e46 100644
--- a/config/test.exs
+++ b/config/test.exs
@@ -102,7 +102,20 @@ config :transport,
   datagouvfr_apikey: "fake-datagouv-api-key",
   # NOTE: some tests still rely on ExVCR cassettes at the moment. We configure the
   # expected host here, until we move to a behaviour-based testing instead.
-  gtfs_validator_url: "https://validation.transport.data.gouv.fr"
+  gtfs_validator_url: "https://validation.transport.data.gouv.fr",
+  consolidation: %{
+    zfe: %{
+      dataset_id: "zfe_fake_dataset_id",
+      resource_ids: %{
+        "voies" => "zfe_voies_fake_resource_id",
+        "aires" => "zfe_aires_fake_resource_id"
+      }
+    },
+    bnlc: %{
+      dataset_id: "bnlc_fake_dataset_id",
+      resource_id: "bnlc_fake_resource_id"
+    }
+  }
 
 secret_key_base = "SOME-LONG-SECRET-KEY-BASE-FOR-TESTING-SOME-LONG-SECRET-KEY-BASE-FOR-TESTING"
 

From c16d891b74ed7de53cd2ea1c04cef64cf8965637 Mon Sep 17 00:00:00 2001
From: Antoine Augusti <antoine.augusti@transport.data.gouv.fr>
Date: Thu, 21 Dec 2023 10:14:51 +0100
Subject: [PATCH 16/25] =?UTF-8?q?Mise=20=C3=A0=20jour=20des=20d=C3=A9penda?=
 =?UTF-8?q?nces=20Elixir=20(#3676)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Bump dependencies

* Changes for Oban 2.17

* gettext: add missing elixir-autogen

* Bump Mox to 1.1.0
---
 apps/datagouvfr/mix.exs                       |  2 +-
 apps/shared/mix.exs                           |  2 +-
 .../transport/lib/jobs/dataset_history_job.ex |  4 +-
 .../lib/jobs/dataset_quality_score.ex         |  4 +-
 apps/transport/lib/jobs/dedupe_history_job.ex |  2 +-
 ...dic_reminder_producers_notification_job.ex |  2 +-
 .../lib/jobs/resource_history_job.ex          |  4 +-
 .../lib/jobs/resource_unavailable_job.ex      |  2 +-
 apps/transport/mix.exs                        |  2 +-
 .../priv/gettext/en/LC_MESSAGES/page-index.po |  2 +-
 .../gettext/en/LC_MESSAGES/page-shortlist.po  |  2 +-
 .../gettext/en/LC_MESSAGES/validations.po     |  8 +--
 .../priv/gettext/fr/LC_MESSAGES/page-index.po |  2 +-
 .../gettext/fr/LC_MESSAGES/page-shortlist.po  |  2 +-
 .../gettext/fr/LC_MESSAGES/validations.po     |  8 +--
 apps/transport/priv/gettext/page-index.pot    |  2 +-
 .../transport/priv/gettext/page-shortlist.pot |  2 +-
 apps/transport/priv/gettext/validations.pot   |  8 +--
 apps/unlock/mix.exs                           |  2 +-
 config/runtime.exs                            |  2 +-
 mix.lock                                      | 54 +++++++++----------
 21 files changed, 59 insertions(+), 59 deletions(-)

diff --git a/apps/datagouvfr/mix.exs b/apps/datagouvfr/mix.exs
index 3034246177..20132792aa 100644
--- a/apps/datagouvfr/mix.exs
+++ b/apps/datagouvfr/mix.exs
@@ -43,7 +43,7 @@ defmodule Datagouvfr.MixProject do
       {:shared, in_umbrella: true},
       {:vex, "~> 0.9"},
       {:exvcr, "~> 0.13", only: :test},
-      {:mox, "~> 1.0.0", only: :test},
+      {:mox, "~> 1.1", only: :test},
       {:sentry, "~> 8.1"},
       {:dialyxir, "~> 1.2", only: [:dev, :test], runtime: false},
     ]
diff --git a/apps/shared/mix.exs b/apps/shared/mix.exs
index 0f0bdc183d..fa79a36543 100644
--- a/apps/shared/mix.exs
+++ b/apps/shared/mix.exs
@@ -39,7 +39,7 @@ defmodule Shared.MixProject do
       {:httpoison, ">= 0.0.0"},
       {:req, "~> 0.4.0"},
       {:bypass, "~> 2.1", only: :test},
-      {:mox, "~> 1.0.0", only: :test},
+      {:mox, "~> 1.1", only: :test},
       # Mint is used by our HttpStream shared component, so we add an explicity dependency
       {:mint, "~> 1.2"},
       # Finch is used for built-in streaming
diff --git a/apps/transport/lib/jobs/dataset_history_job.ex b/apps/transport/lib/jobs/dataset_history_job.ex
index d047406e1e..e350958bce 100644
--- a/apps/transport/lib/jobs/dataset_history_job.ex
+++ b/apps/transport/lib/jobs/dataset_history_job.ex
@@ -2,7 +2,7 @@ defmodule Transport.Jobs.DatasetHistoryDispatcherJob do
   @moduledoc """
   Job in charge of dispatching multiple `DatasetHistoryJob`
   """
-  use Oban.Worker, unique: [period: 60 * 60 * 20], tags: ["history"], max_attempts: 3
+  use Oban.Worker, unique: [period: {20, :hours}], tags: ["history"], max_attempts: 3
   require Logger
   import Ecto.Query
 
@@ -24,7 +24,7 @@ defmodule Transport.Jobs.DatasetHistoryJob do
   Job historicising a single dataset
   """
   use Oban.Worker,
-    unique: [period: 60 * 60 * 20, fields: [:args, :queue, :worker]],
+    unique: [period: {20, :hours}, fields: [:args, :queue, :worker]],
     tags: ["history"],
     max_attempts: 3
 
diff --git a/apps/transport/lib/jobs/dataset_quality_score.ex b/apps/transport/lib/jobs/dataset_quality_score.ex
index 1f6c8f7acd..e972fd2ad4 100644
--- a/apps/transport/lib/jobs/dataset_quality_score.ex
+++ b/apps/transport/lib/jobs/dataset_quality_score.ex
@@ -2,7 +2,7 @@ defmodule Transport.Jobs.DatasetQualityScoreDispatcher do
   @moduledoc """
   Computes quality scores for a dataset
   """
-  use Oban.Worker, unique: [period: 60 * 60 * 20], max_attempts: 1
+  use Oban.Worker, unique: [period: {20, :hours}], max_attempts: 1
   import Ecto.Query
 
   @impl Oban.Worker
@@ -21,7 +21,7 @@ defmodule Transport.Jobs.DatasetQualityScore do
   @moduledoc """
   Computes quality scores for a dataset
   """
-  use Oban.Worker, unique: [period: 60 * 60 * 20], max_attempts: 1
+  use Oban.Worker, unique: [period: {20, :hours}], max_attempts: 1
   import Ecto.Query
 
   @type compute_score_fn :: (integer() -> %{score: nil | float(), details: map()})
diff --git a/apps/transport/lib/jobs/dedupe_history_job.ex b/apps/transport/lib/jobs/dedupe_history_job.ex
index 0b97d5a90d..3822f35559 100644
--- a/apps/transport/lib/jobs/dedupe_history_job.ex
+++ b/apps/transport/lib/jobs/dedupe_history_job.ex
@@ -30,7 +30,7 @@ defmodule Transport.Jobs.DedupeHistoryJob do
   @moduledoc """
   Job removing duplicates for a specific datagouv_id.
   """
-  use Oban.Worker, unique: [period: 60 * 60, fields: [:args, :worker]], tags: ["history"], max_attempts: 3
+  use Oban.Worker, unique: [period: {1, :hour}, fields: [:args, :worker]], tags: ["history"], max_attempts: 3
   require Logger
   import Ecto.Query
   alias DB.{Repo, ResourceHistory}
diff --git a/apps/transport/lib/jobs/periodic_reminder_producers_notification_job.ex b/apps/transport/lib/jobs/periodic_reminder_producers_notification_job.ex
index bcf476e182..4a2a0f64ba 100644
--- a/apps/transport/lib/jobs/periodic_reminder_producers_notification_job.ex
+++ b/apps/transport/lib/jobs/periodic_reminder_producers_notification_job.ex
@@ -16,7 +16,7 @@ defmodule Transport.Jobs.PeriodicReminderProducersNotificationJob do
   @notification_reason DB.NotificationSubscription.reason(:periodic_reminder_producers)
 
   use Oban.Worker,
-    unique: [period: 60 * 60 * 24 * @min_days_before_sending_again],
+    unique: [period: {@min_days_before_sending_again, :days}],
     max_attempts: 3,
     tags: ["notifications"]
 
diff --git a/apps/transport/lib/jobs/resource_history_job.ex b/apps/transport/lib/jobs/resource_history_job.ex
index c130059afe..1540c4f0dd 100644
--- a/apps/transport/lib/jobs/resource_history_job.ex
+++ b/apps/transport/lib/jobs/resource_history_job.ex
@@ -2,7 +2,7 @@ defmodule Transport.Jobs.ResourceHistoryAndValidationDispatcherJob do
   @moduledoc """
   Job in charge of dispatching multiple `ResourceHistoryJob`
   """
-  use Oban.Worker, unique: [period: 60 * 60 * 5], tags: ["history"], max_attempts: 5
+  use Oban.Worker, unique: [period: {5, :hours}], tags: ["history"], max_attempts: 5
   require Logger
   import Ecto.Query
   alias DB.{Dataset, Repo, Resource}
@@ -45,7 +45,7 @@ defmodule Transport.Jobs.ResourceHistoryJob do
   @moduledoc """
   Job historicising a single resource
   """
-  use Oban.Worker, unique: [period: 60 * 60 * 5, fields: [:args, :queue, :worker]], tags: ["history"], max_attempts: 5
+  use Oban.Worker, unique: [period: {5, :hours}, fields: [:args, :queue, :worker]], tags: ["history"], max_attempts: 5
   require Logger
   import Ecto.Query
   alias Transport.Shared.Schemas.Wrapper, as: Schemas
diff --git a/apps/transport/lib/jobs/resource_unavailable_job.ex b/apps/transport/lib/jobs/resource_unavailable_job.ex
index 8746373dfe..fffe431d1f 100644
--- a/apps/transport/lib/jobs/resource_unavailable_job.ex
+++ b/apps/transport/lib/jobs/resource_unavailable_job.ex
@@ -48,7 +48,7 @@ defmodule Transport.Jobs.ResourceUnavailableJob do
   - is_available (if the availability of the resource changes)
   - url (if lastest_url points to a new URL)
   """
-  use Oban.Worker, unique: [period: 60 * 9], max_attempts: 5
+  use Oban.Worker, unique: [period: {9, :minutes}], max_attempts: 5
   require Logger
   alias DB.{Repo, Resource, ResourceUnavailability}
 
diff --git a/apps/transport/mix.exs b/apps/transport/mix.exs
index 9e9037d450..75ccb1f1e5 100644
--- a/apps/transport/mix.exs
+++ b/apps/transport/mix.exs
@@ -94,7 +94,7 @@ defmodule Transport.Mixfile do
       {:phoenix_ecto, "~> 4.0"},
       {:sizeable, "~> 1.0"},
       {:plug_canonical_host, "~> 2.0"},
-      {:mox, "~> 1.0.0", only: :test},
+      {:mox, "~> 1.1", only: :test},
       # temporary fix until https://github.com/jayjun/rambo/pull/13 is merged
       # see https://github.com/etalab/transport-site/issues/2520.
       # Not perfect since this will impact `mix.lock`
diff --git a/apps/transport/priv/gettext/en/LC_MESSAGES/page-index.po b/apps/transport/priv/gettext/en/LC_MESSAGES/page-index.po
index 1755996f62..c3dec2f0d9 100644
--- a/apps/transport/priv/gettext/en/LC_MESSAGES/page-index.po
+++ b/apps/transport/priv/gettext/en/LC_MESSAGES/page-index.po
@@ -56,7 +56,7 @@ msgstr ""
 msgid "Public transport - realtime traffic"
 msgstr ""
 
-#, elixir-format
+#, elixir-format, elixir-autogen
 msgid "dataset"
 msgid_plural "datasets"
 msgstr[0] "%{count} dataset"
diff --git a/apps/transport/priv/gettext/en/LC_MESSAGES/page-shortlist.po b/apps/transport/priv/gettext/en/LC_MESSAGES/page-shortlist.po
index e8cf9e3d79..4308049462 100644
--- a/apps/transport/priv/gettext/en/LC_MESSAGES/page-shortlist.po
+++ b/apps/transport/priv/gettext/en/LC_MESSAGES/page-shortlist.po
@@ -206,7 +206,7 @@ msgstr ""
 msgid "region"
 msgstr ""
 
-#, elixir-format
+#, elixir-format, elixir-autogen
 msgid "result"
 msgid_plural "results"
 msgstr[0] ""
diff --git a/apps/transport/priv/gettext/en/LC_MESSAGES/validations.po b/apps/transport/priv/gettext/en/LC_MESSAGES/validations.po
index 83a255b686..9836d3f583 100644
--- a/apps/transport/priv/gettext/en/LC_MESSAGES/validations.po
+++ b/apps/transport/priv/gettext/en/LC_MESSAGES/validations.po
@@ -38,13 +38,13 @@ msgstr ""
 msgid "Nice work, there are no issues!"
 msgstr ""
 
-#, elixir-format
+#, elixir-format, elixir-autogen
 msgid "network"
 msgid_plural "networks"
 msgstr[0] ""
 msgstr[1] ""
 
-#, elixir-format
+#, elixir-format, elixir-autogen
 msgid "transport mode"
 msgid_plural "transport modes"
 msgstr[0] ""
@@ -107,7 +107,7 @@ msgstr ""
 msgid "This resource is also available in the following formats:"
 msgstr ""
 
-#, elixir-format
+#, elixir-format, elixir-autogen
 msgctxt "errors"
 msgid "error"
 msgid_plural "errors"
@@ -186,7 +186,7 @@ msgstr ""
 msgid "Warnings"
 msgstr ""
 
-#, elixir-format, ex-autogen, fuzzy
+#, elixir-format, elixir-autogen, fuzzy
 msgctxt "warnings"
 msgid "warning"
 msgid_plural "warnings"
diff --git a/apps/transport/priv/gettext/fr/LC_MESSAGES/page-index.po b/apps/transport/priv/gettext/fr/LC_MESSAGES/page-index.po
index b43250b2e9..ca7234566e 100644
--- a/apps/transport/priv/gettext/fr/LC_MESSAGES/page-index.po
+++ b/apps/transport/priv/gettext/fr/LC_MESSAGES/page-index.po
@@ -56,7 +56,7 @@ msgstr "Autocars longue distance"
 msgid "Public transport - realtime traffic"
 msgstr "Transport public collectif - horaires temps réel"
 
-#, elixir-format
+#, elixir-format, elixir-autogen
 msgid "dataset"
 msgid_plural "datasets"
 msgstr[0] "%{count} jeu de données"
diff --git a/apps/transport/priv/gettext/fr/LC_MESSAGES/page-shortlist.po b/apps/transport/priv/gettext/fr/LC_MESSAGES/page-shortlist.po
index 053888bb73..fe31fec2f9 100644
--- a/apps/transport/priv/gettext/fr/LC_MESSAGES/page-shortlist.po
+++ b/apps/transport/priv/gettext/fr/LC_MESSAGES/page-shortlist.po
@@ -206,7 +206,7 @@ msgstr "créé le"
 msgid "region"
 msgstr "région"
 
-#, elixir-format
+#, elixir-format, elixir-autogen
 msgid "result"
 msgid_plural "results"
 msgstr[0] "résultat"
diff --git a/apps/transport/priv/gettext/fr/LC_MESSAGES/validations.po b/apps/transport/priv/gettext/fr/LC_MESSAGES/validations.po
index 4105942455..1dad6e0722 100644
--- a/apps/transport/priv/gettext/fr/LC_MESSAGES/validations.po
+++ b/apps/transport/priv/gettext/fr/LC_MESSAGES/validations.po
@@ -38,13 +38,13 @@ msgstr "ce lien permanent"
 msgid "Nice work, there are no issues!"
 msgstr "Félicitations, aucune erreur n'a été trouvée !"
 
-#, elixir-format
+#, elixir-format, elixir-autogen
 msgid "network"
 msgid_plural "networks"
 msgstr[0] "réseau"
 msgstr[1] "réseaux"
 
-#, elixir-format
+#, elixir-format, elixir-autogen
 msgid "transport mode"
 msgid_plural "transport modes"
 msgstr[0] "mode de transport"
@@ -107,7 +107,7 @@ msgstr "Le format GeoJSON ne contient que les informations géographiques de la
 msgid "This resource is also available in the following formats:"
 msgstr "Cette ressource est également disponible dans les formats suivants :"
 
-#, elixir-format
+#, elixir-format, elixir-autogen
 msgctxt "errors"
 msgid "error"
 msgid_plural "errors"
@@ -186,7 +186,7 @@ msgstr "Validation effectuée en utilisant <a href=\"%{gtfs_link}\">le fichier G
 msgid "Warnings"
 msgstr "Avertissements"
 
-#, elixir-format, ex-autogen, fuzzy
+#, elixir-format, elixir-autogen, fuzzy
 msgctxt "warnings"
 msgid "warning"
 msgid_plural "warnings"
diff --git a/apps/transport/priv/gettext/page-index.pot b/apps/transport/priv/gettext/page-index.pot
index 0a866d3e37..4828ff7432 100644
--- a/apps/transport/priv/gettext/page-index.pot
+++ b/apps/transport/priv/gettext/page-index.pot
@@ -56,7 +56,7 @@ msgstr ""
 msgid "Public transport - realtime traffic"
 msgstr ""
 
-#, elixir-format
+#, elixir-format, elixir-autogen
 msgid "dataset"
 msgid_plural "datasets"
 msgstr[0] ""
diff --git a/apps/transport/priv/gettext/page-shortlist.pot b/apps/transport/priv/gettext/page-shortlist.pot
index 2bcba79246..c754859e1c 100644
--- a/apps/transport/priv/gettext/page-shortlist.pot
+++ b/apps/transport/priv/gettext/page-shortlist.pot
@@ -206,7 +206,7 @@ msgstr ""
 msgid "region"
 msgstr ""
 
-#, elixir-format
+#, elixir-format, elixir-autogen
 msgid "result"
 msgid_plural "results"
 msgstr[0] ""
diff --git a/apps/transport/priv/gettext/validations.pot b/apps/transport/priv/gettext/validations.pot
index 27035758e8..302ce7a0b0 100644
--- a/apps/transport/priv/gettext/validations.pot
+++ b/apps/transport/priv/gettext/validations.pot
@@ -38,13 +38,13 @@ msgstr ""
 msgid "Nice work, there are no issues!"
 msgstr ""
 
-#, elixir-format
+#, elixir-format, elixir-autogen
 msgid "network"
 msgid_plural "networks"
 msgstr[0] ""
 msgstr[1] ""
 
-#, elixir-format
+#, elixir-format, elixir-autogen
 msgid "transport mode"
 msgid_plural "transport modes"
 msgstr[0] ""
@@ -106,7 +106,7 @@ msgstr ""
 msgid "This resource is also available in the following formats:"
 msgstr ""
 
-#, elixir-format
+#, elixir-format, elixir-autogen
 msgctxt "errors"
 msgid "error"
 msgid_plural "errors"
@@ -185,7 +185,7 @@ msgstr ""
 msgid "Warnings"
 msgstr ""
 
-#, elixir-format, ex-autogen
+#, elixir-format, elixir-autogen
 msgctxt "warnings"
 msgid "warning"
 msgid_plural "warnings"
diff --git a/apps/unlock/mix.exs b/apps/unlock/mix.exs
index df266696d1..4cb28a0395 100644
--- a/apps/unlock/mix.exs
+++ b/apps/unlock/mix.exs
@@ -46,7 +46,7 @@ defmodule Unlock.MixProject do
       {:cachex, "~> 3.5"},
       {:cors_plug, "~> 3.0"},
       {:saxy, "~> 1.5"},
-      {:mox, "~> 1.0.0", only: :test},
+      {:mox, "~> 1.1", only: :test},
       {:ymlr, "~> 4.0", only: :test},
       {:ecto, "~> 3.7", only: :test},
       # required for `TransportWeb.Plugs.AppSignalFilter`
diff --git a/config/runtime.exs b/config/runtime.exs
index cfc9e6d020..a21feb0607 100644
--- a/config/runtime.exs
+++ b/config/runtime.exs
@@ -89,7 +89,7 @@ if app_env == :staging do
     }
 end
 
-base_oban_conf = [repo: DB.Repo]
+base_oban_conf = [repo: DB.Repo, insert_trigger: false]
 
 # Oban jobs that should run in every deployed environment (staging, prod)
 # but not during dev or test.
diff --git a/mix.lock b/mix.lock
index 47555dc179..44eb2269ce 100644
--- a/mix.lock
+++ b/mix.lock
@@ -1,13 +1,13 @@
 %{
-  "appsignal": {:hex, :appsignal, "2.7.10", "974528d45384b3d1928c859672da9e3a0ad1936f43fdcdefbc647fb3785089ed", [:make, :mix], [{:decimal, "~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:decorator, "~> 1.2.3 or ~> 1.3", [hex: :decorator, repo: "hexpm", optional: false]}, {:hackney, "~> 1.6", [hex: :hackney, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:poison, ">= 1.3.0", [hex: :poison, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "1a3ce18e37d97314320347a5e6a99704342bda3ce22092e1e4ba82b118bb34f3"},
+  "appsignal": {:hex, :appsignal, "2.8.0", "7d7c0c4a2d57ebbf4aaa9ba50483712feed302d9545f9743eb1c921c8a114997", [:make, :mix], [{:decimal, "~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:decorator, "~> 1.2.3 or ~> 1.3", [hex: :decorator, repo: "hexpm", optional: false]}, {:hackney, "~> 1.6", [hex: :hackney, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "d6dfe14553caae7cb38c690ca4a9f5f298df80240c19120f166a9ac30bfb0cce"},
   "appsignal_phoenix": {:hex, :appsignal_phoenix, "2.3.4", "c83a8e15a51456db7d722a21bfe9a45e23618b550219caa8fb6d4853f61b5734", [:mix], [{:appsignal, ">= 2.7.6 and < 3.0.0", [hex: :appsignal, repo: "hexpm", optional: false]}, {:appsignal_plug, ">= 2.0.15 and < 3.0.0", [hex: :appsignal_plug, repo: "hexpm", optional: false]}, {:phoenix, "~> 1.4", [hex: :phoenix, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 2.11 or ~> 3.0", [hex: :phoenix_html, repo: "hexpm", optional: true]}, {:phoenix_live_view, "~> 0.9", [hex: :phoenix_live_view, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "1ca040fbfa653bdda25735031d8b89c81ebb50c475bc35d5ac0e13236e5f6600"},
   "appsignal_plug": {:hex, :appsignal_plug, "2.0.15", "758a8a78944878e8461bbc77ca86219121a56f4299c6d79940ab083cf9afea00", [:mix], [{:appsignal, ">= 2.7.6 and < 3.0.0", [hex: :appsignal, repo: "hexpm", optional: false]}, {:plug, ">= 1.1.0", [hex: :plug, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "1c6059049e2081e808aaef04e2b9917e06277f61a35a0e103db860d08cbc41f1"},
   "bunt": {:hex, :bunt, "0.2.1", "e2d4792f7bc0ced7583ab54922808919518d0e57ee162901a16a1b6664ef3b14", [:mix], [], "hexpm", "a330bfb4245239787b15005e66ae6845c9cd524a288f0d141c148b02603777a5"},
   "bypass": {:hex, :bypass, "2.1.0", "909782781bf8e20ee86a9cabde36b259d44af8b9f38756173e8f5e2e1fabb9b1", [:mix], [{:plug, "~> 1.7", [hex: :plug, repo: "hexpm", optional: false]}, {:plug_cowboy, "~> 2.0", [hex: :plug_cowboy, repo: "hexpm", optional: false]}, {:ranch, "~> 1.3", [hex: :ranch, repo: "hexpm", optional: false]}], "hexpm", "d9b5df8fa5b7a6efa08384e9bbecfe4ce61c77d28a4282f79e02f1ef78d96b80"},
   "cachex": {:hex, :cachex, "3.6.0", "14a1bfbeee060dd9bec25a5b6f4e4691e3670ebda28c8ba2884b12fe30b36bf8", [:mix], [{:eternal, "~> 1.2", [hex: :eternal, repo: "hexpm", optional: false]}, {:jumper, "~> 1.0", [hex: :jumper, repo: "hexpm", optional: false]}, {:sleeplocks, "~> 1.1", [hex: :sleeplocks, repo: "hexpm", optional: false]}, {:unsafe, "~> 1.0", [hex: :unsafe, repo: "hexpm", optional: false]}], "hexpm", "ebf24e373883bc8e0c8d894a63bbe102ae13d918f790121f5cfe6e485cc8e2e2"},
-  "castore": {:hex, :castore, "1.0.4", "ff4d0fb2e6411c0479b1d965a814ea6d00e51eb2f58697446e9c41a97d940b28", [:mix], [], "hexpm", "9418c1b8144e11656f0be99943db4caf04612e3eaecefb5dae9a2a87565584f8"},
+  "castore": {:hex, :castore, "1.0.5", "9eeebb394cc9a0f3ae56b813459f990abb0a3dedee1be6b27fdb50301930502f", [:mix], [], "hexpm", "8d7c597c3e4a64c395980882d4bca3cebb8d74197c590dc272cfd3b6a6310578"},
   "certifi": {:hex, :certifi, "2.12.0", "2d1cca2ec95f59643862af91f001478c9863c2ac9cb6e2f89780bfd8de987329", [:rebar3], [], "hexpm", "ee68d85df22e554040cdb4be100f33873ac6051387baf6a8f6ce82272340ff1c"},
-  "cldr_utils": {:hex, :cldr_utils, "2.24.1", "5ff8c8c55f96666228827bcf85a23d632022def200566346545d01d15e4c30dc", [:mix], [{:castore, "~> 0.1 or ~> 1.0", [hex: :castore, repo: "hexpm", optional: true]}, {:certifi, "~> 2.5", [hex: :certifi, repo: "hexpm", optional: true]}, {:decimal, "~> 1.9 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}], "hexpm", "1820300531b5b849d0bc468e5a87cd64f8f2c5191916f548cbe69b2efc203780"},
+  "cldr_utils": {:hex, :cldr_utils, "2.24.2", "364fa30be55d328e704629568d431eb74cd2f085752b27f8025520b566352859", [:mix], [{:castore, "~> 0.1 or ~> 1.0", [hex: :castore, repo: "hexpm", optional: true]}, {:certifi, "~> 2.5", [hex: :certifi, repo: "hexpm", optional: true]}, {:decimal, "~> 1.9 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}], "hexpm", "3362b838836a9f0fa309de09a7127e36e67310e797d556db92f71b548832c7cf"},
   "cloak": {:hex, :cloak, "1.1.2", "7e0006c2b0b98d976d4f559080fabefd81f0e0a50a3c4b621f85ceeb563e80bb", [:mix], [{:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "940d5ac4fcd51b252930fd112e319ea5ae6ab540b722f3ca60a85666759b9585"},
   "cloak_ecto": {:hex, :cloak_ecto, "1.2.0", "e86a3df3bf0dc8980f70406bcb0af2858bac247d55494d40bc58a152590bd402", [:mix], [{:cloak, "~> 1.1.1", [hex: :cloak, repo: "hexpm", optional: false]}, {:ecto, "~> 3.0", [hex: :ecto, repo: "hexpm", optional: false]}], "hexpm", "8bcc677185c813fe64b786618bd6689b1707b35cd95acaae0834557b15a0c62f"},
   "combine": {:hex, :combine, "0.10.0", "eff8224eeb56498a2af13011d142c5e7997a80c8f5b97c499f84c841032e429f", [:mix], [], "hexpm", "1b1dbc1790073076580d0d1d64e42eae2366583e7aecd455d1215b0d16f2451b"},
@@ -18,7 +18,7 @@
   "cowlib": {:hex, :cowlib, "2.12.1", "a9fa9a625f1d2025fe6b462cb865881329b5caff8f1854d1cbc9f9533f00e1e1", [:make, :rebar3], [], "hexpm", "163b73f6367a7341b33c794c4e88e7dbfe6498ac42dcd69ef44c5bc5507c8db0"},
   "credo": {:hex, :credo, "1.7.1", "6e26bbcc9e22eefbff7e43188e69924e78818e2fe6282487d0703652bc20fd62", [:mix], [{:bunt, "~> 0.2.1", [hex: :bunt, repo: "hexpm", optional: false]}, {:file_system, "~> 0.2.8", [hex: :file_system, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "e9871c6095a4c0381c89b6aa98bc6260a8ba6addccf7f6a53da8849c748a58a2"},
   "crontab": {:hex, :crontab, "1.1.13", "3bad04f050b9f7f1c237809e42223999c150656a6b2afbbfef597d56df2144c5", [:mix], [{:ecto, "~> 1.0 or ~> 2.0 or ~> 3.0", [hex: :ecto, repo: "hexpm", optional: true]}], "hexpm", "d67441bec989640e3afb94e123f45a2bc42d76e02988c9613885dc3d01cf7085"},
-  "csv": {:hex, :csv, "3.2.0", "dc8a2eb99a6570bf0dee26f66db99812d092f0903dc53b4748540ef524231159", [:mix], [], "hexpm", "f5ee7299a55ff84fbe623d9aea7218b800d19ecccb2b3eac2bcb327d644365ea"},
+  "csv": {:hex, :csv, "3.2.1", "6d401f1ed33acb2627682a9ab6021e96d33ca6c1c6bccc243d8f7e2197d032f5", [:mix], [], "hexpm", "8f55a0524923ae49e97ff2642122a2ce7c61e159e7fe1184670b2ce847aee6c8"},
   "db_connection": {:hex, :db_connection, "2.6.0", "77d835c472b5b67fc4f29556dee74bf511bbafecdcaf98c27d27fa5918152086", [:mix], [{:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "c2f992d15725e721ec7fbc1189d4ecdb8afef76648c746a8e1cad35e3b8a35f3"},
   "decimal": {:hex, :decimal, "2.1.1", "5611dca5d4b2c3dd497dec8f68751f1f1a54755e8ed2a966c2633cf885973ad6", [:mix], [], "hexpm", "53cfe5f497ed0e7771ae1a475575603d77425099ba5faef9394932b35020ffcc"},
   "decorator": {:hex, :decorator, "1.4.0", "a57ac32c823ea7e4e67f5af56412d12b33274661bb7640ec7fc882f8d23ac419", [:mix], [], "hexpm", "0a07cedd9083da875c7418dea95b78361197cf2bf3211d743f6f7ce39656597f"},
@@ -26,65 +26,65 @@
   "digital_token": {:hex, :digital_token, "0.6.0", "13e6de581f0b1f6c686f7c7d12ab11a84a7b22fa79adeb4b50eec1a2d278d258", [:mix], [{:cldr_utils, "~> 2.17", [hex: :cldr_utils, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "2455d626e7c61a128b02a4a8caddb092548c3eb613ac6f6a85e4cbb6caddc4d1"},
   "earmark": {:hex, :earmark, "1.4.46", "8c7287bd3137e99d26ae4643e5b7ef2129a260e3dcf41f251750cb4563c8fb81", [:mix], [], "hexpm", "798d86db3d79964e759ddc0c077d5eb254968ed426399fbf5a62de2b5ff8910a"},
   "earmark_parser": {:hex, :earmark_parser, "1.4.33", "3c3fd9673bb5dcc9edc28dd90f50c87ce506d1f71b70e3de69aa8154bc695d44", [:mix], [], "hexpm", "2d526833729b59b9fdb85785078697c72ac5e5066350663e5be6a1182da61b8f"},
-  "ecto": {:hex, :ecto, "3.10.3", "eb2ae2eecd210b4eb8bece1217b297ad4ff824b4384c0e3fdd28aaf96edd6135", [:mix], [{:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "44bec74e2364d491d70f7e42cd0d690922659d329f6465e89feb8a34e8cd3433"},
+  "ecto": {:hex, :ecto, "3.11.1", "4b4972b717e7ca83d30121b12998f5fcdc62ba0ed4f20fd390f16f3270d85c3e", [:mix], [{:decimal, "~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "ebd3d3772cd0dfcd8d772659e41ed527c28b2a8bde4b00fe03e0463da0f1983b"},
   "ecto_erd": {:hex, :ecto_erd, "0.5.1", "a7bab3428b7b586d7e4a7d7182d79e129a92b1b404f72eac49f493b141aa88bc", [:mix], [{:ecto, "~> 3.3", [hex: :ecto, repo: "hexpm", optional: false]}, {:html_entities, "~> 0.5", [hex: :html_entities, repo: "hexpm", optional: false]}], "hexpm", "d38d84f5f3ef0489cdb2a21d41ea35615f47afd1d5f42ee9ff4727b323de51b2"},
   "ecto_interval": {:hex, :ecto_interval, "0.2.5", "4169ffc2c212a56aa5a73998788f9aa1f90e4d45c76cccc67bf37f65a70cb83e", [:mix], [{:ecto, "~> 3.0", [hex: :ecto, repo: "hexpm", optional: true]}, {:phoenix_html, "~> 3.0", [hex: :phoenix_html, repo: "hexpm", optional: true]}, {:postgrex, "~> 0.14.0 or ~> 0.15.0 or ~> 0.16.0", [hex: :postgrex, repo: "hexpm", optional: true]}], "hexpm", "70802ffb4941724d90846efa326b92ff32e50d59cec3b97b6a12c93229a823a6"},
   "ecto_psql_extras": {:hex, :ecto_psql_extras, "0.7.14", "7a20cfe913b0476542b43870e67386461258734896035e3f284039fd18bd4c4c", [:mix], [{:ecto_sql, "~> 3.7", [hex: :ecto_sql, repo: "hexpm", optional: false]}, {:postgrex, "~> 0.16.0 or ~> 0.17.0", [hex: :postgrex, repo: "hexpm", optional: false]}, {:table_rex, "~> 3.1.1", [hex: :table_rex, repo: "hexpm", optional: false]}], "hexpm", "22f5f98592dd597db9416fcef00effae0787669fdcb6faf447e982b553798e98"},
-  "ecto_sql": {:hex, :ecto_sql, "3.10.2", "6b98b46534b5c2f8b8b5f03f126e75e2a73c64f3c071149d32987a5378b0fdbd", [:mix], [{:db_connection, "~> 2.4.1 or ~> 2.5", [hex: :db_connection, repo: "hexpm", optional: false]}, {:ecto, "~> 3.10.0", [hex: :ecto, repo: "hexpm", optional: false]}, {:myxql, "~> 0.6.0", [hex: :myxql, repo: "hexpm", optional: true]}, {:postgrex, "~> 0.16.0 or ~> 0.17.0 or ~> 1.0", [hex: :postgrex, repo: "hexpm", optional: true]}, {:tds, "~> 2.1.1 or ~> 2.2", [hex: :tds, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4.0 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "68c018debca57cb9235e3889affdaec7a10616a4e3a80c99fa1d01fdafaa9007"},
+  "ecto_sql": {:hex, :ecto_sql, "3.11.1", "e9abf28ae27ef3916b43545f9578b4750956ccea444853606472089e7d169470", [:mix], [{:db_connection, "~> 2.4.1 or ~> 2.5", [hex: :db_connection, repo: "hexpm", optional: false]}, {:ecto, "~> 3.11.0", [hex: :ecto, repo: "hexpm", optional: false]}, {:myxql, "~> 0.6.0", [hex: :myxql, repo: "hexpm", optional: true]}, {:postgrex, "~> 0.16.0 or ~> 0.17.0 or ~> 1.0", [hex: :postgrex, repo: "hexpm", optional: true]}, {:tds, "~> 2.1.1 or ~> 2.2", [hex: :tds, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4.0 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "ce14063ab3514424276e7e360108ad6c2308f6d88164a076aac8a387e1fea634"},
   "erlex": {:hex, :erlex, "0.2.6", "c7987d15e899c7a2f34f5420d2a2ea0d659682c06ac607572df55a43753aa12e", [:mix], [], "hexpm", "2ed2e25711feb44d52b17d2780eabf998452f6efda104877a3881c2f8c0c0c75"},
   "etag_plug": {:hex, :etag_plug, "1.0.0", "2252e16ac5da6bc5367907437bd760740bb209a7e73e821b756f6c9ea808d210", [:mix], [{:plug, "~> 1.0", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "fcde90c1f7fa20c624036d4b5e023714f7945031bc8bcf03d1ec43bf462800c1"},
   "eternal": {:hex, :eternal, "1.2.2", "d1641c86368de99375b98d183042dd6c2b234262b8d08dfd72b9eeaafc2a1abd", [:mix], [], "hexpm", "2c9fe32b9c3726703ba5e1d43a1d255a4f3f2d8f8f9bc19f094c7cb1a7a9e782"},
   "ex_aws": {:hex, :ex_aws, "2.5.0", "1785e69350b16514c1049330537c7da10039b1a53e1d253bbd703b135174aec3", [:mix], [{:configparser_ex, "~> 4.0", [hex: :configparser_ex, repo: "hexpm", optional: true]}, {:hackney, "~> 1.16", [hex: :hackney, repo: "hexpm", optional: true]}, {:jason, "~> 1.1", [hex: :jason, repo: "hexpm", optional: true]}, {:jsx, "~> 2.8 or ~> 3.0", [hex: :jsx, repo: "hexpm", optional: true]}, {:mime, "~> 1.2 or ~> 2.0", [hex: :mime, repo: "hexpm", optional: false]}, {:sweet_xml, "~> 0.7", [hex: :sweet_xml, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4.3 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "971b86e5495fc0ae1c318e35e23f389e74cf322f2c02d34037c6fc6d405006f1"},
   "ex_aws_s3": {:hex, :ex_aws_s3, "2.5.2", "cee302b8e9ee198cc0d89f1de2a7d6a8921e1a556574476cf5590d2156590fe3", [:mix], [{:ex_aws, "~> 2.0", [hex: :ex_aws, repo: "hexpm", optional: false]}, {:sweet_xml, ">= 0.0.0", [hex: :sweet_xml, repo: "hexpm", optional: true]}], "hexpm", "cc5bd945a22a99eece4721d734ae2452d3717e81c357a781c8574663254df4a1"},
-  "ex_cldr": {:hex, :ex_cldr, "2.37.4", "3e2c04d9c691a75a8b7e808dfcbacedb9cdf3e73f819d1b4174f8f065e5f29c1", [:mix], [{:cldr_utils, "~> 2.21", [hex: :cldr_utils, repo: "hexpm", optional: false]}, {:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:gettext, "~> 0.19", [hex: :gettext, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:nimble_parsec, "~> 0.5 or ~> 1.0", [hex: :nimble_parsec, repo: "hexpm", optional: true]}], "hexpm", "2bcb5de0095324ba645b4e156bf346add156d8b928f0ffd985c61664d981ad3d"},
-  "ex_cldr_currencies": {:hex, :ex_cldr_currencies, "2.15.0", "aadd34e91cfac7ef6b03fe8f47f8c6fa8c5daf3f89b5d9fee64ec545ded839cf", [:mix], [{:ex_cldr, "~> 2.34", [hex: :ex_cldr, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "0521316396c66877a2d636219767560bb2397c583341fcb154ecf9f3000e6ff8"},
-  "ex_cldr_numbers": {:hex, :ex_cldr_numbers, "2.32.2", "5e0e3031d3f54b51fe7078a7a94592987b70b06d631bdc88813b222dc5a8b1bd", [:mix], [{:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:digital_token, "~> 0.3 or ~> 1.0", [hex: :digital_token, repo: "hexpm", optional: false]}, {:ex_cldr, "~> 2.37", [hex: :ex_cldr, repo: "hexpm", optional: false]}, {:ex_cldr_currencies, ">= 2.14.2", [hex: :ex_cldr_currencies, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "91257684a9c4d6abdf738f0cc5671837de876e69552e8bd4bc5fa1bfd5817713"},
-  "ex_json_schema": {:hex, :ex_json_schema, "0.10.1", "e03b746b6675a750c0bb1a5cc919f61353f7ab8450977e11ceede20e6180c560", [:mix], [{:decimal, "~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}], "hexpm", "66a64e60dadad89914d92f89c7e7906c57de75a8b79ac2480d0d53e1b8096fb0"},
+  "ex_cldr": {:hex, :ex_cldr, "2.37.5", "9da6d97334035b961d2c2de167dc6af8cd3e09859301a5b8f49f90bd8b034593", [:mix], [{:cldr_utils, "~> 2.21", [hex: :cldr_utils, repo: "hexpm", optional: false]}, {:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:gettext, "~> 0.19", [hex: :gettext, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:nimble_parsec, "~> 0.5 or ~> 1.0", [hex: :nimble_parsec, repo: "hexpm", optional: true]}], "hexpm", "74ad5ddff791112ce4156382e171a5f5d3766af9d5c4675e0571f081fe136479"},
+  "ex_cldr_currencies": {:hex, :ex_cldr_currencies, "2.15.1", "e92ba17c41e7405b7784e0e65f406b5f17cfe313e0e70de9befd653e12854822", [:mix], [{:ex_cldr, "~> 2.34", [hex: :ex_cldr, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "31df8bd37688340f8819bdd770eb17d659652078d34db632b85d4a32864d6a25"},
+  "ex_cldr_numbers": {:hex, :ex_cldr_numbers, "2.32.3", "b631ff94c982ec518e46bf4736000a30a33d6b58facc085d5f240305f512ad4a", [:mix], [{:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:digital_token, "~> 0.3 or ~> 1.0", [hex: :digital_token, repo: "hexpm", optional: false]}, {:ex_cldr, "~> 2.37", [hex: :ex_cldr, repo: "hexpm", optional: false]}, {:ex_cldr_currencies, ">= 2.14.2", [hex: :ex_cldr_currencies, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "7b626ff1e59a0ec9c3c5db5ce9ca91a6995e2ab56426b71f3cbf67181ea225f5"},
+  "ex_json_schema": {:hex, :ex_json_schema, "0.10.2", "7c4b8c1481fdeb1741e2ce66223976edfb9bccebc8014f6aec35d4efe964fb71", [:mix], [{:decimal, "~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}], "hexpm", "37f43be60f8407659d4d0155a7e45e7f406dab1f827051d3d35858a709baf6a6"},
   "ex_machina": {:hex, :ex_machina, "2.7.0", "b792cc3127fd0680fecdb6299235b4727a4944a09ff0fa904cc639272cd92dc7", [:mix], [{:ecto, "~> 2.2 or ~> 3.0", [hex: :ecto, repo: "hexpm", optional: true]}, {:ecto_sql, "~> 3.0", [hex: :ecto_sql, repo: "hexpm", optional: true]}], "hexpm", "419aa7a39bde11894c87a615c4ecaa52d8f107bbdd81d810465186f783245bf8"},
   "ex_phone_number": {:hex, :ex_phone_number, "0.4.3", "75767db14d8c6b1d40d49a912ca1e104a38b43e225458a8646d51f86cba2d835", [:mix], [{:sweet_xml, "~> 0.7", [hex: :sweet_xml, repo: "hexpm", optional: false]}], "hexpm", "c14ad189a16ec410c7114eb7848e2ddf9b2a19ebb4e42c17870d0c68d811d972"},
   "exactor": {:hex, :exactor, "2.2.4", "5efb4ddeb2c48d9a1d7c9b465a6fffdd82300eb9618ece5d34c3334d5d7245b1", [:mix], [], "hexpm", "1222419f706e01bfa1095aec9acf6421367dcfab798a6f67c54cf784733cd6b5"},
   "excoveralls": {:hex, :excoveralls, "0.18.0", "b92497e69465dc51bc37a6422226ee690ab437e4c06877e836f1c18daeb35da9", [:mix], [{:castore, "~> 1.0", [hex: :castore, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "1109bb911f3cb583401760be49c02cbbd16aed66ea9509fc5479335d284da60b"},
   "exjsx": {:hex, :exjsx, "4.0.0", "60548841e0212df401e38e63c0078ec57b33e7ea49b032c796ccad8cde794b5c", [:mix], [{:jsx, "~> 2.8.0", [hex: :jsx, repo: "hexpm", optional: false]}], "hexpm", "32e95820a97cffea67830e91514a2ad53b888850442d6d395f53a1ac60c82e07"},
-  "expo": {:hex, :expo, "0.4.1", "1c61d18a5df197dfda38861673d392e642649a9cef7694d2f97a587b2cfb319b", [:mix], [], "hexpm", "2ff7ba7a798c8c543c12550fa0e2cbc81b95d4974c65855d8d15ba7b37a1ce47"},
-  "exvcr": {:hex, :exvcr, "0.14.4", "1aa5fe7d3f10b117251c158f8d28b39f7fc73d0a7628b2d0b75bf8cfb1111576", [:mix], [{:exactor, "~> 2.2", [hex: :exactor, repo: "hexpm", optional: false]}, {:exjsx, "~> 4.0", [hex: :exjsx, repo: "hexpm", optional: false]}, {:finch, "~> 0.16", [hex: :finch, repo: "hexpm", optional: true]}, {:httpoison, "~> 1.0 or ~> 2.0", [hex: :httpoison, repo: "hexpm", optional: true]}, {:httpotion, "~> 3.1", [hex: :httpotion, repo: "hexpm", optional: true]}, {:ibrowse, "4.4.0", [hex: :ibrowse, repo: "hexpm", optional: true]}, {:meck, "~> 0.8", [hex: :meck, repo: "hexpm", optional: false]}], "hexpm", "4e600568c02ed29d46bc2e2c74927d172ba06658aa8b14705c0207363c44cc94"},
+  "expo": {:hex, :expo, "0.5.1", "249e826a897cac48f591deba863b26c16682b43711dd15ee86b92f25eafd96d9", [:mix], [], "hexpm", "68a4233b0658a3d12ee00d27d37d856b1ba48607e7ce20fd376958d0ba6ce92b"},
+  "exvcr": {:hex, :exvcr, "0.15.0", "432a4f4b94494f996c96dd2b9b9d3306b70db269ddbdeb9e324a4371f62ce32d", [:mix], [{:exactor, "~> 2.2", [hex: :exactor, repo: "hexpm", optional: false]}, {:exjsx, "~> 4.0", [hex: :exjsx, repo: "hexpm", optional: false]}, {:finch, "~> 0.16", [hex: :finch, repo: "hexpm", optional: true]}, {:httpoison, "~> 1.0 or ~> 2.0", [hex: :httpoison, repo: "hexpm", optional: true]}, {:httpotion, "~> 3.1", [hex: :httpotion, repo: "hexpm", optional: true]}, {:ibrowse, "4.4.0", [hex: :ibrowse, repo: "hexpm", optional: true]}, {:meck, "~> 0.8", [hex: :meck, repo: "hexpm", optional: false]}], "hexpm", "8b7e451f5fd37d1dc1252d08e55291fcb80b55b00cfd84ea41bf64be23cb142c"},
   "file_system": {:hex, :file_system, "0.2.10", "fb082005a9cd1711c05b5248710f8826b02d7d1784e7c3451f9c1231d4fc162d", [:mix], [], "hexpm", "41195edbfb562a593726eda3b3e8b103a309b733ad25f3d642ba49696bf715dc"},
   "finch": {:hex, :finch, "0.16.0", "40733f02c89f94a112518071c0a91fe86069560f5dbdb39f9150042f44dcfb1a", [:mix], [{:castore, "~> 0.1 or ~> 1.0", [hex: :castore, repo: "hexpm", optional: false]}, {:mime, "~> 1.0 or ~> 2.0", [hex: :mime, repo: "hexpm", optional: false]}, {:mint, "~> 1.3", [hex: :mint, repo: "hexpm", optional: false]}, {:nimble_options, "~> 0.4 or ~> 1.0", [hex: :nimble_options, repo: "hexpm", optional: false]}, {:nimble_pool, "~> 0.2.6 or ~> 1.0", [hex: :nimble_pool, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "f660174c4d519e5fec629016054d60edd822cdfe2b7270836739ac2f97735ec5"},
-  "floki": {:hex, :floki, "0.35.1", "b21cf592ed38c1207c5ea52120a2e81d6ecba11337a633a3f29ec17a64033178", [:mix], [], "hexpm", "f126e3eb814f131c21befeeeb773d2c4e2331ce05214c1a9844a3edde5c69003"},
+  "floki": {:hex, :floki, "0.35.2", "87f8c75ed8654b9635b311774308b2760b47e9a579dabf2e4d5f1e1d42c39e0b", [:mix], [], "hexpm", "6b05289a8e9eac475f644f09c2e4ba7e19201fd002b89c28c1293e7bd16773d9"},
   "fss": {:hex, :fss, "0.1.1", "9db2344dbbb5d555ce442ac7c2f82dd975b605b50d169314a20f08ed21e08642", [:mix], [], "hexpm", "78ad5955c7919c3764065b21144913df7515d52e228c09427a004afe9c1a16b0"},
   "gen_stage": {:hex, :gen_stage, "1.2.1", "19d8b5e9a5996d813b8245338a28246307fd8b9c99d1237de199d21efc4c76a1", [:mix], [], "hexpm", "83e8be657fa05b992ffa6ac1e3af6d57aa50aace8f691fcf696ff02f8335b001"},
   "geo": {:hex, :geo, "3.6.0", "00c9c6338579f67e91cd5950af4ae2eb25cdce0c3398718c232539f61625d0bd", [:mix], [{:jason, "~> 1.4", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "1dbdebf617183b54bc3c8ad7a36531a9a76ada8ca93f75f573b0ae94006168da"},
   "geo_postgis": {:hex, :geo_postgis, "3.5.0", "e3675b6276b8c2166dc20a6fa9d992eb73c665de2b09b666d09c7824dc8a8300", [:mix], [{:ecto, "~> 3.0", [hex: :ecto, repo: "hexpm", optional: true]}, {:geo, "~> 3.5", [hex: :geo, repo: "hexpm", optional: false]}, {:jason, "~> 1.2", [hex: :jason, repo: "hexpm", optional: true]}, {:poison, "~> 2.2 or ~> 3.0 or ~> 4.0 or ~> 5.0", [hex: :poison, repo: "hexpm", optional: true]}, {:postgrex, ">= 0.0.0", [hex: :postgrex, repo: "hexpm", optional: false]}], "hexpm", "0bebc5b00f8b11835066bd6213fbeeec03704b4a1c206920b81c1ec2201d185f"},
-  "gettext": {:hex, :gettext, "0.23.1", "821e619a240e6000db2fc16a574ef68b3bd7fe0167ccc264a81563cc93e67a31", [:mix], [{:expo, "~> 0.4.0", [hex: :expo, repo: "hexpm", optional: false]}], "hexpm", "19d744a36b809d810d610b57c27b934425859d158ebd56561bc41f7eeb8795db"},
+  "gettext": {:hex, :gettext, "0.24.0", "6f4d90ac5f3111673cbefc4ebee96fe5f37a114861ab8c7b7d5b30a1108ce6d8", [:mix], [{:expo, "~> 0.5.1", [hex: :expo, repo: "hexpm", optional: false]}], "hexpm", "bdf75cdfcbe9e4622dd18e034b227d77dd17f0f133853a1c73b97b3d6c770e8b"},
   "hackney": {:hex, :hackney, "1.20.1", "8d97aec62ddddd757d128bfd1df6c5861093419f8f7a4223823537bad5d064e2", [:rebar3], [{:certifi, "~> 2.12.0", [hex: :certifi, repo: "hexpm", optional: false]}, {:idna, "~> 6.1.0", [hex: :idna, repo: "hexpm", optional: false]}, {:metrics, "~> 1.0.0", [hex: :metrics, repo: "hexpm", optional: false]}, {:mimerl, "~> 1.1", [hex: :mimerl, repo: "hexpm", optional: false]}, {:parse_trans, "3.4.1", [hex: :parse_trans, repo: "hexpm", optional: false]}, {:ssl_verify_fun, "~> 1.1.0", [hex: :ssl_verify_fun, repo: "hexpm", optional: false]}, {:unicode_util_compat, "~> 0.7.0", [hex: :unicode_util_compat, repo: "hexpm", optional: false]}], "hexpm", "fe9094e5f1a2a2c0a7d10918fee36bfec0ec2a979994cff8cfe8058cd9af38e3"},
   "hpax": {:hex, :hpax, "0.1.2", "09a75600d9d8bbd064cdd741f21fc06fc1f4cf3d0fcc335e5aa19be1a7235c84", [:mix], [], "hexpm", "2c87843d5a23f5f16748ebe77969880e29809580efdaccd615cd3bed628a8c13"},
   "html_entities": {:hex, :html_entities, "0.5.2", "9e47e70598da7de2a9ff6af8758399251db6dbb7eebe2b013f2bbd2515895c3c", [:mix], [], "hexpm", "c53ba390403485615623b9531e97696f076ed415e8d8058b1dbaa28181f4fdcc"},
   "html_sanitize_ex": {:hex, :html_sanitize_ex, "1.4.3", "67b3d9fa8691b727317e0cc96b9b3093be00ee45419ffb221cdeee88e75d1360", [:mix], [{:mochiweb, "~> 2.15 or ~> 3.1", [hex: :mochiweb, repo: "hexpm", optional: false]}], "hexpm", "87748d3c4afe949c7c6eb7150c958c2bcba43fc5b2a02686af30e636b74bccb7"},
-  "httpoison": {:hex, :httpoison, "2.1.0", "655fd9a7b0b95ee3e9a3b535cf7ac8e08ef5229bab187fa86ac4208b122d934b", [:mix], [{:hackney, "~> 1.17", [hex: :hackney, repo: "hexpm", optional: false]}], "hexpm", "fc455cb4306b43827def4f57299b2d5ac8ac331cb23f517e734a4b78210a160c"},
+  "httpoison": {:hex, :httpoison, "2.2.1", "87b7ed6d95db0389f7df02779644171d7319d319178f6680438167d7b69b1f3d", [:mix], [{:hackney, "~> 1.17", [hex: :hackney, repo: "hexpm", optional: false]}], "hexpm", "51364e6d2f429d80e14fe4b5f8e39719cacd03eb3f9a9286e61e216feac2d2df"},
   "idna": {:hex, :idna, "6.1.1", "8a63070e9f7d0c62eb9d9fcb360a7de382448200fbbd1b106cc96d3d8099df8d", [:rebar3], [{:unicode_util_compat, "~> 0.7.0", [hex: :unicode_util_compat, repo: "hexpm", optional: false]}], "hexpm", "92376eb7894412ed19ac475e4a86f7b413c1b9fbb5bd16dccd57934157944cea"},
   "jason": {:hex, :jason, "1.4.1", "af1504e35f629ddcdd6addb3513c3853991f694921b1b9368b0bd32beb9f1b63", [:mix], [{:decimal, "~> 1.0 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: true]}], "hexpm", "fbb01ecdfd565b56261302f7e1fcc27c4fb8f32d56eab74db621fc154604a7a1"},
   "jsx": {:hex, :jsx, "2.8.3", "a05252d381885240744d955fbe3cf810504eb2567164824e19303ea59eef62cf", [:mix, :rebar3], [], "hexpm", "fc3499fed7a726995aa659143a248534adc754ebd16ccd437cd93b649a95091f"},
   "jumper": {:hex, :jumper, "1.0.2", "68cdcd84472a00ac596b4e6459a41b3062d4427cbd4f1e8c8793c5b54f1406a7", [:mix], [], "hexpm", "9b7782409021e01ab3c08270e26f36eb62976a38c1aa64b2eaf6348422f165e1"},
-  "kino": {:hex, :kino, "0.11.0", "afda3ec07471fb5d0da4c92bc22e872373cea4dc56246f1af7050513ac2b5d96", [:mix], [{:fss, "~> 0.1.0", [hex: :fss, repo: "hexpm", optional: false]}, {:nx, "~> 0.1", [hex: :nx, repo: "hexpm", optional: true]}, {:table, "~> 0.1.2", [hex: :table, repo: "hexpm", optional: false]}], "hexpm", "43779cfd8afab921e6207289cecd247c6e44d83d312e42bb4e119f7b0f028568"},
+  "kino": {:hex, :kino, "0.12.0", "dfebe415f31cf2f54d98600178c08fd017931d9dada6fb59b7716b5431bee4a1", [:mix], [{:fss, "~> 0.1.0", [hex: :fss, repo: "hexpm", optional: false]}, {:nx, "~> 0.1", [hex: :nx, repo: "hexpm", optional: true]}, {:table, "~> 0.1.2", [hex: :table, repo: "hexpm", optional: false]}], "hexpm", "6796a64ae978fc2e50e52cae022ae6a3d28b8e50589af158b8f3904e7f748377"},
   "luhn": {:hex, :luhn, "0.3.3", "5aa0c6a32c2db4b9db9f9b883ba8301c1ae169d57199b9e6cb1ba2707bc51d96", [:mix], [], "hexpm", "3e823a913a25aab51352c727f135278d22954874d5f0835be81ed4fec3daf78d"},
   "meck": {:hex, :meck, "0.9.2", "85ccbab053f1db86c7ca240e9fc718170ee5bda03810a6292b5306bf31bae5f5", [:rebar3], [], "hexpm", "81344f561357dc40a8344afa53767c32669153355b626ea9fcbc8da6b3045826"},
   "metrics": {:hex, :metrics, "1.0.1", "25f094dea2cda98213cecc3aeff09e940299d950904393b2a29d191c346a8486", [:rebar3], [], "hexpm", "69b09adddc4f74a40716ae54d140f93beb0fb8978d8636eaded0c31b6f099f16"},
   "mime": {:hex, :mime, "2.0.5", "dc34c8efd439abe6ae0343edbb8556f4d63f178594894720607772a041b04b02", [:mix], [], "hexpm", "da0d64a365c45bc9935cc5c8a7fc5e49a0e0f9932a761c55d6c52b142780a05c"},
   "mimerl": {:hex, :mimerl, "1.2.0", "67e2d3f571088d5cfd3e550c383094b47159f3eee8ffa08e64106cdf5e981be3", [:rebar3], [], "hexpm", "f278585650aa581986264638ebf698f8bb19df297f66ad91b18910dfc6e19323"},
-  "mint": {:hex, :mint, "1.5.1", "8db5239e56738552d85af398798c80648db0e90f343c8469f6c6d8898944fb6f", [:mix], [{:castore, "~> 0.1.0 or ~> 1.0", [hex: :castore, repo: "hexpm", optional: true]}, {:hpax, "~> 0.1.1", [hex: :hpax, repo: "hexpm", optional: false]}], "hexpm", "4a63e1e76a7c3956abd2c72f370a0d0aecddc3976dea5c27eccbecfa5e7d5b1e"},
+  "mint": {:hex, :mint, "1.5.2", "4805e059f96028948870d23d7783613b7e6b0e2fb4e98d720383852a760067fd", [:mix], [{:castore, "~> 0.1.0 or ~> 1.0", [hex: :castore, repo: "hexpm", optional: true]}, {:hpax, "~> 0.1.1", [hex: :hpax, repo: "hexpm", optional: false]}], "hexpm", "d77d9e9ce4eb35941907f1d3df38d8f750c357865353e21d335bdcdf6d892a02"},
   "mochiweb": {:hex, :mochiweb, "3.2.1", "ff287e1ec653a0828f226cd5a009d52be74537dc3fc274b765525a77ce01f8ec", [:rebar3], [], "hexpm", "975466d335403a78cd58186636b8e960e3c84c4d9c1a85eb7fe53b6a5dd54de7"},
   "mock": {:hex, :mock, "0.3.8", "7046a306b71db2488ef54395eeb74df0a7f335a7caca4a3d3875d1fc81c884dd", [:mix], [{:meck, "~> 0.9.2", [hex: :meck, repo: "hexpm", optional: false]}], "hexpm", "7fa82364c97617d79bb7d15571193fc0c4fe5afd0c932cef09426b3ee6fe2022"},
-  "mox": {:hex, :mox, "1.0.2", "dc2057289ac478b35760ba74165b4b3f402f68803dd5aecd3bfd19c183815d64", [:mix], [], "hexpm", "f9864921b3aaf763c8741b5b8e6f908f44566f1e427b2630e89e9a73b981fef2"},
+  "mox": {:hex, :mox, "1.1.0", "0f5e399649ce9ab7602f72e718305c0f9cdc351190f72844599545e4996af73c", [:mix], [], "hexpm", "d44474c50be02d5b72131070281a5d3895c0e7a95c780e90bc0cfe712f633a13"},
   "nimble_csv": {:hex, :nimble_csv, "1.2.0", "4e26385d260c61eba9d4412c71cea34421f296d5353f914afe3f2e71cce97722", [:mix], [], "hexpm", "d0628117fcc2148178b034044c55359b26966c6eaa8e2ce15777be3bbc91b12a"},
-  "nimble_options": {:hex, :nimble_options, "1.0.2", "92098a74df0072ff37d0c12ace58574d26880e522c22801437151a159392270e", [:mix], [], "hexpm", "fd12a8db2021036ce12a309f26f564ec367373265b53e25403f0ee697380f1b8"},
+  "nimble_options": {:hex, :nimble_options, "1.1.0", "3b31a57ede9cb1502071fade751ab0c7b8dbe75a9a4c2b5bbb0943a690b63172", [:mix], [], "hexpm", "8bbbb3941af3ca9acc7835f5655ea062111c9c27bcac53e004460dfd19008a99"},
   "nimble_pool": {:hex, :nimble_pool, "1.0.0", "5eb82705d138f4dd4423f69ceb19ac667b3b492ae570c9f5c900bb3d2f50a847", [:mix], [], "hexpm", "80be3b882d2d351882256087078e1b1952a28bf98d0a287be87e4a24a710b67a"},
   "oauth2": {:hex, :oauth2, "2.1.0", "beb657f393814a3a7a8a15bd5e5776ecae341fd344df425342a3b6f1904c2989", [:mix], [{:tesla, "~> 1.5", [hex: :tesla, repo: "hexpm", optional: false]}], "hexpm", "8ac07f85b3307dd1acfeb0ec852f64161b22f57d0ce0c15e616a1dfc8ebe2b41"},
-  "oban": {:hex, :oban, "2.16.2", "ec8dfd2f6dfdcd885061b58aeaa2794a0a6f62bad20c15939e4bb80bfd74ed76", [:mix], [{:ecto_sql, "~> 3.6", [hex: :ecto_sql, repo: "hexpm", optional: false]}, {:ecto_sqlite3, "~> 0.9", [hex: :ecto_sqlite3, repo: "hexpm", optional: true]}, {:jason, "~> 1.1", [hex: :jason, repo: "hexpm", optional: false]}, {:postgrex, "~> 0.16", [hex: :postgrex, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "3d343c80948676abf9652da1e793ab6140ba64e9de7c8d6630eb5bb4aa8fea79"},
-  "open_api_spex": {:hex, :open_api_spex, "3.18.0", "f9952b6bc8a1bf14168f3754981b7c8d72d015112bfedf2588471dd602e1e715", [:mix], [{:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:plug, "~> 1.7", [hex: :plug, repo: "hexpm", optional: false]}, {:poison, "~> 3.0 or ~> 4.0 or ~> 5.0", [hex: :poison, repo: "hexpm", optional: true]}, {:ymlr, "~> 2.0 or ~> 3.0 or ~> 4.0", [hex: :ymlr, repo: "hexpm", optional: true]}], "hexpm", "37849887ab67efab052376401fac28c0974b273ffaecd98f4532455ca0886464"},
+  "oban": {:hex, :oban, "2.17.1", "42d6221a1c17b63d81c19e3bad9ea82b59e39c47c1f9b7670ee33628569a449b", [:mix], [{:ecto_sql, "~> 3.6", [hex: :ecto_sql, repo: "hexpm", optional: false]}, {:ecto_sqlite3, "~> 0.9", [hex: :ecto_sqlite3, repo: "hexpm", optional: true]}, {:jason, "~> 1.1", [hex: :jason, repo: "hexpm", optional: false]}, {:postgrex, "~> 0.16", [hex: :postgrex, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "c02686ada7979b00e259c0efbafeae2749f8209747b3460001fe695c5bdbeee6"},
+  "open_api_spex": {:hex, :open_api_spex, "3.18.1", "0a73cd5dbcba7d32952dd9738c6819892933d9bae1642f04c9f200281524dd31", [:mix], [{:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:plug, "~> 1.7", [hex: :plug, repo: "hexpm", optional: false]}, {:poison, "~> 3.0 or ~> 4.0 or ~> 5.0", [hex: :poison, repo: "hexpm", optional: true]}, {:ymlr, "~> 2.0 or ~> 3.0 or ~> 4.0", [hex: :ymlr, repo: "hexpm", optional: true]}], "hexpm", "f52933cddecca675e42ead660379ae2d3853f57f5a35d201eaed85e2e81517d1"},
   "parallel_stream": {:hex, :parallel_stream, "1.1.0", "f52f73eb344bc22de335992377413138405796e0d0ad99d995d9977ac29f1ca9", [:mix], [], "hexpm", "684fd19191aedfaf387bbabbeb8ff3c752f0220c8112eb907d797f4592d6e871"},
   "parse_trans": {:hex, :parse_trans, "3.4.1", "6e6aa8167cb44cc8f39441d05193be6e6f4e7c2946cb2759f015f8c56b76e5ff", [:rebar3], [], "hexpm", "620a406ce75dada827b82e453c19cf06776be266f5a67cff34e1ef2cbb60e49a"},
   "phoenix": {:hex, :phoenix, "1.6.16", "e5bdd18c7a06da5852a25c7befb72246de4ddc289182285f8685a40b7b5f5451", [:mix], [{:castore, ">= 0.0.0", [hex: :castore, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:phoenix_pubsub, "~> 2.0", [hex: :phoenix_pubsub, repo: "hexpm", optional: false]}, {:phoenix_view, "~> 1.0 or ~> 2.0", [hex: :phoenix_view, repo: "hexpm", optional: false]}, {:plug, "~> 1.10", [hex: :plug, repo: "hexpm", optional: false]}, {:plug_cowboy, "~> 2.2", [hex: :plug_cowboy, repo: "hexpm", optional: true]}, {:plug_crypto, "~> 1.2", [hex: :plug_crypto, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "e15989ff34f670a96b95ef6d1d25bad0d9c50df5df40b671d8f4a669e050ac39"},
   "phoenix_ddos": {:hex, :phoenix_ddos, "1.1.14", "8bc29595f221361cec86f798d15ca7ac8228a0ce30fea25dd75d99027e73762c", [:mix], [{:cachex, ">= 3.0.0", [hex: :cachex, repo: "hexpm", optional: false]}, {:plug, "~> 1.14", [hex: :plug, repo: "hexpm", optional: false]}, {:telemetry, ">= 0.0.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "c0f7e2debd72af4fe90d5083a569f3f576bced9d38010b1a8631bb43c70a005d"},
-  "phoenix_ecto": {:hex, :phoenix_ecto, "4.4.2", "b21bd01fdeffcfe2fab49e4942aa938b6d3e89e93a480d4aee58085560a0bc0d", [:mix], [{:ecto, "~> 3.5", [hex: :ecto, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 2.14.2 or ~> 3.0", [hex: :phoenix_html, repo: "hexpm", optional: true]}, {:plug, "~> 1.9", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "70242edd4601d50b69273b057ecf7b684644c19ee750989fd555625ae4ce8f5d"},
+  "phoenix_ecto": {:hex, :phoenix_ecto, "4.4.3", "86e9878f833829c3f66da03d75254c155d91d72a201eb56ae83482328dc7ca93", [:mix], [{:ecto, "~> 3.5", [hex: :ecto, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 2.14.2 or ~> 3.0 or ~> 4.0", [hex: :phoenix_html, repo: "hexpm", optional: true]}, {:plug, "~> 1.9", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "d36c401206f3011fefd63d04e8ef626ec8791975d9d107f9a0817d426f61ac07"},
   "phoenix_html": {:hex, :phoenix_html, "3.3.3", "380b8fb45912b5638d2f1d925a3771b4516b9a78587249cabe394e0a5d579dc9", [:mix], [{:plug, "~> 1.5", [hex: :plug, repo: "hexpm", optional: true]}], "hexpm", "923ebe6fec6e2e3b3e569dfbdc6560de932cd54b000ada0208b5f45024bdd76c"},
   "phoenix_live_dashboard": {:hex, :phoenix_live_dashboard, "0.7.2", "97cc4ff2dba1ebe504db72cb45098cb8e91f11160528b980bd282cc45c73b29c", [:mix], [{:ecto, "~> 3.6.2 or ~> 3.7", [hex: :ecto, repo: "hexpm", optional: true]}, {:ecto_mysql_extras, "~> 0.5", [hex: :ecto_mysql_extras, repo: "hexpm", optional: true]}, {:ecto_psql_extras, "~> 0.7", [hex: :ecto_psql_extras, repo: "hexpm", optional: true]}, {:mime, "~> 1.6 or ~> 2.0", [hex: :mime, repo: "hexpm", optional: false]}, {:phoenix_live_view, "~> 0.18.3", [hex: :phoenix_live_view, repo: "hexpm", optional: false]}, {:telemetry_metrics, "~> 0.6 or ~> 1.0", [hex: :telemetry_metrics, repo: "hexpm", optional: false]}], "hexpm", "0e5fdf063c7a3b620c566a30fcf68b7ee02e5e46fe48ee46a6ec3ba382dc05b7"},
   "phoenix_live_reload": {:hex, :phoenix_live_reload, "1.4.1", "2aff698f5e47369decde4357ba91fc9c37c6487a512b41732818f2204a8ef1d3", [:mix], [{:file_system, "~> 0.2.1 or ~> 0.3", [hex: :file_system, repo: "hexpm", optional: false]}, {:phoenix, "~> 1.4", [hex: :phoenix, repo: "hexpm", optional: false]}], "hexpm", "9bffb834e7ddf08467fe54ae58b5785507aaba6255568ae22b4d46e2bb3615ab"},
@@ -92,8 +92,8 @@
   "phoenix_markdown": {:git, "https://github.com/pzingg/phoenix_markdown.git", "b2e5ff67c9ce9160d7ef1f66d0c859dfa6284a53", [ref: "b2e5ff67c9ce9160d7ef1f66d0c859dfa6284a53"]},
   "phoenix_pubsub": {:hex, :phoenix_pubsub, "2.1.3", "3168d78ba41835aecad272d5e8cd51aa87a7ac9eb836eabc42f6e57538e3731d", [:mix], [], "hexpm", "bba06bc1dcfd8cb086759f0edc94a8ba2bc8896d5331a1e2c2902bf8e36ee502"},
   "phoenix_swoosh": {:hex, :phoenix_swoosh, "1.2.0", "a544d83fde4a767efb78f45404a74c9e37b2a9c5ea3339692e65a6966731f935", [:mix], [{:finch, "~> 0.8", [hex: :finch, repo: "hexpm", optional: true]}, {:hackney, "~> 1.10", [hex: :hackney, repo: "hexpm", optional: true]}, {:phoenix, "~> 1.6", [hex: :phoenix, repo: "hexpm", optional: true]}, {:phoenix_html, "~> 3.0", [hex: :phoenix_html, repo: "hexpm", optional: true]}, {:phoenix_view, "~> 1.0 or ~> 2.0", [hex: :phoenix_view, repo: "hexpm", optional: false]}, {:swoosh, "~> 1.5", [hex: :swoosh, repo: "hexpm", optional: false]}], "hexpm", "e88d117251e89a16b92222415a6d87b99a96747ddf674fc5c7631de734811dba"},
-  "phoenix_template": {:hex, :phoenix_template, "1.0.3", "32de561eefcefa951aead30a1f94f1b5f0379bc9e340bb5c667f65f1edfa4326", [:mix], [{:phoenix_html, "~> 2.14.2 or ~> 3.0", [hex: :phoenix_html, repo: "hexpm", optional: true]}], "hexpm", "16f4b6588a4152f3cc057b9d0c0ba7e82ee23afa65543da535313ad8d25d8e2c"},
-  "phoenix_view": {:hex, :phoenix_view, "2.0.2", "6bd4d2fd595ef80d33b439ede6a19326b78f0f1d8d62b9a318e3d9c1af351098", [:mix], [{:phoenix_html, "~> 2.14.2 or ~> 3.0", [hex: :phoenix_html, repo: "hexpm", optional: true]}, {:phoenix_template, "~> 1.0", [hex: :phoenix_template, repo: "hexpm", optional: false]}], "hexpm", "a929e7230ea5c7ee0e149ffcf44ce7cf7f4b6d2bfe1752dd7c084cdff152d36f"},
+  "phoenix_template": {:hex, :phoenix_template, "1.0.4", "e2092c132f3b5e5b2d49c96695342eb36d0ed514c5b252a77048d5969330d639", [:mix], [{:phoenix_html, "~> 2.14.2 or ~> 3.0 or ~> 4.0", [hex: :phoenix_html, repo: "hexpm", optional: true]}], "hexpm", "2c0c81f0e5c6753faf5cca2f229c9709919aba34fab866d3bc05060c9c444206"},
+  "phoenix_view": {:hex, :phoenix_view, "2.0.3", "4d32c4817fce933693741deeb99ef1392619f942633dde834a5163124813aad3", [:mix], [{:phoenix_html, "~> 2.14.2 or ~> 3.0 or ~> 4.0", [hex: :phoenix_html, repo: "hexpm", optional: true]}, {:phoenix_template, "~> 1.0", [hex: :phoenix_template, repo: "hexpm", optional: false]}], "hexpm", "cd34049af41be2c627df99cd4eaa71fc52a328c0c3d8e7d4aa28f880c30e7f64"},
   "plug": {:hex, :plug, "1.15.2", "94cf1fa375526f30ff8770837cb804798e0045fd97185f0bb9e5fcd858c792a3", [:mix], [{:mime, "~> 1.0 or ~> 2.0", [hex: :mime, repo: "hexpm", optional: false]}, {:plug_crypto, "~> 1.1.1 or ~> 1.2 or ~> 2.0", [hex: :plug_crypto, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4.3 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "02731fa0c2dcb03d8d21a1d941bdbbe99c2946c0db098eee31008e04c6283615"},
   "plug_canonical_host": {:hex, :plug_canonical_host, "2.0.3", "3d96c3340cc8a434eb6758a4a34de6c152bd781be96bb8439545da2d17ecf576", [:make, :mix], [{:plug, "~> 1.0", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "aca98ac6d0036391b84d5a40af6f946c839fb0d588bf0064029a2e8931431ea6"},
   "plug_cowboy": {:hex, :plug_cowboy, "2.6.1", "9a3bbfceeb65eff5f39dab529e5cd79137ac36e913c02067dba3963a26efe9b2", [:mix], [{:cowboy, "~> 2.7", [hex: :cowboy, repo: "hexpm", optional: false]}, {:cowboy_telemetry, "~> 0.3", [hex: :cowboy_telemetry, repo: "hexpm", optional: false]}, {:plug, "~> 1.14", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "de36e1a21f451a18b790f37765db198075c25875c64834bcc82d90b309eb6613"},
@@ -105,7 +105,7 @@
   "ranch": {:hex, :ranch, "1.8.0", "8c7a100a139fd57f17327b6413e4167ac559fbc04ca7448e9be9057311597a1d", [:make, :rebar3], [], "hexpm", "49fbcfd3682fab1f5d109351b61257676da1a2fdbe295904176d5e521a2ddfe5"},
   "recon": {:hex, :recon, "2.5.4", "05dd52a119ee4059fa9daa1ab7ce81bc7a8161a2f12e9d42e9d551ffd2ba901c", [:mix, :rebar3], [], "hexpm", "e9ab01ac7fc8572e41eb59385efeb3fb0ff5bf02103816535bacaedf327d0263"},
   "remote_ip": {:hex, :remote_ip, "1.1.0", "cb308841595d15df3f9073b7c39243a1dd6ca56e5020295cb012c76fbec50f2d", [:mix], [{:combine, "~> 0.10", [hex: :combine, repo: "hexpm", optional: false]}, {:plug, "~> 1.14", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "616ffdf66aaad6a72fc546dabf42eed87e2a99e97b09cbd92b10cc180d02ed74"},
-  "req": {:hex, :req, "0.4.4", "a17b6bec956c9af4f08b5d8e8a6fc6e4edf24ccc0ac7bf363a90bba7a0f0138c", [:mix], [{:brotli, "~> 0.3.1", [hex: :brotli, repo: "hexpm", optional: true]}, {:ezstd, "~> 1.0", [hex: :ezstd, repo: "hexpm", optional: true]}, {:finch, "~> 0.9", [hex: :finch, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}, {:mime, "~> 1.6 or ~> 2.0", [hex: :mime, repo: "hexpm", optional: false]}, {:nimble_csv, "~> 1.0", [hex: :nimble_csv, repo: "hexpm", optional: true]}, {:plug, "~> 1.0", [hex: :plug, repo: "hexpm", optional: true]}], "hexpm", "2618c0493444fee927d12073afb42e9154e766b3f4448e1011f0d3d551d1a011"},
+  "req": {:hex, :req, "0.4.8", "2b754a3925ddbf4ad78c56f30208ced6aefe111a7ea07fb56c23dccc13eb87ae", [:mix], [{:brotli, "~> 0.3.1", [hex: :brotli, repo: "hexpm", optional: true]}, {:ezstd, "~> 1.0", [hex: :ezstd, repo: "hexpm", optional: true]}, {:finch, "~> 0.9", [hex: :finch, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}, {:mime, "~> 1.6 or ~> 2.0", [hex: :mime, repo: "hexpm", optional: false]}, {:nimble_csv, "~> 1.0", [hex: :nimble_csv, repo: "hexpm", optional: true]}, {:plug, "~> 1.0", [hex: :plug, repo: "hexpm", optional: true]}], "hexpm", "7146e51d52593bb7f20d00b5308a5d7d17d663d6e85cd071452b613a8277100c"},
   "saxy": {:hex, :saxy, "1.5.0", "0141127f2d042856f135fb2d94e0beecda7a2306f47546dbc6411fc5b07e28bf", [:mix], [], "hexpm", "ea7bb6328fbd1f2aceffa3ec6090bfb18c85aadf0f8e5030905e84235861cf89"},
   "scrivener": {:hex, :scrivener, "2.7.2", "1d913c965ec352650a7f864ad7fd8d80462f76a32f33d57d1e48bc5e9d40aba2", [:mix], [], "hexpm", "7866a0ec4d40274efbee1db8bead13a995ea4926ecd8203345af8f90d2b620d9"},
   "scrivener_ecto": {:hex, :scrivener_ecto, "2.7.0", "cf64b8cb8a96cd131cdbcecf64e7fd395e21aaa1cb0236c42a7c2e34b0dca580", [:mix], [{:ecto, "~> 3.3", [hex: :ecto, repo: "hexpm", optional: false]}, {:scrivener, "~> 2.4", [hex: :scrivener, repo: "hexpm", optional: false]}], "hexpm", "e809f171687806b0031129034352f5ae44849720c48dd839200adeaf0ac3e260"},
@@ -116,14 +116,14 @@
   "sleeplocks": {:hex, :sleeplocks, "1.1.2", "d45aa1c5513da48c888715e3381211c859af34bee9b8290490e10c90bb6ff0ca", [:rebar3], [], "hexpm", "9fe5d048c5b781d6305c1a3a0f40bb3dfc06f49bf40571f3d2d0c57eaa7f59a5"},
   "ssl_verify_fun": {:hex, :ssl_verify_fun, "1.1.7", "354c321cf377240c7b8716899e182ce4890c5938111a1296add3ec74cf1715df", [:make, :mix, :rebar3], [], "hexpm", "fe4c190e8f37401d30167c8c405eda19469f34577987c76dde613e838bbc67f8"},
   "sweet_xml": {:hex, :sweet_xml, "0.7.4", "a8b7e1ce7ecd775c7e8a65d501bc2cd933bff3a9c41ab763f5105688ef485d08", [:mix], [], "hexpm", "e7c4b0bdbf460c928234951def54fe87edf1a170f6896675443279e2dbeba167"},
-  "swoosh": {:hex, :swoosh, "1.13.0", "2556e0cfc2cdcca1f0d4219859aead48a1e86a7db31894d1b42695c370b8041b", [:mix], [{:cowboy, "~> 1.1 or ~> 2.4", [hex: :cowboy, repo: "hexpm", optional: true]}, {:ex_aws, "~> 2.1", [hex: :ex_aws, repo: "hexpm", optional: true]}, {:finch, "~> 0.6", [hex: :finch, repo: "hexpm", optional: true]}, {:gen_smtp, "~> 0.13 or ~> 1.0", [hex: :gen_smtp, repo: "hexpm", optional: true]}, {:hackney, "~> 1.9", [hex: :hackney, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}, {:mail, "~> 0.2", [hex: :mail, repo: "hexpm", optional: true]}, {:mime, "~> 1.1 or ~> 2.0", [hex: :mime, repo: "hexpm", optional: false]}, {:plug, "~> 1.9", [hex: :plug, repo: "hexpm", optional: true]}, {:plug_cowboy, ">= 1.0.0", [hex: :plug_cowboy, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4.2 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "67bcc0880352e16cdf91219838b94c4538776da708321ca3e6bf3425910c1038"},
+  "swoosh": {:hex, :swoosh, "1.14.2", "cf686f92ad3b21e6651b20c50eeb1781f581dc7097ef6251b4d322a9f1d19339", [:mix], [{:cowboy, "~> 1.1 or ~> 2.4", [hex: :cowboy, repo: "hexpm", optional: true]}, {:ex_aws, "~> 2.1", [hex: :ex_aws, repo: "hexpm", optional: true]}, {:finch, "~> 0.6", [hex: :finch, repo: "hexpm", optional: true]}, {:gen_smtp, "~> 0.13 or ~> 1.0", [hex: :gen_smtp, repo: "hexpm", optional: true]}, {:hackney, "~> 1.9", [hex: :hackney, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}, {:mail, "~> 0.2", [hex: :mail, repo: "hexpm", optional: true]}, {:mime, "~> 1.1 or ~> 2.0", [hex: :mime, repo: "hexpm", optional: false]}, {:plug, "~> 1.9", [hex: :plug, repo: "hexpm", optional: true]}, {:plug_cowboy, ">= 1.0.0", [hex: :plug_cowboy, repo: "hexpm", optional: true]}, {:req, "~> 0.4 or ~> 1.0", [hex: :req, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4.2 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "01d8fae72930a0b5c1bb9725df0408602ed8c5c3d59dc6e7a39c57b723cd1065"},
   "table": {:hex, :table, "0.1.2", "87ad1125f5b70c5dea0307aa633194083eb5182ec537efc94e96af08937e14a8", [:mix], [], "hexpm", "7e99bc7efef806315c7e65640724bf165c3061cdc5d854060f74468367065029"},
   "table_rex": {:hex, :table_rex, "3.1.1", "0c67164d1714b5e806d5067c1e96ff098ba7ae79413cc075973e17c38a587caa", [:mix], [], "hexpm", "678a23aba4d670419c23c17790f9dcd635a4a89022040df7d5d772cb21012490"},
   "telemetry": {:hex, :telemetry, "1.2.1", "68fdfe8d8f05a8428483a97d7aab2f268aaff24b49e0f599faa091f1d4e7f61c", [:rebar3], [], "hexpm", "dad9ce9d8effc621708f99eac538ef1cbe05d6a874dd741de2e689c47feafed5"},
   "telemetry_metrics": {:hex, :telemetry_metrics, "0.6.1", "315d9163a1d4660aedc3fee73f33f1d355dcc76c5c3ab3d59e76e3edf80eef1f", [:mix], [{:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "7be9e0871c41732c233be71e4be11b96e56177bf15dde64a8ac9ce72ac9834c6"},
   "telemetry_poller": {:hex, :telemetry_poller, "1.0.0", "db91bb424e07f2bb6e73926fcafbfcbcb295f0193e0a00e825e589a0a47e8453", [:rebar3], [{:telemetry, "~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "b3a24eafd66c3f42da30fc3ca7dda1e9d546c12250a2d60d7b81d264fbec4f6e"},
   "telemetry_registry": {:hex, :telemetry_registry, "0.3.1", "14a3319a7d9027bdbff7ebcacf1a438f5f5c903057b93aee484cca26f05bdcba", [:mix, :rebar3], [{:telemetry, "~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "6d0ca77b691cf854ed074b459a93b87f4c7f5512f8f7743c635ca83da81f939e"},
-  "tesla": {:hex, :tesla, "1.7.0", "a62dda2f80d4f8a925eb7b8c5b78c461e0eb996672719fe1a63b26321a5f8b4e", [:mix], [{:castore, "~> 0.1 or ~> 1.0", [hex: :castore, repo: "hexpm", optional: true]}, {:exjsx, ">= 3.0.0", [hex: :exjsx, repo: "hexpm", optional: true]}, {:finch, "~> 0.13", [hex: :finch, repo: "hexpm", optional: true]}, {:fuse, "~> 2.4", [hex: :fuse, repo: "hexpm", optional: true]}, {:gun, "~> 1.3", [hex: :gun, repo: "hexpm", optional: true]}, {:hackney, "~> 1.6", [hex: :hackney, repo: "hexpm", optional: true]}, {:ibrowse, "4.4.0", [hex: :ibrowse, repo: "hexpm", optional: true]}, {:jason, ">= 1.0.0", [hex: :jason, repo: "hexpm", optional: true]}, {:mime, "~> 1.0 or ~> 2.0", [hex: :mime, repo: "hexpm", optional: false]}, {:mint, "~> 1.0", [hex: :mint, repo: "hexpm", optional: true]}, {:msgpax, "~> 2.3", [hex: :msgpax, repo: "hexpm", optional: true]}, {:poison, ">= 1.0.0", [hex: :poison, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: true]}], "hexpm", "2e64f01ebfdb026209b47bc651a0e65203fcff4ae79c11efb73c4852b00dc313"},
+  "tesla": {:hex, :tesla, "1.8.0", "d511a4f5c5e42538d97eef7c40ec4f3e44effdc5068206f42ed859e09e51d1fd", [:mix], [{:castore, "~> 0.1 or ~> 1.0", [hex: :castore, repo: "hexpm", optional: true]}, {:exjsx, ">= 3.0.0", [hex: :exjsx, repo: "hexpm", optional: true]}, {:finch, "~> 0.13", [hex: :finch, repo: "hexpm", optional: true]}, {:fuse, "~> 2.4", [hex: :fuse, repo: "hexpm", optional: true]}, {:gun, ">= 1.0.0", [hex: :gun, repo: "hexpm", optional: true]}, {:hackney, "~> 1.6", [hex: :hackney, repo: "hexpm", optional: true]}, {:ibrowse, "4.4.2", [hex: :ibrowse, repo: "hexpm", optional: true]}, {:jason, ">= 1.0.0", [hex: :jason, repo: "hexpm", optional: true]}, {:mime, "~> 1.0 or ~> 2.0", [hex: :mime, repo: "hexpm", optional: false]}, {:mint, "~> 1.0", [hex: :mint, repo: "hexpm", optional: true]}, {:msgpax, "~> 2.3", [hex: :msgpax, repo: "hexpm", optional: true]}, {:poison, ">= 1.0.0", [hex: :poison, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: true]}], "hexpm", "10501f360cd926a309501287470372af1a6e1cbed0f43949203a4c13300bc79f"},
   "timex": {:hex, :timex, "3.7.11", "bb95cb4eb1d06e27346325de506bcc6c30f9c6dea40d1ebe390b262fad1862d1", [:mix], [{:combine, "~> 0.10", [hex: :combine, repo: "hexpm", optional: false]}, {:gettext, "~> 0.20", [hex: :gettext, repo: "hexpm", optional: false]}, {:tzdata, "~> 1.1", [hex: :tzdata, repo: "hexpm", optional: false]}], "hexpm", "8b9024f7efbabaf9bd7aa04f65cf8dcd7c9818ca5737677c7b76acbc6a94d1aa"},
   "typed_ecto_schema": {:hex, :typed_ecto_schema, "0.4.1", "a373ca6f693f4de84cde474a67467a9cb9051a8a7f3f615f1e23dc74b75237fa", [:mix], [{:ecto, "~> 3.5", [hex: :ecto, repo: "hexpm", optional: false]}], "hexpm", "85c6962f79d35bf543dd5659c6adc340fd2480cacc6f25d2cc2933ea6e8fcb3b"},
   "tzdata": {:hex, :tzdata, "1.1.1", "20c8043476dfda8504952d00adac41c6eda23912278add38edc140ae0c5bcc46", [:mix], [{:hackney, "~> 1.17", [hex: :hackney, repo: "hexpm", optional: false]}], "hexpm", "a69cec8352eafcd2e198dea28a34113b60fdc6cb57eb5ad65c10292a6ba89787"},

From b6714d05d2d1774379ba743a8fe8304e415a10c8 Mon Sep 17 00:00:00 2001
From: Antoine Augusti <antoine.augusti@transport.data.gouv.fr>
Date: Tue, 26 Dec 2023 14:38:46 +0100
Subject: [PATCH 17/25] =?UTF-8?q?Mise=20=C3=A0=20jour=20Sentry=20en=20vers?=
 =?UTF-8?q?ion=2010.1.0=20(#3681)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Update to Sentry 10

* Fix tests

* Switch to fetch_env!

* Fix comment
---
 Dockerfile                                    |  3 ++
 apps/datagouvfr/mix.exs                       |  2 +-
 apps/gbfs/mix.exs                             |  2 +-
 apps/shared/mix.exs                           |  2 +-
 apps/transport/lib/transport/vault.ex         |  8 +---
 .../controllers/page_controller.ex            | 41 ++++++++++---------
 apps/transport/mix.exs                        |  2 +-
 .../controllers/page_controller_test.exs      |  8 ++--
 apps/unlock/mix.exs                           |  2 +-
 config/config.exs                             | 27 +++---------
 config/runtime.exs                            | 19 +++++++++
 mix.lock                                      |  2 +-
 12 files changed, 61 insertions(+), 57 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 040f7a85cb..103b9873eb 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,6 +17,9 @@ RUN mix deps.compile
 RUN cd apps/transport/client && yarn install && npm run build
 # assets digest must happen after the npm build step
 RUN mix phx.digest
+# Package source code for Sentry https://hexdocs.pm/sentry/upgrade-10-x.html
+# If we switch to releases, make sure to call this before `mix release`
+RUN mix sentry.package_source_code
 
 EXPOSE 8080
 
diff --git a/apps/datagouvfr/mix.exs b/apps/datagouvfr/mix.exs
index 20132792aa..e88229c9ca 100644
--- a/apps/datagouvfr/mix.exs
+++ b/apps/datagouvfr/mix.exs
@@ -44,7 +44,7 @@ defmodule Datagouvfr.MixProject do
       {:vex, "~> 0.9"},
       {:exvcr, "~> 0.13", only: :test},
       {:mox, "~> 1.1", only: :test},
-      {:sentry, "~> 8.1"},
+      {:sentry, "~> 10.1"},
       {:dialyxir, "~> 1.2", only: [:dev, :test], runtime: false},
     ]
   end
diff --git a/apps/gbfs/mix.exs b/apps/gbfs/mix.exs
index 259c202fc1..7861ecca68 100644
--- a/apps/gbfs/mix.exs
+++ b/apps/gbfs/mix.exs
@@ -42,7 +42,7 @@ defmodule GBFS.MixProject do
       {:sweet_xml, ">= 0.0.0"},
       {:jason, ">= 0.0.0"},
       {:cors_plug, "~> 3.0"},
-      {:sentry, "~> 8.1"},
+      {:sentry, "~> 10.1"},
       # Required for ConditionalJSONEncoder which is referenced by global config,
       # otherwise the tests won't run. Not sure if there's a better way for this,
       # since the GBFS app itself does not currently rely on conditional encoding.
diff --git a/apps/shared/mix.exs b/apps/shared/mix.exs
index fa79a36543..f1d5059ff8 100644
--- a/apps/shared/mix.exs
+++ b/apps/shared/mix.exs
@@ -52,7 +52,7 @@ defmodule Shared.MixProject do
       # otherwise running tests for an individual umbrella sub-app will raise error.
       # A better way to achieve this will be to configure it at runtime, like described
       # in https://github.com/getsentry/sentry-elixir/pull/472.
-      {:sentry, "~> 8.1"},
+      {:sentry, "~> 10.1"},
       # Similarly, Jason is configured as `json_library` by the main app, so it will
       # be required no matter what.
       {:jason, ">= 0.0.0"},
diff --git a/apps/transport/lib/transport/vault.ex b/apps/transport/lib/transport/vault.ex
index 320ea2b726..2f7c777c12 100644
--- a/apps/transport/lib/transport/vault.ex
+++ b/apps/transport/lib/transport/vault.ex
@@ -5,10 +5,6 @@ defmodule Transport.Vault do
   """
   use Cloak.Vault, otp_app: :transport
 
-  # This value should be base64 encrypted
-  # See https://github.com/danielberkompas/cloak#configuration
-  @prod_config_env_name "CLOAK_KEY"
-
   @impl GenServer
   def init(config) do
     # See config recommendation
@@ -22,8 +18,8 @@ defmodule Transport.Vault do
   defp key do
     case Application.fetch_env!(:transport, :app_env) do
       env when env in [:production, :staging] ->
-        @prod_config_env_name
-        |> System.fetch_env!()
+        :transport
+        |> Application.fetch_env!(:cloak_key)
         |> Base.decode64!()
 
       _ ->
diff --git a/apps/transport/lib/transport_web/controllers/page_controller.ex b/apps/transport/lib/transport_web/controllers/page_controller.ex
index 5e751b7b0c..7d2240185e 100644
--- a/apps/transport/lib/transport_web/controllers/page_controller.ex
+++ b/apps/transport/lib/transport_web/controllers/page_controller.ex
@@ -95,26 +95,29 @@ defmodule TransportWeb.PageController do
     |> render("infos_producteurs.html")
   end
 
-  def robots_txt(conn, _params) do
-    # See http://www.robotstxt.org/robotstxt.html for documentation on how to use the robots.txt file
-    content =
-      if Application.fetch_env!(:transport, :app_env) == :staging do
-        """
-        User-agent: *
-        Disallow: /
-        """
-      else
-        """
-        User-agent: *
-        Allow: /
-        Disallow: /backoffice/
-        Disallow: /validation/*
-        Disallow: /login/*
-        Disallow: /resources/conversions/*
-        """
-      end
+  def robots_txt(%Plug.Conn{} = conn, _params) do
+    # See http://www.robotstxt.org/robotstxt.html
+    # for documentation on how to use the robots.txt file
+    app_env = Application.fetch_env!(:transport, :app_env)
+    text(conn, robots_txt_content(app_env))
+  end
 
-    conn |> text(content)
+  def robots_txt_content(:staging = _app_env) do
+    """
+    User-agent: *
+    Disallow: /
+    """
+  end
+
+  def robots_txt_content(_app_env) do
+    """
+    User-agent: *
+    Allow: /
+    Disallow: /backoffice/
+    Disallow: /validation/*
+    Disallow: /login/*
+    Disallow: /resources/conversions/*
+    """
   end
 
   def security_txt(conn, _params) do
diff --git a/apps/transport/mix.exs b/apps/transport/mix.exs
index 75ccb1f1e5..a88eeaf296 100644
--- a/apps/transport/mix.exs
+++ b/apps/transport/mix.exs
@@ -72,7 +72,7 @@ defmodule Transport.Mixfile do
       {:recon, "~> 2.4"},
       {:quantum, "~> 3.4"},
       {:timex, "~> 3.7"},
-      {:sentry, "~> 8.1"},
+      {:sentry, "~> 10.1"},
       {:scrivener, "~> 2.5"},
       # Compilation issue for this dependency, see https://github.com/etalab/transport-site/issues/3499
       {:scrivener_html, git: "https://github.com/etalab/scrivener_html.git", ref: "f0245703abf7d0ce2b48a0f7e96997def7649e5f"},
diff --git a/apps/transport/test/transport_web/controllers/page_controller_test.exs b/apps/transport/test/transport_web/controllers/page_controller_test.exs
index 5aad78009d..bf8f90bd06 100644
--- a/apps/transport/test/transport_web/controllers/page_controller_test.exs
+++ b/apps/transport/test/transport_web/controllers/page_controller_test.exs
@@ -128,13 +128,13 @@ defmodule TransportWeb.PageControllerTest do
   end
 
   describe "robots.txt" do
-    test "it works", %{conn: conn} do
+    test "200 response, doesn't disallow indexing everything", %{conn: conn} do
       refute conn |> get("/robots.txt") |> text_response(200) =~ ~r(Disallow: \/$)
     end
 
-    test "it works in staging with a different content", %{conn: conn} do
-      AppConfigHelper.change_app_config_temporarily(:transport, :app_env, :staging)
-      assert conn |> get("/robots.txt") |> text_response(200) =~ ~r(Disallow: \/$)
+    test "disallow indexing everything in staging" do
+      assert TransportWeb.PageController.robots_txt_content(:staging) =~ ~r(Disallow: \/$)
+      refute TransportWeb.PageController.robots_txt_content(:prod) =~ ~r(Disallow: \/$)
     end
   end
 
diff --git a/apps/unlock/mix.exs b/apps/unlock/mix.exs
index 4cb28a0395..d6f85555db 100644
--- a/apps/unlock/mix.exs
+++ b/apps/unlock/mix.exs
@@ -37,7 +37,7 @@ defmodule Unlock.MixProject do
     [
       {:phoenix, "~> 1.6.2"},
       {:phoenix_html, "~> 3.1"},
-      {:sentry, "~> 8.1"},
+      {:sentry, "~> 10.1"},
       # required indirectly by sentry
       {:hackney, "~> 1.8"},
       {:jason, "~> 1.1"},
diff --git a/config/config.exs b/config/config.exs
index d29c0646e9..5c10777e24 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -70,7 +70,7 @@ config :phoenix, :format_encoders, json: Transport.Shared.ConditionalJSONEncoder
 config :logger,
   backends: [
     :console,
-    # error logs are also send to sentry
+    # Error logs are also sent to Sentry
     Sentry.LoggerBackend
   ]
 
@@ -91,27 +91,6 @@ config :phoenix, :template_engines,
 
 config :phoenix_markdown, :server_tags, :all
 
-# build sentry env based on Mix env, unless overriden (useful for staging)
-sentry_env_as_atom =
-  if v = System.get_env("SENTRY_ENV") do
-    v |> String.to_atom()
-  else
-    config_env()
-  end
-
-# check out https://sentry.io/settings/transport-data-gouv-fr/projects/transport-site/install/elixir/
-config :sentry,
-  dsn: System.get_env("SENTRY_DSN"),
-  csp_url: System.get_env("SENTRY_CSP_URL"),
-  environment_name: sentry_env_as_atom,
-  included_environments: [:prod, :staging],
-  enable_source_code_context: true,
-  root_source_code_path: File.cwd!(),
-  filter: Transport.Shared.SentryExceptionFilter,
-  # the key must be there for overriding during tests,
-  # so we set it to the default based on source code for now
-  send_result: :none
-
 config :transport,
   cache_impl: Transport.Cache.Cachex,
   ex_aws_impl: ExAws,
@@ -206,6 +185,10 @@ config :transport,
   security_email: "contact@transport.data.gouv.fr",
   transport_tools_folder: Path.absname("transport-tools/")
 
+# Disable sending events to Sentry by default.
+# Events are sent in production and staging, configured in `runtime.exs`
+config :sentry, dsn: nil
+
 # For now, never send session data (containing sensitive data in our case) nor params,
 # even if this means less useful information.
 # See https://github.com/etalab/transport_deploy/issues/64
diff --git a/config/runtime.exs b/config/runtime.exs
index a21feb0607..e294144da0 100644
--- a/config/runtime.exs
+++ b/config/runtime.exs
@@ -217,12 +217,31 @@ if config_env() == :prod do
       tcp_keepalives_interval: "5",
       tcp_keepalives_count: "3"
     ],
+    # The key used by Cloak. See `Transport.Vault`.
+    # This value should be base64 encrypted
+    # See https://github.com/danielberkompas/cloak#configuration
+    cloak_key: System.fetch_env!("CLOAK_KEY"),
     socket_options: [keepalive: true],
     # See https://hexdocs.pm/db_connection/DBConnection.html#start_link/2-queue-config
     # [Ecto.Repo] :pool_timeout is no longer supported in favor of a new queue system described in DBConnection.start_link/2
     # under "Queue config". For most users, configuring :timeout is enough, as it now includes both queue and query time
     timeout: 15_000
 
+  # Configure Sentry for production and staging.
+  # Check out https://sentry.io/settings/transport-data-gouv-fr/projects/transport-site/install/elixir/
+  config :sentry,
+    # Sentry events are only sent when `dsn` is not nil
+    # https://hexdocs.pm/sentry/upgrade-10-x.html#stop-using-included_environments
+    dsn: System.get_env("SENTRY_DSN"),
+    csp_url: System.get_env("SENTRY_CSP_URL"),
+    environment_name: "SENTRY_ENV" |> System.get_env() |> String.to_atom(),
+    enable_source_code_context: true,
+    # https://hexdocs.pm/sentry/Sentry.html#module-configuration
+    # > a list of paths to the root of your application's source code.
+    # > For umbrella apps, you should set this to all the application paths in your umbrella
+    root_source_code_path: File.cwd!() |> Path.join("apps/*") |> Path.wildcard(),
+    filter: Transport.Shared.SentryExceptionFilter
+
   if app_env == :production do
     # data.gouv.fr IDs for national databases created automatically and
     # published by us on data.gouv.fr.
diff --git a/mix.lock b/mix.lock
index 44eb2269ce..c0e16a3188 100644
--- a/mix.lock
+++ b/mix.lock
@@ -111,7 +111,7 @@
   "scrivener_ecto": {:hex, :scrivener_ecto, "2.7.0", "cf64b8cb8a96cd131cdbcecf64e7fd395e21aaa1cb0236c42a7c2e34b0dca580", [:mix], [{:ecto, "~> 3.3", [hex: :ecto, repo: "hexpm", optional: false]}, {:scrivener, "~> 2.4", [hex: :scrivener, repo: "hexpm", optional: false]}], "hexpm", "e809f171687806b0031129034352f5ae44849720c48dd839200adeaf0ac3e260"},
   "scrivener_html": {:git, "https://github.com/etalab/scrivener_html.git", "f0245703abf7d0ce2b48a0f7e96997def7649e5f", [ref: "f0245703abf7d0ce2b48a0f7e96997def7649e5f"]},
   "scrivener_list": {:hex, :scrivener_list, "2.0.1", "2b3b5c6aaf21d13b76071e755af498b641f37a069e34e68585ba4c624095d719", [:mix], [{:scrivener_ecto, "~> 1.0 or ~> 2.0", [hex: :scrivener_ecto, repo: "hexpm", optional: false]}], "hexpm", "dc82a317268e24b29891b2de659cd82d15654f49ceee86846de2c96b3c4f4e5d"},
-  "sentry": {:hex, :sentry, "8.1.0", "8d235b62fce5f8e067ea1644e30939405b71a5e1599d9529ff82899d11d03f2b", [:mix], [{:hackney, "~> 1.8", [hex: :hackney, repo: "hexpm", optional: true]}, {:jason, "~> 1.1", [hex: :jason, repo: "hexpm", optional: true]}, {:plug, "~> 1.6", [hex: :plug, repo: "hexpm", optional: true]}, {:plug_cowboy, "~> 2.3", [hex: :plug_cowboy, repo: "hexpm", optional: true]}], "hexpm", "f9fc7641ef61e885510f5e5963c2948b9de1de597c63f781e9d3d6c9c8681ab4"},
+  "sentry": {:hex, :sentry, "10.1.0", "5d73c23deb5d95f3027fbb09801bd8e787065be61f0065418aed3961becbbe9f", [:mix], [{:hackney, "~> 1.8", [hex: :hackney, repo: "hexpm", optional: true]}, {:jason, "~> 1.1", [hex: :jason, repo: "hexpm", optional: true]}, {:nimble_options, "~> 1.0", [hex: :nimble_options, repo: "hexpm", optional: false]}, {:plug, "~> 1.6", [hex: :plug, repo: "hexpm", optional: true]}, {:plug_cowboy, "~> 2.3", [hex: :plug_cowboy, repo: "hexpm", optional: true]}], "hexpm", "f4319e7491133046912b4cf7cbe6f5226b309275d1a6d05386cce2ac7f97b2d2"},
   "sizeable": {:hex, :sizeable, "1.0.2", "625fe06a5dad188b52121a140286f1a6ae1adf350a942cf419499ecd8a11ee29", [:mix], [], "hexpm", "4bab548e6dfba777b400ca50830a9e3a4128e73df77ab1582540cf5860601762"},
   "sleeplocks": {:hex, :sleeplocks, "1.1.2", "d45aa1c5513da48c888715e3381211c859af34bee9b8290490e10c90bb6ff0ca", [:rebar3], [], "hexpm", "9fe5d048c5b781d6305c1a3a0f40bb3dfc06f49bf40571f3d2d0c57eaa7f59a5"},
   "ssl_verify_fun": {:hex, :ssl_verify_fun, "1.1.7", "354c321cf377240c7b8716899e182ce4890c5938111a1296add3ec74cf1715df", [:make, :mix, :rebar3], [], "hexpm", "fe4c190e8f37401d30167c8c405eda19469f34577987c76dde613e838bbc67f8"},

From f3f841a5cc444fd88b9b0ef7f5f627a89c2adf57 Mon Sep 17 00:00:00 2001
From: Antoine Augusti <antoine.augusti@transport.data.gouv.fr>
Date: Tue, 26 Dec 2023 16:25:33 +0100
Subject: [PATCH 18/25] =?UTF-8?q?Configuration=20:=20cloak=5Fkey=20doit=20?=
 =?UTF-8?q?=C3=AAtre=20pour=20:transport=20(#3685)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Config: cloak_key should be for :transport

* Run app.config before packaging code for Sentry
---
 Dockerfile         | 5 ++++-
 config/runtime.exs | 8 ++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 103b9873eb..47c08d47d1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -18,7 +18,10 @@ RUN cd apps/transport/client && yarn install && npm run build
 # assets digest must happen after the npm build step
 RUN mix phx.digest
 # Package source code for Sentry https://hexdocs.pm/sentry/upgrade-10-x.html
-# If we switch to releases, make sure to call this before `mix release`
+# If we switch to releases, make sure to call this before `mix release`.
+# Because we configure Sentry in `runtime.exs` we need to run `mix app.config` before.
+# See https://github.com/getsentry/sentry-elixir/pull/661
+RUN mix app.config
 RUN mix sentry.package_source_code
 
 EXPOSE 8080
diff --git a/config/runtime.exs b/config/runtime.exs
index e294144da0..4c53fde40a 100644
--- a/config/runtime.exs
+++ b/config/runtime.exs
@@ -217,10 +217,6 @@ if config_env() == :prod do
       tcp_keepalives_interval: "5",
       tcp_keepalives_count: "3"
     ],
-    # The key used by Cloak. See `Transport.Vault`.
-    # This value should be base64 encrypted
-    # See https://github.com/danielberkompas/cloak#configuration
-    cloak_key: System.fetch_env!("CLOAK_KEY"),
     socket_options: [keepalive: true],
     # See https://hexdocs.pm/db_connection/DBConnection.html#start_link/2-queue-config
     # [Ecto.Repo] :pool_timeout is no longer supported in favor of a new queue system described in DBConnection.start_link/2
@@ -247,6 +243,10 @@ if config_env() == :prod do
     # published by us on data.gouv.fr.
     # Overrides values set in `config.exs`
     config :transport,
+      # The key used by Cloak. See `Transport.Vault`.
+      # This value should be base64 encrypted
+      # See https://github.com/danielberkompas/cloak#configuration
+      cloak_key: System.fetch_env!("CLOAK_KEY"),
       consolidation:
         Map.merge(Application.fetch_env!(:transport, :consolidation), %{
           zfe: %{

From 29e05d707cc02045abf745b755f620025313384d Mon Sep 17 00:00:00 2001
From: Antoine Augusti <antoine.augusti@transport.data.gouv.fr>
Date: Wed, 27 Dec 2023 11:47:33 +0100
Subject: [PATCH 19/25] =?UTF-8?q?D=C3=A9place=20la=20config=20Sentry=20v10?=
 =?UTF-8?q?=20vers=20prod.exs=20(#3686)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Move Sentry config to prod.exs

* Move CLOAK_KEY as well
---
 Dockerfile         |  4 ----
 config/config.exs  |  2 +-
 config/prod.exs    | 20 ++++++++++++++++++++
 config/runtime.exs | 19 -------------------
 4 files changed, 21 insertions(+), 24 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 47c08d47d1..b4615b274a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -18,10 +18,6 @@ RUN cd apps/transport/client && yarn install && npm run build
 # assets digest must happen after the npm build step
 RUN mix phx.digest
 # Package source code for Sentry https://hexdocs.pm/sentry/upgrade-10-x.html
-# If we switch to releases, make sure to call this before `mix release`.
-# Because we configure Sentry in `runtime.exs` we need to run `mix app.config` before.
-# See https://github.com/getsentry/sentry-elixir/pull/661
-RUN mix app.config
 RUN mix sentry.package_source_code
 
 EXPOSE 8080
diff --git a/config/config.exs b/config/config.exs
index 5c10777e24..cecdb3404c 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -186,7 +186,7 @@ config :transport,
   transport_tools_folder: Path.absname("transport-tools/")
 
 # Disable sending events to Sentry by default.
-# Events are sent in production and staging, configured in `runtime.exs`
+# Events are sent in production and staging, configured in `prod.exs`
 config :sentry, dsn: nil
 
 # For now, never send session data (containing sensitive data in our case) nor params,
diff --git a/config/prod.exs b/config/prod.exs
index fa4df9a71d..723cd72f58 100644
--- a/config/prod.exs
+++ b/config/prod.exs
@@ -11,12 +11,32 @@ config :transport, TransportWeb.Endpoint,
   ]
 
 config :transport,
+  # The key used by Cloak. See `Transport.Vault`.
+  # This value should be base64 encrypted
+  # See https://github.com/danielberkompas/cloak#configuration
+  cloak_key: System.get_env("CLOAK_KEY"),
   s3_buckets: %{
     history: "resource-history-prod",
     on_demand_validation: "on-demand-validation-prod",
     gtfs_diff: "gtfs-diff-prod"
   }
 
+# Configure Sentry for production and staging.
+# Check out https://sentry.io/settings/transport-data-gouv-fr/projects/transport-site/install/elixir/
+config :sentry,
+  # Sentry events are only sent when `dsn` is not nil
+  # https://hexdocs.pm/sentry/upgrade-10-x.html#stop-using-included_environments
+  dsn: System.get_env("SENTRY_DSN"),
+  csp_url: System.get_env("SENTRY_CSP_URL"),
+  environment_name: "SENTRY_ENV" |> System.get_env(to_string(config_env())) |> String.to_atom(),
+  enable_source_code_context: true,
+  # https://hexdocs.pm/sentry/Sentry.html#module-configuration
+  # > a list of paths to the root of your application's source code.
+  # > For umbrella apps, you should set this to all the application paths in your umbrella
+  # Caveat: https://github.com/getsentry/sentry-elixir/issues/638
+  root_source_code_paths: [File.cwd!() |> Path.join("apps")],
+  filter: Transport.Shared.SentryExceptionFilter
+
 config :gbfs, GBFSWeb.Endpoint, secret_key_base: System.get_env("SECRET_KEY_BASE")
 
 # Do not print debug messages in production
diff --git a/config/runtime.exs b/config/runtime.exs
index 4c53fde40a..a21feb0607 100644
--- a/config/runtime.exs
+++ b/config/runtime.exs
@@ -223,30 +223,11 @@ if config_env() == :prod do
     # under "Queue config". For most users, configuring :timeout is enough, as it now includes both queue and query time
     timeout: 15_000
 
-  # Configure Sentry for production and staging.
-  # Check out https://sentry.io/settings/transport-data-gouv-fr/projects/transport-site/install/elixir/
-  config :sentry,
-    # Sentry events are only sent when `dsn` is not nil
-    # https://hexdocs.pm/sentry/upgrade-10-x.html#stop-using-included_environments
-    dsn: System.get_env("SENTRY_DSN"),
-    csp_url: System.get_env("SENTRY_CSP_URL"),
-    environment_name: "SENTRY_ENV" |> System.get_env() |> String.to_atom(),
-    enable_source_code_context: true,
-    # https://hexdocs.pm/sentry/Sentry.html#module-configuration
-    # > a list of paths to the root of your application's source code.
-    # > For umbrella apps, you should set this to all the application paths in your umbrella
-    root_source_code_path: File.cwd!() |> Path.join("apps/*") |> Path.wildcard(),
-    filter: Transport.Shared.SentryExceptionFilter
-
   if app_env == :production do
     # data.gouv.fr IDs for national databases created automatically and
     # published by us on data.gouv.fr.
     # Overrides values set in `config.exs`
     config :transport,
-      # The key used by Cloak. See `Transport.Vault`.
-      # This value should be base64 encrypted
-      # See https://github.com/danielberkompas/cloak#configuration
-      cloak_key: System.fetch_env!("CLOAK_KEY"),
       consolidation:
         Map.merge(Application.fetch_env!(:transport, :consolidation), %{
           zfe: %{

From 9b6534e507e14f2da3d07c11a2a316b86f8f67a0 Mon Sep 17 00:00:00 2001
From: Antoine Augusti <antoine.augusti@transport.data.gouv.fr>
Date: Wed, 27 Dec 2023 17:07:48 +0100
Subject: [PATCH 20/25] Suppression fichier .env.example (#3690)

* Remove .env.example

* Update .gitignore

* Remove .envrc mentions in learning track

---------

Co-authored-by: Vincent Degove <vincent.degove@beta.gouv.fr>
---
 .env.example      | 20 --------------------
 .gitignore        |  4 ++--
 README.md         |  5 ++---
 learning_track.md |  4 +---
 4 files changed, 5 insertions(+), 28 deletions(-)
 delete mode 100644 .env.example

diff --git a/.env.example b/.env.example
deleted file mode 100644
index 5817143aa0..0000000000
--- a/.env.example
+++ /dev/null
@@ -1,20 +0,0 @@
-SECRET_KEY_BASE="SOME-LONG-SECRET-KEY-BASE-FOR-TESTING-SOME-LONG-SECRET-KEY-BASE-FOR-TESTING"
-
-GTFS_VALIDATOR_URL=https://transport-validator.cleverapps.io
-
-DATAGOUVFR_SITE=https://demo.data.gouv.fr
-DATAGOUVFR_REDIRECT_URI=http://localhost:5000/login/callback
-DATAGOUVFR_CLIENT_SECRET=
-DATAGOUVFR_CLIENT_ID=
-DATAGOUVFR_API_KEY=
-
-
-# Optional ----------------------
-CELLAR_ACCESS_KEY_ID=
-CELLAR_SECRET_ACCESS_KEY=
-
-MJ_APIKEY_PUBLIC=
-MJ_APIKEY_PRIVATE=
-
-JCDECAUX_APIKEY=
-# -------------------------------
diff --git a/.gitignore b/.gitignore
index bf40bc3c1f..a684c35c3a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,9 +23,9 @@ apps/transport/priv/static/css/*
 apps/transport/priv/static/fonts/*
 apps/transport/priv/static/images/*
 apps/transport/priv/static/js/*
-# Environment varabiables files
+
+# Environment variables files
 /.env
-/.envrc
 
 # The config/prod.secret.exs file by default contains sensitive
 # data and you should not commit it into version control.
diff --git a/README.md b/README.md
index d407f5db7c..2dca36e79c 100644
--- a/README.md
+++ b/README.md
@@ -239,10 +239,9 @@ See the [learning track document](learning_track.md).
 
 ## Development
 
-If you don't plan to work a lot on this project, the docker installation is way easier.
+If you don't plan to work a lot on this project, the Docker installation is way easier.
 
-You need a .env file, and can use .env.example to see which variables need to be set.
-(No need to setup the variable `PG_URL`, it is defined in the docker-compose.yml)
+Some environment variables may be needed to configure the app, see the files in the `config` folder.
 
 Then you only need to run:
   `docker-compose up`
diff --git a/learning_track.md b/learning_track.md
index 0544c1b6ed..6a03bac12d 100644
--- a/learning_track.md
+++ b/learning_track.md
@@ -15,12 +15,10 @@ This guide tracks useful steps to learn how to maintain and modify this system.
 
 * Install the required tooling (Elixir/Erlang/Node/Postgres) - see readme
 * Restore a production database - see readme
-* Ask the team how to fill `.envrc` for minimal use (this will be improved later to avoid that)
 * Do not attempt to install the "validator" yet, nor to access the admin backoffice
 
 ### Run the test suite locally
 
-* Double-check `.envrc` values (this requirement will go away later)
 * Make sure to run ChromeDriver in a way or another
 * Run the test suite with `mix test`
 * Learn how to run a single test (see readme), as this is very useful for debugging
@@ -121,7 +119,7 @@ This guide tracks useful steps to learn how to maintain and modify this system.
 
 * Compile the validator project with `cargo build --release`
 * Run it as a server with `./target/release/main`
-* Use the displayed host & port (e.g. `http://127.0.0.1:7878`) to fill your `.envrc` configuration (`export GTFS_VALIDATOR_URL=http://127.0.0.1:7878`)
+* Override in dev.secret.exs the `gtfs_validator_url` defined in dev.exs with the displayed host & port (e.g. `http://127.0.0.1:7878`)
 * Run the site with `mix phx.server`
 * Go to `http://localhost:5000/validate`
 * Upload a GTFS file

From 5e5b00a2621d95352994bb372b6cfedee25026c3 Mon Sep 17 00:00:00 2001
From: Antoine Augusti <antoine.augusti@transport.data.gouv.fr>
Date: Thu, 28 Dec 2023 09:36:35 +0100
Subject: [PATCH 21/25] =?UTF-8?q?G=C3=A8re=20erreur=20HTTP=20dans=20Transp?=
 =?UTF-8?q?ort.GTFSRT=20(#3683)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Fix exception

* Use inspect on error reason elsewhere
---
 apps/transport/lib/jobs/resource_history_job.ex        |  2 +-
 apps/transport/lib/transport/gtfs_rt.ex                |  2 +-
 .../lib/transport_web/live/siri_querier_live.ex        |  2 +-
 apps/transport/test/transport/gtfs_rt_test.exs         | 10 ++++++++--
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/apps/transport/lib/jobs/resource_history_job.ex b/apps/transport/lib/jobs/resource_history_job.ex
index 1540c4f0dd..9f54856d8c 100644
--- a/apps/transport/lib/jobs/resource_history_job.ex
+++ b/apps/transport/lib/jobs/resource_history_job.ex
@@ -288,7 +288,7 @@ defmodule Transport.Jobs.ResourceHistoryJob do
         {:error, "Got a non 200 status: #{status}"}
 
       {:error, %HTTPoison.Error{reason: reason}} ->
-        {:error, "Got an error: #{reason}"}
+        {:error, "Got an error: #{inspect(reason)}"}
     end
   end
 
diff --git a/apps/transport/lib/transport/gtfs_rt.ex b/apps/transport/lib/transport/gtfs_rt.ex
index 10f84331eb..0cd1764c21 100644
--- a/apps/transport/lib/transport/gtfs_rt.ex
+++ b/apps/transport/lib/transport/gtfs_rt.ex
@@ -26,7 +26,7 @@ defmodule Transport.GTFSRT do
         {:error, "Got a non 200 HTTP status code: #{status_code}"}
 
       {:error, %HTTPoison.Error{reason: reason}} ->
-        {:error, "Got an HTTP error: #{reason}"}
+        {:error, "Got an HTTP error: #{inspect(reason)}"}
     end
   end
 
diff --git a/apps/transport/lib/transport_web/live/siri_querier_live.ex b/apps/transport/lib/transport_web/live/siri_querier_live.ex
index 3b3e281434..0558ce80ff 100644
--- a/apps/transport/lib/transport_web/live/siri_querier_live.ex
+++ b/apps/transport/lib/transport_web/live/siri_querier_live.ex
@@ -106,7 +106,7 @@ defmodule TransportWeb.Live.SIRIQuerierLive do
           })
 
         {:error, %HTTPoison.Error{reason: reason}} ->
-          socket |> assign(siri_response_error: reason, siri_response_status_code: nil)
+          socket |> assign(siri_response_error: inspect(reason), siri_response_status_code: nil)
       end
 
     {:noreply, socket}
diff --git a/apps/transport/test/transport/gtfs_rt_test.exs b/apps/transport/test/transport/gtfs_rt_test.exs
index 73603e7b8c..cd9509f747 100644
--- a/apps/transport/test/transport/gtfs_rt_test.exs
+++ b/apps/transport/test/transport/gtfs_rt_test.exs
@@ -39,9 +39,15 @@ defmodule Transport.GTFSRTTest do
     end
 
     test "HTTPoison error" do
-      setup_http_response(@url, {:error, %HTTPoison.Error{reason: "SSL problemz"}})
+      reason =
+        {:tls_alert,
+         {:certificate_expired,
+          ~c"TLS client: In state certify at ssl_handshake.erl:2065 generated CLIENT ALERT: Fatal - Certificate Expired\n"}}
 
-      assert {:error, "Got an HTTP error: SSL problemz"} == GTFSRT.decode_remote_feed(@url)
+      setup_http_response(@url, {:error, %HTTPoison.Error{reason: reason}})
+
+      {:error, reason} = GTFSRT.decode_remote_feed(@url)
+      assert reason =~ ~r"^Got an HTTP error:"
     end
   end
 

From 7b644bc8f8bc9ab190569bbbc19a690c8baae6cc Mon Sep 17 00:00:00 2001
From: Antoine Augusti <antoine.augusti@transport.data.gouv.fr>
Date: Tue, 2 Jan 2024 16:54:15 +0100
Subject: [PATCH 22/25] =?UTF-8?q?=C3=89xecution=20de=20quelques=20tests=20?=
 =?UTF-8?q?ops=20(#3698)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Work on ops tests

* Add tests for email records

* CI job: add name

* Add more DKIM records
---
 .github/workflows/ops_tests.yml | 14 +++++
 ops_tests/ops_tests.exs         | 98 +++++++++++++++++++++++++++------
 2 files changed, 95 insertions(+), 17 deletions(-)
 create mode 100644 .github/workflows/ops_tests.yml

diff --git a/.github/workflows/ops_tests.yml b/.github/workflows/ops_tests.yml
new file mode 100644
index 0000000000..a0af9d8663
--- /dev/null
+++ b/.github/workflows/ops_tests.yml
@@ -0,0 +1,14 @@
+name: CI ops tests
+on: push
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    name: Run ops tests
+    steps:
+      - uses: actions/checkout@v4
+      - uses: erlef/setup-beam@v1
+        with:
+          version-file: .tool-versions
+          version-type: strict
+      - run: elixir ops_tests/ops_tests.exs
diff --git a/ops_tests/ops_tests.exs b/ops_tests/ops_tests.exs
index a01d5d563f..fd27355d4e 100644
--- a/ops_tests/ops_tests.exs
+++ b/ops_tests/ops_tests.exs
@@ -3,27 +3,21 @@
 ExUnit.start()
 
 Mix.install([
-  {:req, "~> 0.2.1"}
+  {:req, "~> 0.4.8"},
+  {:dns, "~> 2.4.0"}
 ])
 
 defmodule Transport.OpsTests do
-  use ExUnit.Case
+  use ExUnit.Case, async: true
 
-  def get_header!(headers, header) do
-    {_header, value} =
-      headers
-      |> Enum.find(fn {k, _} -> k == header end)
-
-    value
-  end
-
-  def assert_redirect(from: url, to: target_url) do
-    %{status: 301, headers: headers} =
-      Req.build(:get, url)
-      |> Req.run!()
-
-    assert get_header!(headers, "location") == target_url
-  end
+  # See https://developers.clever-cloud.com/doc/administrate/domain-names/#your-application-runs-in-the-europeparis-par-zone
+  @domain_name "transport.data.gouv.fr"
+  @clever_cloud_ip_addresses [
+    {46, 252, 181, 103},
+    {46, 252, 181, 104},
+    {185, 42, 117, 108},
+    {185, 42, 117, 109}
+  ]
 
   test "correct DOMAIN_NAME for prod-worker" do
     assert_redirect(
@@ -38,4 +32,74 @@ defmodule Transport.OpsTests do
       to: "https://workers.prochainement.transport.data.gouv.fr/"
     )
   end
+
+  test "redirects from www to non-www" do
+    assert_redirect(from: "https://www.#{@domain_name}", to: "https://#{@domain_name}/")
+  end
+
+  describe "Check DNS records" do
+    test "main A/CNAME records" do
+      {:ok, ips} = DNS.resolve(@domain_name, :a)
+      assert MapSet.new(ips) == MapSet.new(@clever_cloud_ip_addresses)
+
+      # CNAMEs to Clever Cloud
+      [
+        "prochainement",
+        "proxy",
+        "proxy.prochainement",
+        "validation",
+        "workers",
+        "workers.prochainement",
+        "www"
+      ]
+      |> Enum.each(fn subdomain ->
+        record = "#{subdomain}.#{@domain_name}"
+        assert {:ok, [~c"domain.par.clever-cloud.com"]} == DNS.resolve(record, :cname), "Wrong DNS record for #{record}"
+      end)
+
+      # Satellite websites
+      assert {:ok, [~c"transport-blog.netlify.app"]} == DNS.resolve("blog.#{@domain_name}", :cname)
+      assert {:ok, [~c"transport-contribuer.netlify.app"]} == DNS.resolve("contribuer.#{@domain_name}", :cname)
+      assert {:ok, [~c"hosting.gitbook.com"]} == DNS.resolve("doc.#{@domain_name}", :cname)
+      assert {:ok, [~c"stats.uptimerobot.com"]} == DNS.resolve("status.#{@domain_name}", :cname)
+    end
+
+    test "MX records" do
+      {:ok, records} = DNS.resolve(@domain_name, :mx)
+      assert MapSet.new([{10, ~c"mx1.alwaysdata.com"}, {20, ~c"mx2.alwaysdata.com"}]) == MapSet.new(records)
+      assert {:ok, [{100, ~c"mx.sendgrid.net"}]} = DNS.resolve("front-mail.#{@domain_name}", :mx)
+    end
+
+    test "SPF, DKIM and DMARC" do
+      # SPF
+      {:ok, records} = DNS.resolve(@domain_name, :txt)
+
+      assert Enum.member?(records, [
+               ~c"v=spf1 include:spf.mailjet.com include:_spf.alwaysdata.com include:_spf.scw-tem.cloud include:servers.mcsv.net -all"
+             ])
+
+      assert {:ok, [[~c"v=spf1 include:sendgrid.net ~all"]]} = DNS.resolve("front-mail.#{@domain_name}", :txt)
+
+      # DKIM
+      assert {:ok, _} = DNS.resolve("37d278a7-e548-4029-a58d-111bdcf23d46._domainkey.#{@domain_name}", :txt)
+      assert {:ok, _} = DNS.resolve("default._domainkey.#{@domain_name}", :txt)
+      assert {:ok, _} = DNS.resolve("fnt._domainkey.#{@domain_name}", :txt)
+      assert {:ok, _} = DNS.resolve("mailjet._domainkey.#{@domain_name}", :txt)
+      assert {:ok, [~c"dkim2.mcsv.net"]} == DNS.resolve("k2._domainkey.#{@domain_name}", :cname)
+      assert {:ok, [~c"dkim3.mcsv.net"]} == DNS.resolve("k3._domainkey.#{@domain_name}", :cname)
+
+      # DMARC
+      assert {:ok, [[~c"v=DMARC1;p=quarantine;"]]} == DNS.resolve("_dmarc.#{@domain_name}", :txt)
+    end
+  end
+
+  def get_header!(headers, header) do
+    {_header, [value]} = Enum.find(headers, fn {k, _} -> k == header end)
+    value
+  end
+
+  def assert_redirect(from: url, to: target_url) do
+    %Req.Response{status: 301, headers: headers} = Req.get!(url, redirect: false)
+    assert get_header!(headers, "location") == target_url
+  end
 end

From 14d9d74492f5b308f46ab49ed9b5732bb80203a7 Mon Sep 17 00:00:00 2001
From: Antoine Augusti <antoine.augusti@transport.data.gouv.fr>
Date: Tue, 2 Jan 2024 16:55:42 +0100
Subject: [PATCH 23/25] =?UTF-8?q?ImportDatasetMonthlyMetricsJob=20:=20mise?=
 =?UTF-8?q?=20=C3=A0=20jour=20updated=5Fat=20(#3699)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lib/jobs/import_dataset_monthly_metrics_job.ex         | 6 ++++--
 .../jobs/import_dataset_monthly_metrics_job_test.exs       | 7 ++++++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/apps/transport/lib/jobs/import_dataset_monthly_metrics_job.ex b/apps/transport/lib/jobs/import_dataset_monthly_metrics_job.ex
index 73dc1c4a8e..ab8b100787 100644
--- a/apps/transport/lib/jobs/import_dataset_monthly_metrics_job.ex
+++ b/apps/transport/lib/jobs/import_dataset_monthly_metrics_job.ex
@@ -69,16 +69,18 @@ defmodule Transport.Jobs.ImportDatasetMonthlyMetricsJob do
          dataset_datagouv_id
        ) do
     Enum.each([{:views, monthly_visit}, {:downloads, monthly_download_resource}], fn {metric_name, count} ->
+      count = count || 0
+
       %DB.DatasetMonthlyMetric{}
       |> DB.DatasetMonthlyMetric.changeset(%{
         dataset_datagouv_id: dataset_datagouv_id,
         year_month: metric_month,
         metric_name: metric_name,
-        count: count || 0
+        count: count
       })
       |> DB.Repo.insert!(
         conflict_target: [:dataset_datagouv_id, :year_month, :metric_name],
-        on_conflict: {:replace, [:count]}
+        on_conflict: [set: [count: count, updated_at: DateTime.utc_now()]]
       )
     end)
   end
diff --git a/apps/transport/test/transport/jobs/import_dataset_monthly_metrics_job_test.exs b/apps/transport/test/transport/jobs/import_dataset_monthly_metrics_job_test.exs
index 20114f6dd7..44e7fc5c34 100644
--- a/apps/transport/test/transport/jobs/import_dataset_monthly_metrics_job_test.exs
+++ b/apps/transport/test/transport/jobs/import_dataset_monthly_metrics_job_test.exs
@@ -103,7 +103,9 @@ defmodule Transport.Test.Transport.Jobs.ImportDatasetMonthlyMetricsTestJob do
                  dataset_datagouv_id: ^datagouv_id,
                  year_month: "2023-12",
                  metric_name: :views,
-                 count: 1337
+                 count: 1337,
+                 inserted_at: inserted_at,
+                 updated_at: updated_at
                },
                # Has been inserted
                %DB.DatasetMonthlyMetric{
@@ -113,6 +115,9 @@ defmodule Transport.Test.Transport.Jobs.ImportDatasetMonthlyMetricsTestJob do
                  count: 43
                }
              ] = DB.Repo.all(DB.DatasetMonthlyMetric)
+
+      # `updated_at` has been updated to reflect that this row has changed
+      assert DateTime.after?(updated_at, inserted_at)
     end
   end
 

From 052df6fa852cb884a6a9954f8805bf74f94cd5e0 Mon Sep 17 00:00:00 2001
From: Antoine Augusti <antoine.augusti@transport.data.gouv.fr>
Date: Sat, 6 Jan 2024 22:51:49 +0100
Subject: [PATCH 24/25] Dataset#details : corrige nombre de ressources (#3706)

---
 apps/transport/lib/transport_web/views/dataset_view.ex   | 9 +++++----
 .../test/transport_web/controllers/dataset_view_test.exs | 5 +++--
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/apps/transport/lib/transport_web/views/dataset_view.ex b/apps/transport/lib/transport_web/views/dataset_view.ex
index 42c7b4de0d..02811212c1 100644
--- a/apps/transport/lib/transport_web/views/dataset_view.ex
+++ b/apps/transport/lib/transport_web/views/dataset_view.ex
@@ -15,13 +15,14 @@ defmodule TransportWeb.DatasetView do
   @gtfs_rt_validator_name Transport.Validators.GTFSRT.validator_name()
 
   @doc """
-  Count the number of resources (official + community), excluding resources with a `documentation` type.
+  Count the number of resources, excluding:
+  - community resources
+  - resources with a `documentation` type.
   """
   @spec count_resources(Dataset.t()) :: non_neg_integer
   def count_resources(dataset) do
-    nb_resources = Enum.count(official_available_resources(dataset))
-    nb_community_resources = Enum.count(community_resources(dataset))
-    nb_resources + nb_community_resources - count_documentation_resources(dataset)
+    nb_official_resources = dataset |> official_available_resources() |> Enum.count()
+    nb_official_resources - count_documentation_resources(dataset)
   end
 
   @spec count_documentation_resources(Dataset.t()) :: non_neg_integer
diff --git a/apps/transport/test/transport_web/controllers/dataset_view_test.exs b/apps/transport/test/transport_web/controllers/dataset_view_test.exs
index 07361827b6..4247f881bd 100644
--- a/apps/transport/test/transport_web/controllers/dataset_view_test.exs
+++ b/apps/transport/test/transport_web/controllers/dataset_view_test.exs
@@ -120,13 +120,14 @@ defmodule TransportWeb.DatasetViewTest do
   test "count_resources and count_documentation_resources" do
     dataset = insert(:dataset)
     insert(:resource, type: "documentation", url: "https://example.com/doc", dataset: dataset)
+    insert(:resource, type: "documentation", url: "https://example.com/more_doc", dataset: dataset)
     insert(:resource, type: "main", url: "https://example.com/file", dataset: dataset)
     insert(:resource, type: "main", url: "https://example.com/community", dataset: dataset, is_community_resource: true)
 
     dataset = dataset |> DB.Repo.preload(:resources)
 
-    assert count_resources(dataset) == 2
-    assert count_documentation_resources(dataset) == 1
+    assert count_resources(dataset) == 1
+    assert count_documentation_resources(dataset) == 2
   end
 
   describe "licence_link" do

From e20d3866776304d96160e4f093b2ca94587edaa8 Mon Sep 17 00:00:00 2001
From: Antoine Augusti <antoine.augusti@transport.data.gouv.fr>
Date: Mon, 8 Jan 2024 10:08:34 +0100
Subject: [PATCH 25/25] Table dataset : ajout de contraintes not null (#3700)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Table dataset : ajout de contraintes not null

* Work on tests

* Remove _small for full_logo

---------

Co-authored-by: Thibaut Barrère <thibaut.barrere@gmail.com>
---
 .../20240102144643_dataset_add_not_null.exs   |  31 ++++
 apps/transport/test/support/factory.ex        |  38 ++++-
 .../community_resource_cleaner_test.exs       |   6 +-
 .../test/transport/import_data_test.exs       |  31 +---
 .../api/datasets_controller_test.exs          |   6 +-
 .../controllers/api/stats_controller_test.exs |   6 +-
 .../backoffice/backoffice_controller_test.exs |   5 +-
 .../backoffice/dataset_controller_test.exs    |   6 +-
 .../controllers/dataset_search_test.exs       |  92 ++++++------
 .../controllers/resource_controller_test.exs  | 141 +++++++++---------
 .../transport_web/controllers/seo_test.exs    |  52 +++----
 11 files changed, 219 insertions(+), 195 deletions(-)
 create mode 100644 apps/transport/priv/repo/migrations/20240102144643_dataset_add_not_null.exs

diff --git a/apps/transport/priv/repo/migrations/20240102144643_dataset_add_not_null.exs b/apps/transport/priv/repo/migrations/20240102144643_dataset_add_not_null.exs
new file mode 100644
index 0000000000..68be3b5a31
--- /dev/null
+++ b/apps/transport/priv/repo/migrations/20240102144643_dataset_add_not_null.exs
@@ -0,0 +1,31 @@
+defmodule DB.Repo.Migrations.DatasetAddNotNull do
+  use Ecto.Migration
+
+  @attributes [
+    :datagouv_id,
+    :custom_title,
+    :licence,
+    :logo,
+    :full_logo,
+    :slug,
+    :tags,
+    :datagouv_title,
+    :type,
+    :frequency,
+    :has_realtime,
+    :is_active,
+    :nb_reuses
+  ]
+
+  def up do
+    Enum.each(@attributes, fn attribute ->
+      execute("ALTER TABLE dataset ALTER COLUMN #{attribute} SET NOT NULL")
+    end)
+  end
+
+  def down do
+    Enum.each(@attributes, fn attribute ->
+      execute("ALTER TABLE dataset ALTER COLUMN #{attribute} DROP NOT NULL")
+    end)
+  end
+end
diff --git a/apps/transport/test/support/factory.ex b/apps/transport/test/support/factory.ex
index 2d81d9c016..791cf3a198 100644
--- a/apps/transport/test/support/factory.ex
+++ b/apps/transport/test/support/factory.ex
@@ -59,7 +59,13 @@ defmodule DB.Factory do
       # NOTE: need to figure out how to pass aom/region together with changeset checks here
       aom: build(:aom),
       tags: [],
-      type: "public-transit"
+      type: "public-transit",
+      logo: "https://example.com/#{Ecto.UUID.generate()}_small.png",
+      full_logo: "https://example.com/#{Ecto.UUID.generate()}.png",
+      frequency: "daily",
+      has_realtime: false,
+      is_active: true,
+      nb_reuses: Enum.random(0..10)
     }
   end
 
@@ -211,15 +217,17 @@ defmodule DB.Factory do
       region_id: Keyword.get(opts, :region_id),
       has_realtime: Keyword.get(opts, :has_realtime),
       type: Keyword.get(opts, :type),
-      aom: Keyword.get(opts, :aom),
+      aom: aom = Keyword.get(opts, :aom),
       custom_title: Keyword.get(opts, :custom_title)
     ]
 
     dataset_opts =
-      case Keyword.get(opts, :aom) do
+      aom
+      |> case do
         nil -> dataset_opts
         aom -> dataset_opts |> Keyword.merge(aom: aom)
       end
+      |> Enum.reject(fn {_, v} -> is_nil(v) end)
 
     dataset = Keyword.get(opts, :dataset, insert(:dataset, dataset_opts))
 
@@ -319,4 +327,28 @@ defmodule DB.Factory do
     |> Map.merge(args)
     |> DB.Contact.insert!()
   end
+
+  def datagouv_dataset_response(%{} = attributes \\ %{}) do
+    Map.merge(
+      %{
+        "id" => Ecto.UUID.generate(),
+        "title" => "dataset",
+        "created_at" => DateTime.utc_now() |> to_string(),
+        "last_update" => DateTime.utc_now() |> to_string(),
+        "slug" => "dataset-slug",
+        "license" => "lov2",
+        "frequency" => "daily",
+        "tags" => [],
+        "organization" => %{
+          "id" => Ecto.UUID.generate(),
+          "name" => "Org " <> Ecto.UUID.generate(),
+          "badges" => [],
+          "logo" => "https://example.com/img.jpg",
+          "logo_thumbnail" => "https://example.com/img.small.jpg",
+          "slug" => Ecto.UUID.generate()
+        }
+      },
+      attributes
+    )
+  end
 end
diff --git a/apps/transport/test/transport/community_resource_cleaner_test.exs b/apps/transport/test/transport/community_resource_cleaner_test.exs
index 99579fdf82..38d89a56a6 100644
--- a/apps/transport/test/transport/community_resource_cleaner_test.exs
+++ b/apps/transport/test/transport/community_resource_cleaner_test.exs
@@ -13,7 +13,11 @@ defmodule Transport.CommunityResourcesCleanerTest do
     :ok = Ecto.Adapters.SQL.Sandbox.checkout(DB.Repo)
   end
 
-  defp insert_dataset_associated_with_ressources(resources, datagouv_id \\ nil) do
+  defp insert_dataset_associated_with_ressources(resources) do
+    insert_dataset_associated_with_ressources(resources, Ecto.UUID.generate())
+  end
+
+  defp insert_dataset_associated_with_ressources(resources, datagouv_id) do
     :dataset
     |> insert(%{datagouv_id: datagouv_id})
     |> Repo.preload(:resources)
diff --git a/apps/transport/test/transport/import_data_test.exs b/apps/transport/test/transport/import_data_test.exs
index 4f06603b83..89e580ab29 100644
--- a/apps/transport/test/transport/import_data_test.exs
+++ b/apps/transport/test/transport/import_data_test.exs
@@ -39,6 +39,7 @@ defmodule Transport.ImportDataTest do
         "id" => id || "resource1_id",
         "type" => "main",
         "filetype" => filetype || "remote",
+        "format" => "zip",
         "last_modified" => DateTime.utc_now() |> DateTime.add(-1, :hour) |> DateTime.to_iso8601(),
         "schema" => %{"name" => schema_name, "version" => schema_version}
       }
@@ -46,37 +47,11 @@ defmodule Transport.ImportDataTest do
   end
 
   def generate_dataset_payload(datagouv_id, resources \\ nil) do
-    resources = resources || generate_resources_payload()
-
-    %{
-      "title" => "dataset1",
-      "id" => datagouv_id,
-      "created_at" => DateTime.utc_now() |> to_string(),
-      "last_update" => DateTime.utc_now() |> to_string(),
-      "slug" => "dataset-slug",
-      "resources" => resources,
-      "organization" => %{
-        "id" => Ecto.UUID.generate(),
-        "name" => "Org " <> Ecto.UUID.generate(),
-        "badges" => [],
-        "logo" => "https://example.com/img.jpg",
-        "logo_thumbnail" => "https://example.com/img.small.jpg",
-        "slug" => Ecto.UUID.generate()
-      }
-    }
+    datagouv_dataset_response(%{"id" => datagouv_id, "resources" => resources || generate_resources_payload()})
   end
 
   def insert_national_dataset(datagouv_id) do
-    {:ok, changes} =
-      DB.Dataset.changeset(%{
-        "created_at" => DateTime.utc_now(),
-        "last_update" => DateTime.utc_now(),
-        "datagouv_id" => datagouv_id,
-        "slug" => "ma_limace",
-        "national_dataset" => "true"
-      })
-
-    DB.Repo.insert!(changes)
+    insert(:dataset, datagouv_id: datagouv_id, aom: nil, region_id: DB.Repo.get_by!(DB.Region, nom: "National").id)
   end
 
   def http_get_mock_200(datagouv_id, payload \\ nil) do
diff --git a/apps/transport/test/transport_web/controllers/api/datasets_controller_test.exs b/apps/transport/test/transport_web/controllers/api/datasets_controller_test.exs
index 25da537d80..79baeacbd1 100644
--- a/apps/transport/test/transport_web/controllers/api/datasets_controller_test.exs
+++ b/apps/transport/test/transport_web/controllers/api/datasets_controller_test.exs
@@ -253,7 +253,7 @@ defmodule TransportWeb.API.DatasetControllerTest do
 
   test "GET /api/datasets/:id *without* history, multi_validation and resource_metadata", %{conn: conn} do
     dataset =
-      %DB.Dataset{
+      insert(:dataset,
         custom_title: "title",
         is_active: true,
         type: "public-transit",
@@ -287,9 +287,7 @@ defmodule TransportWeb.API.DatasetControllerTest do
         created_at: ~U[2021-12-23 13:30:40.000000Z],
         last_update: DateTime.utc_now(),
         aom: %DB.AOM{id: 4242, nom: "Angers Métropole", siren: "siren"}
-      }
-      |> DB.Repo.insert!()
-      |> DB.Repo.preload(:resources)
+      )
 
     Transport.History.Fetcher.Mock
     |> expect(:history_resources, fn _, options ->
diff --git a/apps/transport/test/transport_web/controllers/api/stats_controller_test.exs b/apps/transport/test/transport_web/controllers/api/stats_controller_test.exs
index 7a681989d6..67ce73262d 100644
--- a/apps/transport/test/transport_web/controllers/api/stats_controller_test.exs
+++ b/apps/transport/test/transport_web/controllers/api/stats_controller_test.exs
@@ -212,7 +212,11 @@ defmodule TransportWeb.API.StatsControllerTest do
     insert(:dataset, type: "public-transit", is_active: true, legal_owners_aom: [aom])
     insert(:dataset, type: "public-transit", is_active: true, legal_owners_aom: [aom])
 
-    insert_resource_and_friends(Date.utc_today() |> Date.add(10), aom: aom, max_error: "Error")
+    insert_resource_and_friends(Date.utc_today() |> Date.add(10),
+      aom: aom,
+      max_error: "Error",
+      type: "low-emission-zones"
+    )
 
     assert [
              %{
diff --git a/apps/transport/test/transport_web/controllers/backoffice/backoffice_controller_test.exs b/apps/transport/test/transport_web/controllers/backoffice/backoffice_controller_test.exs
index c5d3e9b2a3..e84087f6a0 100644
--- a/apps/transport/test/transport_web/controllers/backoffice/backoffice_controller_test.exs
+++ b/apps/transport/test/transport_web/controllers/backoffice/backoffice_controller_test.exs
@@ -137,11 +137,9 @@ defmodule TransportWeb.BackofficeControllerTest do
     |> expect(:get!, fn "https://demo.data.gouv.fr/api/1/datasets/12/", [], _ ->
       body =
         %{
-          "created_at" => DateTime.utc_now(),
-          "last_update" => DateTime.utc_now(),
+          "id" => dataset_datagouv_id,
           "slug" => "dataset-slug",
           "type" => "public-transit",
-          "id" => dataset_datagouv_id,
           "resources" => [
             %{
               "last_modified" => DateTime.utc_now() |> DateTime.to_iso8601(),
@@ -151,6 +149,7 @@ defmodule TransportWeb.BackofficeControllerTest do
             }
           ]
         }
+        |> DB.Factory.datagouv_dataset_response()
         |> Jason.encode!()
 
       %HTTPoison.Response{body: body, status_code: 200}
diff --git a/apps/transport/test/transport_web/controllers/backoffice/dataset_controller_test.exs b/apps/transport/test/transport_web/controllers/backoffice/dataset_controller_test.exs
index 408dbcc9b4..d01c7ddb04 100644
--- a/apps/transport/test/transport_web/controllers/backoffice/dataset_controller_test.exs
+++ b/apps/transport/test/transport_web/controllers/backoffice/dataset_controller_test.exs
@@ -55,8 +55,7 @@ defmodule TransportWeb.Backoffice.DatasetControllerTest do
       assert "https://demo.data.gouv.fr/api/1/datasets/#{datagouv_id_2}/" == url
 
       %HTTPoison.Response{
-        body:
-          ~s({"id": "#{datagouv_id_2}", "resources": [], "slug": "#{slug_2}", "created_at": "2023-03-22 15:53:50+00:00", "last_update": "2023-03-22 15:53:50+00:00"}),
+        body: Jason.encode!(datagouv_dataset_response(%{"id" => datagouv_id_2, "slug" => slug_2, "resources" => []})),
         status_code: 200
       }
     end)
@@ -151,8 +150,7 @@ defmodule TransportWeb.Backoffice.DatasetControllerTest do
     Transport.HTTPoison.Mock
     |> expect(:get!, fn "https://demo.data.gouv.fr/api/1/datasets/datagouv_id/", _, _ ->
       %HTTPoison.Response{
-        body:
-          ~s({"id": "datagouv_id", "resources": [], "created_at": "2023-03-22 15:53:50+00:00", "last_update": "2023-03-22 15:53:50+00:00"}),
+        body: Jason.encode!(datagouv_dataset_response(%{"resources" => []})),
         status_code: 200
       }
     end)
diff --git a/apps/transport/test/transport_web/controllers/dataset_search_test.exs b/apps/transport/test/transport_web/controllers/dataset_search_test.exs
index ae433cd6b3..e8b25f6c53 100644
--- a/apps/transport/test/transport_web/controllers/dataset_search_test.exs
+++ b/apps/transport/test/transport_web/controllers/dataset_search_test.exs
@@ -2,59 +2,53 @@ defmodule TransportWeb.DatasetSearchControllerTest do
   use TransportWeb.ConnCase, async: true
   use TransportWeb.DatabaseCase, cleanup: [:datasets]
   import DB.Factory
-  alias DB.{AOM, Dataset, Repo, Resource}
-  import DB.Factory
 
   doctest TransportWeb.DatasetController
 
   setup do
-    {:ok, _} =
-      %Dataset{
-        created_at: DateTime.utc_now(),
-        last_update: DateTime.utc_now(),
-        description: "Un jeu de données",
-        licence: "odc-odbl",
-        datagouv_title: "Horaires et arrêts du réseau IRIGO - format GTFS",
-        custom_title: "Horaires Angers",
-        type: "public-transit",
-        slug: "horaires-et-arrets-du-reseau-irigo-format-gtfs",
-        datagouv_id: "5b4cd3a0b59508054dd496cd",
-        frequency: "yearly",
-        tags: [],
-        resources: [
-          %Resource{
-            last_update: DateTime.utc_now() |> DateTime.add(-6, :hour),
-            last_import: DateTime.utc_now() |> DateTime.add(-1, :hour),
-            url: "https://link.to/angers.zip",
-            title: "angers.zip"
-          }
-        ],
-        aom: %AOM{id: 4242, nom: "Angers Métropôle"}
-      }
-      |> Repo.insert()
-
-    {:ok, _} =
-      %Dataset{
-        created_at: DateTime.utc_now(),
-        last_update: DateTime.utc_now(),
-        description: "Un autre jeu de données",
-        licence: "lov2",
-        datagouv_title: "offre de transport du réseau de LAVAL Agglomération (GTFS)",
-        custom_title: "Horaires Laval",
-        slug: "offre-de-transport-du-reseau-de-laval-agglomeration-gtfs",
-        type: "public-transit",
-        datagouv_id: "5bc493d08b4c416c84a69500",
-        frequency: "yearly",
-        tags: [],
-        resources: [
-          %Resource{
-            last_update: DateTime.utc_now() |> DateTime.add(-6, :hour),
-            last_import: DateTime.utc_now() |> DateTime.add(-1, :hour),
-            url: "https://link.to/angers.zip"
-          }
-        ]
-      }
-      |> Repo.insert()
+    insert(:dataset,
+      created_at: DateTime.utc_now(),
+      last_update: DateTime.utc_now(),
+      description: "Un jeu de données",
+      licence: "odc-odbl",
+      datagouv_title: "Horaires et arrêts du réseau IRIGO - format GTFS",
+      custom_title: "Horaires Angers",
+      type: "public-transit",
+      slug: "horaires-et-arrets-du-reseau-irigo-format-gtfs",
+      datagouv_id: "5b4cd3a0b59508054dd496cd",
+      frequency: "yearly",
+      tags: [],
+      resources: [
+        %DB.Resource{
+          last_update: DateTime.utc_now() |> DateTime.add(-6, :hour),
+          last_import: DateTime.utc_now() |> DateTime.add(-1, :hour),
+          url: "https://link.to/angers.zip",
+          title: "angers.zip"
+        }
+      ],
+      aom: %DB.AOM{id: 4242, nom: "Angers Métropôle"}
+    )
+
+    insert(:dataset,
+      created_at: DateTime.utc_now(),
+      last_update: DateTime.utc_now(),
+      description: "Un autre jeu de données",
+      licence: "lov2",
+      datagouv_title: "offre de transport du réseau de LAVAL Agglomération (GTFS)",
+      custom_title: "Horaires Laval",
+      slug: "offre-de-transport-du-reseau-de-laval-agglomeration-gtfs",
+      type: "public-transit",
+      datagouv_id: "5bc493d08b4c416c84a69500",
+      frequency: "yearly",
+      tags: [],
+      resources: [
+        %DB.Resource{
+          last_update: DateTime.utc_now() |> DateTime.add(-6, :hour),
+          last_import: DateTime.utc_now() |> DateTime.add(-1, :hour),
+          url: "https://link.to/angers.zip"
+        }
+      ]
+    )
 
     :ok
   end
diff --git a/apps/transport/test/transport_web/controllers/resource_controller_test.exs b/apps/transport/test/transport_web/controllers/resource_controller_test.exs
index de5d100661..0744f40af3 100644
--- a/apps/transport/test/transport_web/controllers/resource_controller_test.exs
+++ b/apps/transport/test/transport_web/controllers/resource_controller_test.exs
@@ -1,7 +1,6 @@
 defmodule TransportWeb.ResourceControllerTest do
   use TransportWeb.ConnCase, async: false
   use TransportWeb.DatabaseCase, cleanup: [:datasets], async: false
-  alias DB.{AOM, Dataset, Resource}
   import Plug.Test
   import Mox
   import DB.Factory
@@ -15,54 +14,52 @@ defmodule TransportWeb.ResourceControllerTest do
     Mox.stub_with(Transport.DataVisualization.Mock, Transport.DataVisualization.Impl)
     Mox.stub_with(Transport.ValidatorsSelection.Mock, Transport.ValidatorsSelection.Impl)
 
-    {:ok, _} =
-      %Dataset{
-        created_at: DateTime.utc_now(),
-        last_update: DateTime.utc_now(),
-        slug: "slug-1",
-        resources: [
-          %Resource{
-            last_update: DateTime.utc_now() |> DateTime.add(-6, :hour),
-            last_import: DateTime.utc_now() |> DateTime.add(-1, :hour),
-            url: "https://link.to/angers.zip",
-            datagouv_id: "1",
-            format: "GTFS",
-            title: "GTFS",
-            description: "Une _très_ belle ressource"
-          },
-          %Resource{
-            last_update: DateTime.utc_now() |> DateTime.add(-6, :hour),
-            last_import: DateTime.utc_now() |> DateTime.add(-1, :hour),
-            url: "http://link.to/angers.zip?foo=bar",
-            datagouv_id: "2",
-            format: "GTFS"
-          },
-          %Resource{
-            last_update: DateTime.utc_now() |> DateTime.add(-6, :hour),
-            last_import: DateTime.utc_now() |> DateTime.add(-1, :hour),
-            url: "http://link.to/gbfs",
-            datagouv_id: "3",
-            format: "gbfs"
-          },
-          %Resource{
-            last_update: DateTime.utc_now() |> DateTime.add(-6, :hour),
-            last_import: DateTime.utc_now() |> DateTime.add(-1, :hour),
-            url: "http://link.to/file",
-            datagouv_id: "4",
-            schema_name: "etalab/foo",
-            format: "json"
-          },
-          %Resource{
-            last_update: DateTime.utc_now() |> DateTime.add(-6, :hour),
-            last_import: DateTime.utc_now() |> DateTime.add(-1, :hour),
-            url: "http://link.to/gtfs-rt",
-            datagouv_id: "5",
-            format: "gtfs-rt"
-          }
-        ],
-        aom: %AOM{id: 4242, nom: "Angers Métropôle"}
-      }
-      |> Repo.insert()
+    insert(:dataset,
+      created_at: DateTime.utc_now(),
+      last_update: DateTime.utc_now(),
+      slug: "slug-1",
+      resources: [
+        %DB.Resource{
+          last_update: DateTime.utc_now() |> DateTime.add(-6, :hour),
+          last_import: DateTime.utc_now() |> DateTime.add(-1, :hour),
+          url: "https://link.to/angers.zip",
+          datagouv_id: "1",
+          format: "GTFS",
+          title: "GTFS",
+          description: "Une _très_ belle ressource"
+        },
+        %DB.Resource{
+          last_update: DateTime.utc_now() |> DateTime.add(-6, :hour),
+          last_import: DateTime.utc_now() |> DateTime.add(-1, :hour),
+          url: "http://link.to/angers.zip?foo=bar",
+          datagouv_id: "2",
+          format: "GTFS"
+        },
+        %DB.Resource{
+          last_update: DateTime.utc_now() |> DateTime.add(-6, :hour),
+          last_import: DateTime.utc_now() |> DateTime.add(-1, :hour),
+          url: "http://link.to/gbfs",
+          datagouv_id: "3",
+          format: "gbfs"
+        },
+        %DB.Resource{
+          last_update: DateTime.utc_now() |> DateTime.add(-6, :hour),
+          last_import: DateTime.utc_now() |> DateTime.add(-1, :hour),
+          url: "http://link.to/file",
+          datagouv_id: "4",
+          schema_name: "etalab/foo",
+          format: "json"
+        },
+        %DB.Resource{
+          last_update: DateTime.utc_now() |> DateTime.add(-6, :hour),
+          last_import: DateTime.utc_now() |> DateTime.add(-1, :hour),
+          url: "http://link.to/gtfs-rt",
+          datagouv_id: "5",
+          format: "gtfs-rt"
+        }
+      ],
+      aom: %DB.AOM{id: 4242, nom: "Angers Métropôle"}
+    )
 
     :ok
   end
@@ -89,7 +86,7 @@ defmodule TransportWeb.ResourceControllerTest do
   end
 
   test "GTFS resource with associated NeTEx", %{conn: conn} do
-    resource = Resource |> Repo.get_by(datagouv_id: "2")
+    resource = DB.Resource |> DB.Repo.get_by(datagouv_id: "2")
     insert(:resource_history, resource_id: resource.id, payload: %{"uuid" => uuid = Ecto.UUID.generate()})
 
     insert(:data_conversion,
@@ -107,8 +104,8 @@ defmodule TransportWeb.ResourceControllerTest do
   end
 
   test "GBFS resource with multi-validation sends back 200", %{conn: conn} do
-    resource = Resource |> Repo.get_by(datagouv_id: "3")
-    assert Resource.is_gbfs?(resource)
+    resource = DB.Resource |> DB.Repo.get_by(datagouv_id: "3")
+    assert DB.Resource.is_gbfs?(resource)
 
     insert(:multi_validation, %{
       resource_history: insert(:resource_history, %{resource_id: resource.id}),
@@ -124,7 +121,7 @@ defmodule TransportWeb.ResourceControllerTest do
   end
 
   test "resource has its description displayed", %{conn: conn} do
-    resource = Resource |> Repo.get_by(datagouv_id: "1")
+    resource = DB.Resource |> DB.Repo.get_by(datagouv_id: "1")
 
     assert resource.description == "Une _très_ belle ressource"
     html = conn |> get(resource_path(conn, :details, resource.id)) |> html_response(200)
@@ -132,7 +129,7 @@ defmodule TransportWeb.ResourceControllerTest do
   end
 
   test "resource has download availability displayed", %{conn: conn} do
-    resource = Resource |> Repo.get_by(datagouv_id: "4")
+    resource = DB.Resource |> DB.Repo.get_by(datagouv_id: "4")
 
     Transport.Shared.Schemas.Mock
     |> expect(:schemas_by_type, 1, fn _type -> %{resource.schema_name => %{}} end)
@@ -183,14 +180,14 @@ defmodule TransportWeb.ResourceControllerTest do
       result: validation_result
     )
 
-    resource = Resource |> preload(:dataset) |> DB.Repo.get!(resource.id)
+    resource = DB.Resource |> preload(:dataset) |> DB.Repo.get!(resource.id)
 
     Transport.HTTPoison.Mock
     |> expect(:get, fn ^resource_url, [], [follow_redirect: true] ->
       {:ok, %HTTPoison.Response{status_code: 200, body: File.read!(@service_alerts_file)}}
     end)
 
-    assert Resource.is_gtfs_rt?(resource)
+    assert DB.Resource.is_gtfs_rt?(resource)
 
     content = conn |> get(resource_path(conn, :details, resource.id)) |> html_response(200)
 
@@ -213,22 +210,22 @@ defmodule TransportWeb.ResourceControllerTest do
   end
 
   test "gtfs-rt resource with feed decode error", %{conn: conn} do
-    %{url: url} = resource = Resource |> Repo.get_by(datagouv_id: "5")
+    %{url: url} = resource = DB.Resource |> DB.Repo.get_by(datagouv_id: "5")
 
     Transport.HTTPoison.Mock
     |> expect(:get, fn ^url, [], [follow_redirect: true] ->
       {:ok, %HTTPoison.Response{status_code: 502, body: ""}}
     end)
 
-    assert Resource.is_gtfs_rt?(resource)
+    assert DB.Resource.is_gtfs_rt?(resource)
     content = conn |> get(resource_path(conn, :details, resource.id)) |> html_response(200)
 
     assert content =~ "Impossible de décoder le flux GTFS-RT"
   end
 
   test "HEAD request for an HTTP resource", %{conn: conn} do
-    resource = Resource |> Repo.get_by(datagouv_id: "2")
-    refute Resource.can_direct_download?(resource)
+    resource = DB.Resource |> DB.Repo.get_by(datagouv_id: "2")
+    refute DB.Resource.can_direct_download?(resource)
 
     Transport.HTTPoison.Mock
     |> expect(:head, fn url, [] ->
@@ -243,22 +240,22 @@ defmodule TransportWeb.ResourceControllerTest do
     assert conn |> response(200) == ""
 
     # With a resource that can be directly downloaded
-    resource = Resource |> Repo.get_by(datagouv_id: "1")
-    assert Resource.can_direct_download?(resource)
+    resource = DB.Resource |> DB.Repo.get_by(datagouv_id: "1")
+    assert DB.Resource.can_direct_download?(resource)
     assert conn |> head(resource_path(conn, :download, resource.id)) |> response(404) == ""
   end
 
   test "downloading a resource that can be directly downloaded", %{conn: conn} do
-    resource = Resource |> Repo.get_by(datagouv_id: "1")
-    assert Resource.can_direct_download?(resource)
+    resource = DB.Resource |> DB.Repo.get_by(datagouv_id: "1")
+    assert DB.Resource.can_direct_download?(resource)
 
     location = conn |> get(resource_path(conn, :download, resource.id)) |> redirected_to
     assert location == resource.url
   end
 
   test "downloading a resource that cannot be directly downloaded", %{conn: conn} do
-    resource = Resource |> Repo.get_by(datagouv_id: "2")
-    refute Resource.can_direct_download?(resource)
+    resource = DB.Resource |> DB.Repo.get_by(datagouv_id: "2")
+    refute DB.Resource.can_direct_download?(resource)
 
     Transport.HTTPoison.Mock
     |> expect(:get, fn url, [], hackney: [follow_redirect: true] ->
@@ -274,8 +271,8 @@ defmodule TransportWeb.ResourceControllerTest do
   end
 
   test "downloading a resource that cannot be directly downloaded with a filename", %{conn: conn} do
-    resource = Resource |> Repo.get_by(datagouv_id: "2")
-    refute Resource.can_direct_download?(resource)
+    resource = DB.Resource |> DB.Repo.get_by(datagouv_id: "2")
+    refute DB.Resource.can_direct_download?(resource)
 
     Transport.HTTPoison.Mock
     |> expect(:get, fn url, [], hackney: [follow_redirect: true] ->
@@ -727,8 +724,8 @@ defmodule TransportWeb.ResourceControllerTest do
   end
 
   test "resources_related are displayed", %{conn: conn} do
-    %{url: gtfs_url} = gtfs_rt_resource = Repo.get_by(Resource, datagouv_id: "5", format: "gtfs-rt")
-    gtfs_resource = Repo.get_by(Resource, datagouv_id: "1", format: "GTFS")
+    %{url: gtfs_url} = gtfs_rt_resource = DB.Repo.get_by(DB.Resource, datagouv_id: "5", format: "gtfs-rt")
+    gtfs_resource = DB.Repo.get_by(DB.Resource, datagouv_id: "1", format: "GTFS")
 
     insert(:resource_related, resource_src: gtfs_rt_resource, resource_dst: gtfs_resource, reason: :gtfs_rt_gtfs)
 
@@ -744,8 +741,8 @@ defmodule TransportWeb.ResourceControllerTest do
   end
 
   defp test_remote_download_error(%Plug.Conn{} = conn, mock_status_code) do
-    resource = Resource |> Repo.get_by(datagouv_id: "2")
-    refute Resource.can_direct_download?(resource)
+    resource = DB.Resource |> DB.Repo.get_by(datagouv_id: "2")
+    refute DB.Resource.can_direct_download?(resource)
 
     Transport.HTTPoison.Mock
     |> expect(:get, fn url, [], hackney: [follow_redirect: true] ->
diff --git a/apps/transport/test/transport_web/controllers/seo_test.exs b/apps/transport/test/transport_web/controllers/seo_test.exs
index 54434ae6c0..b22ded4d50 100644
--- a/apps/transport/test/transport_web/controllers/seo_test.exs
+++ b/apps/transport/test/transport_web/controllers/seo_test.exs
@@ -3,9 +3,8 @@ defmodule TransportWeb.SeoMetadataTest do
   test seo metadata
   """
   use TransportWeb.ConnCase, async: false
-  use TransportWeb.ExternalCase
   use TransportWeb.DatabaseCase, cleanup: [:datasets]
-  alias DB.{AOM, Dataset, Repo, Resource}
+  import DB.Factory
   import Mox
 
   setup :verify_on_exit!
@@ -16,33 +15,26 @@ defmodule TransportWeb.SeoMetadataTest do
     Mox.stub_with(Datagouvfr.Client.Discussions.Mock, Datagouvfr.Client.Discussions.Dummy)
     Mox.stub_with(Transport.ValidatorsSelection.Mock, Transport.ValidatorsSelection.Impl)
 
-    {:ok, _} =
-      %Dataset{
-        created_at: DateTime.utc_now(),
-        last_update: DateTime.utc_now(),
-        description: "Un jeu de données",
-        licence: "odc-odbl",
-        datagouv_title: "Horaires et arrêts du réseau IRIGO - format GTFS",
-        custom_title: "Horaires Angers",
-        type: "public-transit",
-        slug: "horaires-et-arrets-du-reseau-irigo-format-gtfs",
-        datagouv_id: "5b4cd3a0b59508054dd496cd",
-        frequency: "yearly",
-        tags: [],
-        resources: [
-          %Resource{
-            last_update: DateTime.utc_now() |> DateTime.add(-6, :hour),
-            last_import: DateTime.utc_now() |> DateTime.add(-1, :hour),
-            url: "https://link.to/angers.zip",
-            description: "blabla on resource",
-            format: "GTFS",
-            title: "angers.zip",
-            id: 1234
-          }
-        ],
-        aom: %AOM{id: 4242, nom: "Angers Métropôle"}
-      }
-      |> Repo.insert()
+    insert(:dataset,
+      created_at: DateTime.utc_now(),
+      last_update: DateTime.utc_now(),
+      datagouv_title: "Horaires et arrêts du réseau IRIGO - format GTFS",
+      custom_title: "Horaires Angers",
+      type: "public-transit",
+      slug: "horaires-et-arrets-du-reseau-irigo-format-gtfs",
+      resources: [
+        %DB.Resource{
+          last_update: DateTime.utc_now() |> DateTime.add(-6, :hour),
+          last_import: DateTime.utc_now() |> DateTime.add(-1, :hour),
+          url: "https://link.to/angers.zip",
+          description: "blabla on resource",
+          format: "GTFS",
+          title: "angers.zip",
+          id: 1234
+        }
+      ],
+      aom: %DB.AOM{id: 4242, nom: "Angers Métropôle"}
+    )
 
     Mox.stub_with(Transport.HTTPoison.Mock, HTTPoison)
 
@@ -75,7 +67,7 @@ defmodule TransportWeb.SeoMetadataTest do
   end
 
   test "GET /datasets/region/12 ", %{conn: conn} do
-    region = Repo.get_by(Region, nom: "Pays de la Loire")
+    region = DB.Repo.get_by(DB.Region, nom: "Pays de la Loire")
     title = conn |> get("/datasets/region/#{region.id}") |> html_response(200) |> title
     assert title =~ "Jeux de données ouverts de la région Pays de la Loire"
   end