From b68c1c1c7e5b4c021aced65169f4bfaf9887c831 Mon Sep 17 00:00:00 2001
From: Vincent Degove <vincent.degove@beta.gouv.fr>
Date: Tue, 19 Mar 2024 15:41:37 +0100
Subject: [PATCH] Order of map operations changed in OTP26

---
 .../test/datagouvfr/client/discussions_test.exs        |  2 +-
 apps/shared/test/validation/gbfs_validator_test.exs    |  2 +-
 apps/transport/lib/jobs/gtfs_rt_metadata.ex            | 10 ++++++++--
 .../controllers/dataset_controller_test.exs            |  4 ++--
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/apps/datagouvfr/test/datagouvfr/client/discussions_test.exs b/apps/datagouvfr/test/datagouvfr/client/discussions_test.exs
index 894a2435e2..14e17325e7 100644
--- a/apps/datagouvfr/test/datagouvfr/client/discussions_test.exs
+++ b/apps/datagouvfr/test/datagouvfr/client/discussions_test.exs
@@ -21,7 +21,7 @@ defmodule Datagouvfr.Client.DiscussionTest do
                {"content-type", "application/json"}
              ]
 
-      assert body == ~s({"comment":"#{comment}","subject":{"class":"Dataset","id":"#{datagouv_id}"},"title":"#{title}"})
+      assert body == ~s({"title":"#{title}","comment":"#{comment}","subject":{"id":"#{datagouv_id}","class":"Dataset"}})
       json(%{"title" => title, "discussion" => [%{"content" => comment}]}, status: 201)
     end)
 
diff --git a/apps/shared/test/validation/gbfs_validator_test.exs b/apps/shared/test/validation/gbfs_validator_test.exs
index 0c366ff9ab..f2245077ca 100644
--- a/apps/shared/test/validation/gbfs_validator_test.exs
+++ b/apps/shared/test/validation/gbfs_validator_test.exs
@@ -55,7 +55,7 @@ defmodule GBFSValidatorTest do
 
   test "can encode summary" do
     assert """
-           {"errors_count":0,"has_errors":false,"validator":"validator_module","validator_version":"31c5325","version_detected":"1.1","version_validated":"1.1"}\
+           {"validator":"validator_module","errors_count":0,"has_errors":false,"version_detected":"1.1","version_validated":"1.1","validator_version":"31c5325"}\
            """ ==
              Jason.encode!(%Summary{
                errors_count: 0,
diff --git a/apps/transport/lib/jobs/gtfs_rt_metadata.ex b/apps/transport/lib/jobs/gtfs_rt_metadata.ex
index fd2904a3b1..6a4571a7b6 100644
--- a/apps/transport/lib/jobs/gtfs_rt_metadata.ex
+++ b/apps/transport/lib/jobs/gtfs_rt_metadata.ex
@@ -69,10 +69,16 @@ defmodule Transport.Jobs.GTFSRTMetadataJob do
   iex> present_entities(%{service_alerts: 0, vehicle_positions: 1})
   ["vehicle_positions"]
   iex> present_entities(%{service_alerts: 2, vehicle_positions: 1})
-  ["service_alerts", "vehicle_positions"]
+  ["vehicle_positions", "service_alerts"]
   """
   def present_entities(count_entities) do
-    count_entities |> Map.filter(fn {_, v} -> v > 0 end) |> Enum.map(fn {k, _} -> Atom.to_string(k) end)
+    Enum.flat_map(count_entities, fn {k, v} ->
+      if v > 0 do
+        [Atom.to_string(k)]
+      else
+        []
+      end
+    end)
   end
 
   @spec process_feed({:error, any} | {:ok, TransitRealtime.FeedMessage.t()}, DB.Resource.t()) :: any
diff --git a/apps/transport/test/transport_web/controllers/dataset_controller_test.exs b/apps/transport/test/transport_web/controllers/dataset_controller_test.exs
index 3777b75da3..75ea15cfd2 100644
--- a/apps/transport/test/transport_web/controllers/dataset_controller_test.exs
+++ b/apps/transport/test/transport_web/controllers/dataset_controller_test.exs
@@ -434,8 +434,8 @@ defmodule TransportWeb.DatasetControllerTest do
     assert [
              {"table", [{"class", "table"}],
               [
-                {"tr", [], [{"th", [], ["Conformité"]}, {"th", [], ["Fraicheur"]}]},
-                {"tr", [], [{"td", [], ["80%"]}, {"td", [], ["55%"]}]}
+                {"tr", [], [{"th", [], ["Fraicheur"]}, {"th", [], ["Conformité"]}]},
+                {"tr", [], [{"td", [], ["55%"]}, {"td", [], ["80%"]}]}
               ]}
            ] == content |> Floki.find("#quality-indicators table")
   end