Résultats de validation sérializable (#4923)

Author: ptitfred

apps/transport/lib/transport_web/templates/dataset/_resource_validation_summary_gtfs.html.heex

@@ -1,7 +1,8 @@
 <%= if GTFSTransport.mine?(@validation) do %>
   <div class="pb-24">
     <% link = resource_path(@conn, :details, @resource.id) <> "#validation-report" %>
-    <% {severity, count} = GTFSTransport.count_max_severity(@validation.result) %>
+    <% %{"max_level" => severity, "worst_occurrences" => count} =
+      GTFSTransport.count_max_severity(@validation.result) %>
     <a href={link}>
       <span class={summary_class(%{severity: severity, count_errors: count})}>
         <%= if GTFSTransport.no_error?(severity) do %>

apps/transport/lib/transport_web/templates/dataset/_resource_validation_summary_netex.html.heex

@@ -2,7 +2,8 @@
   <div class="pb-24">
     <% link = resource_path(@conn, :details, @resource.id) <> "#validation-report" %>
     <% results_adapter = Transport.Validators.NeTEx.ResultsAdapter.resolve(@validation.validator_version) %>
-    <% {severity, count} = results_adapter.count_max_severity(@validation.result) %>
+    <% %{"max_level" => severity, "worst_occurrences" => count} =
+      results_adapter.count_max_severity(@validation.result) %>
     <a href={link}>
       <span class={summary_class(%{severity: String.capitalize(severity), count_errors: count})}>
         <%= if results_adapter.no_error?(severity) do %>

apps/transport/lib/transport_web/templates/resource/_netex_validation_errors_v0_2_x.html.heex

@@ -1,4 +1,4 @@
-<% {max_level, worst_occurrences} = @max_severity %>
+<% %{"max_level" => max_level, "worst_occurrences" => worst_occurrences} = @max_severity %>
 <% current_category = @conn.params["issues_category"] || "" %>
 
 <h4><%= @results_adapter.format_severity(max_level, worst_occurrences) |> String.capitalize() %></h4>

apps/transport/lib/transport_web/templates/resource/_validation_summary.html.heex

@@ -1,15 +1,15 @@
 <div id="issues" class="validation-navigation">
   <nav class="issues-list validation" role="navigation">
-    <%= for {severity, issues} <- @validation_summary do %>
+    <%= for %{"severity" => severity, "issues" => issues} <- @validation_summary do %>
       <%= if Map.get(@severities_count, severity, 0) > 0 do %>
         <div class="validation-issue">
           <h4><%= @results_adapter.format_severity(severity, @severities_count[severity]) %></h4>
           <ul>
-            <%= for {key, issue} <- issues do %>
+            <%= for %{"key" => key, "issue" => issue} <- issues do %>
               <li>
-                <%= if issue.count > 0 do %>
+                <%= if issue["count"] > 0 do %>
                   <%= link(
-                    "#{issue.title} (#{issue.count})",
+                    "#{issue["title"]} (#{issue["count"]})",
                     to:
                       "#{current_url(@conn, %{"issue_type" => key, "token" => @token} |> Map.reject(fn {_, v} -> is_nil(v) end))}#issues",
                     class: if(key == @results_adapter.issue_type(@issues.entries), do: "active")

apps/transport/lib/transport_web/templates/validation/show_netex_v0_2_x.html.heex

@@ -18,7 +18,7 @@
 
   <div class="validation-content">
     <div id="issues" class="container">
-      <% {_, worst_occurrences} = @max_severity %>
+      <% %{"worst_occurrences" => worst_occurrences} = @max_severity %>
       <% current_category = @conn.params["issues_category"] || "" %>
       <div id="issues" class="validation-navigation">
         <nav class="issues-list validation" role="navigation">

apps/transport/lib/transport_web/views/resource_view.ex

@@ -321,7 +321,7 @@ defmodule TransportWeb.ResourceView do
     ~H"""
     <ul class="summary">
       <.netex_errors_category
-        :for={{category, stats} <- @validation_summary}
+        :for={%{"category" => category, "stats" => stats} <- @validation_summary}
         conn={@conn}
         results_adapter={@results_adapter}
         category={category}
@@ -357,15 +357,15 @@ defmodule TransportWeb.ResourceView do
   defp netex_errors_category(%{conn: _, category: _, stats: _, token: _, results_adapter: _} = assigns) do
     ~H"""
     <li>
-      <.validity_icon errors={@stats[:count]} />
+      <.validity_icon errors={@stats["count"]} />
       <div class="selector">
-        <%= compatibility_filter(@conn, @category, @token, @stats[:count]) %>
-        <.stats :if={@stats[:count] > 0} stats={@stats} results_adapter={@results_adapter} />
+        <%= compatibility_filter(@conn, @category, @token, @stats["count"]) %>
+        <.stats :if={@stats["count"] > 0} stats={@stats} results_adapter={@results_adapter} />
       </div>
       <p :if={netex_category_description(@category)}>
         <%= netex_category_description(@category) %>
       </p>
-      <.category_hints :if={netex_category_hints(@category) && @stats[:count] > 0} category={@category} />
+      <.category_hints :if={netex_category_hints(@category) && @stats["count"] > 0} category={@category} />
     </li>
     """
   end
@@ -379,7 +379,7 @@ defmodule TransportWeb.ResourceView do
 
   defp stats(%{stats: _, results_adapter: _} = assigns) do
     ~H"""
-    (<%= @results_adapter.format_severity(@stats[:criticity], @stats[:count]) %>)
+    (<%= @results_adapter.format_severity(@stats["criticity"], @stats["count"]) %>)
     """
   end
 

apps/transport/lib/validators/gtfs_transport_validator.ex

@@ -134,8 +134,8 @@ defmodule Transport.Validators.GTFSTransport do
   iex> validation_result = %{"tooClose" => [%{"severity" => "Warning"}], "funnyName" => [%{"severity" => "Information"}]}
   iex> summary(validation_result)
   [
-    {"Warning", [{"tooClose", %{count: 1, severity: "Warning", title: nil}}]},
-    {"Information", [{"funnyName", %{count: 1, severity: "Information", title: nil}}]}
+    %{"severity" => "Warning", "issues" => [%{"key" => "tooClose", "issue" => %{"count" => 1, "severity" => "Warning", "title" => nil}}]},
+    %{"severity" => "Information", "issues" => [%{"key" => "funnyName", "issue" => %{"count" => 1, "severity" => "Information", "title" => nil}}]}
   ]
   iex> summary(%{})
   []
@@ -146,14 +146,19 @@ defmodule Transport.Validators.GTFSTransport do
     |> Enum.map(fn {key, issues} ->
       {key,
        %{
-         count: Enum.count(issues),
-         title: issues_short_translation()[key],
-         severity: issues |> List.first() |> Map.fetch!("severity")
+         "count" => Enum.count(issues),
+         "title" => issues_short_translation()[key],
+         "severity" => issues |> List.first() |> Map.fetch!("severity")
        }}
     end)
-    |> Map.new()
-    |> Enum.group_by(fn {_, issue} -> issue.severity end)
+    |> Enum.group_by(fn {_, issue} -> issue["severity"] end)
     |> Enum.sort_by(fn {severity, _} -> severity_level(severity) end)
+    |> Enum.map(fn {severity, issues} ->
+      %{
+        "severity" => severity,
+        "issues" => issues |> Enum.map(fn {key, issue} -> %{"key" => key, "issue" => issue} end)
+      }
+    end)
   end
 
   @doc """
@@ -180,19 +185,22 @@ defmodule Transport.Validators.GTFSTransport do
 
   iex> validation_result = %{"tooClose" => [%{"severity" => "Warning"}], "funnyName" => [%{"severity" => "Information"}, %{"severity" => "Information"}], "NullDuration" => [%{"severity" => "Warning"}]}
   iex> count_max_severity(validation_result)
-  {"Warning", 2}
+  %{"max_level" => "Warning", "worst_occurrences" => 2}
   iex> count_max_severity(%{})
-  {"NoError", 0}
+  %{"max_level" => "NoError", "worst_occurrences" => 0}
   """
   @spec count_max_severity(map()) :: {binary(), integer()}
   def count_max_severity(validation_result) when validation_result == %{} do
-    {@no_error, 0}
+    %{"max_level" => @no_error, "worst_occurrences" => 0}
   end
 
   def count_max_severity(%{} = validation_result) do
-    validation_result
-    |> count_by_severity()
-    |> Enum.min_by(fn {severity, _count} -> severity |> severity_level() end)
+    {max_level, worst_occurrences} =
+      validation_result
+      |> count_by_severity()
+      |> Enum.min_by(fn {severity, _count} -> severity |> severity_level() end)
+
+    %{"max_level" => max_level, "worst_occurrences" => worst_occurrences}
   end
 
   def no_error?(severity), do: @no_error == severity
@@ -216,8 +224,8 @@ defmodule Transport.Validators.GTFSTransport do
   """
   @spec get_max_severity_error(any) :: binary() | nil
   def get_max_severity_error(%{} = validations) do
-    {severity, _} = count_max_severity(validations)
-    severity
+    %{"max_level" => max_level} = count_max_severity(validations)
+    max_level
   end
 
   def get_max_severity_error(_), do: nil

apps/transport/lib/validators/netex/results_adapters/v0_1_0.ex

@@ -16,23 +16,26 @@ defmodule Transport.Validators.NeTEx.ResultsAdapters.V0_1_0 do
 
   iex> validation_result = %{"uic-operating-period" => [%{"criticity" => "error"}], "valid-day-bits" => [%{"criticity" => "error"}], "frame-arret-resources" => [%{"criticity" => "warning"}]}
   iex> count_max_severity(validation_result)
-  {"error", 2}
+  %{"max_level" => "error", "worst_occurrences" => 2}
   iex> validation_result = %{"frame-arret-resources" => [%{"criticity" => "warning"}]}
   iex> count_max_severity(validation_result)
-  {"warning", 1}
+  %{"max_level" => "warning", "worst_occurrences" => 1}
   iex> count_max_severity(%{})
-  {"NoError", 0}
+  %{"max_level" => "NoError", "worst_occurrences" => 0}
   """
   @impl Transport.Validators.NeTEx.ResultsAdapter
   def count_max_severity(validation_result) when validation_result == %{} do
-    {@no_error, 0}
+    %{"max_level" => @no_error, "worst_occurrences" => 0}
   end
 
   @impl Transport.Validators.NeTEx.ResultsAdapter
   def count_max_severity(%{} = validation_result) do
-    validation_result
-    |> count_by_severity()
-    |> Enum.min_by(fn {severity, _count} -> severity |> severity_level() end)
+    {max_level, worst_occurrences} =
+      validation_result
+      |> count_by_severity()
+      |> Enum.min_by(fn {severity, _count} -> severity |> severity_level() end)
+
+    %{"max_level" => max_level, "worst_occurrences" => worst_occurrences}
   end
 
   @impl Transport.Validators.NeTEx.ResultsAdapter
@@ -92,11 +95,11 @@ defmodule Transport.Validators.NeTEx.ResultsAdapters.V0_1_0 do
   iex> validation_result = %{"uic-operating-period" => [%{"code" => "uic-operating-period", "message" => "Resource 23504000009 hasn't expected class but Netex::OperatingPeriod", "criticity" => "error"}], "valid-day-bits" => [%{"code" => "valid-day-bits", "message" => "Mandatory attribute valid_day_bits not found", "criticity" => "error"}], "frame-arret-resources" => [%{"code" => "frame-arret-resources", "message" => "Tag frame_id doesn't match ''", "criticity" => "warning"}]}
   iex> summary(validation_result)
   [
-    {"error", [
-      {"uic-operating-period", %{count: 1, criticity: "error", title: "UIC operating period"}},
-      {"valid-day-bits", %{count: 1, criticity: "error", title: "Valid day bits"}}
+    %{"severity" => "error", "issues" => [
+      %{"key" => "uic-operating-period", "issue" => %{"count" => 1, "criticity" => "error", "title" => "UIC operating period"}},
+      %{"key" => "valid-day-bits", "issue" => %{"count" => 1, "criticity" => "error", "title" => "Valid day bits"}}
     ]},
-    {"warning", [{"frame-arret-resources", %{count: 1, criticity: "warning", title: "Frame arret resources"}}]}
+    %{"severity" => "warning", "issues" => [%{"key" => "frame-arret-resources", "issue" => %{"count" => 1, "criticity" => "warning", "title" => "Frame arret resources"}}]}
   ]
   iex> summary(%{})
   []
@@ -107,13 +110,19 @@ defmodule Transport.Validators.NeTEx.ResultsAdapters.V0_1_0 do
     |> Enum.map(fn {code, errors} ->
       {code,
        %{
-         count: length(errors),
-         criticity: errors |> hd() |> Map.get("criticity"),
-         title: issues_short_translation_per_code(code)
+         "count" => length(errors),
+         "criticity" => errors |> hd() |> Map.get("criticity"),
+         "title" => issues_short_translation_per_code(code)
        }}
     end)
-    |> Enum.group_by(fn {_, details} -> details.criticity end)
+    |> Enum.group_by(fn {_, details} -> details["criticity"] end)
     |> Enum.sort_by(fn {criticity, _} -> severity_level(criticity) end)
+    |> Enum.map(fn {severity, issues} ->
+      %{
+        "severity" => severity,
+        "issues" => issues |> Enum.map(fn {key, issue} -> %{"key" => key, "issue" => issue} end)
+      }
+    end)
   end
 
   @spec issues_short_translation_per_code(binary()) :: binary()

apps/transport/lib/validators/netex/results_adapters/v0_2_0.ex

@@ -34,7 +34,7 @@ defmodule Transport.Validators.NeTEx.ResultsAdapters.V0_2_0 do
   """
   @spec get_max_severity_error(map()) :: binary()
   def get_max_severity_error(validation_result) do
-    {severity, _} = validation_result |> count_max_severity()
+    %{"max_level" => severity} = validation_result |> count_max_severity()
     severity
   end
 
@@ -43,12 +43,12 @@ defmodule Transport.Validators.NeTEx.ResultsAdapters.V0_2_0 do
 
   iex> validation_result = %{"xsd-schema" => [%{"criticity" => "error"}], "french-profile" => [%{"criticity" => "error"}], "frame-arret-resources" => [%{"criticity" => "warning"}]}
   iex> count_max_severity(validation_result)
-  {"error", 2}
+  %{"max_level" => "error", "worst_occurrences" => 2}
   iex> validation_result = %{"french-profile" => [%{"criticity" => "warning"}]}
   iex> count_max_severity(validation_result)
-  {"warning", 1}
+  %{"max_level" => "warning", "worst_occurrences" => 1}
   iex> count_max_severity(%{})
-  {"NoError", 0}
+  %{"max_level" => "NoError", "worst_occurrences" => 0}
   """
   @impl Transport.Validators.NeTEx.ResultsAdapter
   defdelegate count_max_severity(validation_result), to: V0_1_0
@@ -126,13 +126,13 @@ defmodule Transport.Validators.NeTEx.ResultsAdapters.V0_2_0 do
   iex> validation_result = %{"xsd-schema" => [%{"code" => "xsd-123", "message" => "Resource 23504000009 hasn't expected class but Netex::OperatingPeriod", "criticity" => "error"}], "base-rules" => [%{"code" => "valid-day-bits", "message" => "Mandatory attribute valid_day_bits not found", "criticity" => "error"}]}
   iex> summary(validation_result)
   [
-    {"xsd-schema", %{count: 1, criticity: "error"}},
-    {"base-rules", %{count: 1, criticity: "error"}}
+    %{"category" => "xsd-schema", "stats" => %{"count" => 1, "criticity" => "error"}},
+    %{"category" => "base-rules", "stats" => %{"count" => 1, "criticity" => "error"}}
   ]
   iex> summary(%{})
   [
-    {"xsd-schema", %{count: 0, criticity: "NoError"}},
-    {"base-rules", %{count: 0, criticity: "NoError"}}
+    %{"category" => "xsd-schema", "stats" => %{"count" => 0, "criticity" => "NoError"}},
+    %{"category" => "base-rules", "stats" => %{"count" => 0, "criticity" => "NoError"}}
   ]
   """
   @impl Transport.Validators.NeTEx.ResultsAdapter
@@ -146,9 +146,9 @@ defmodule Transport.Validators.NeTEx.ResultsAdapters.V0_2_0 do
         |> Enum.map(fn error -> Map.get(error, "criticity", @no_error) end)
         |> Enum.min_by(&severity_level/1, fn -> @no_error end)
 
-      stats = %{count: length(errors), criticity: worst_criticity}
+      stats = %{"count" => length(errors), "criticity" => worst_criticity}
 
-      {category, stats}
+      %{"category" => category, "stats" => stats}
     end)
   end
 

apps/transport/lib/validators/netex/results_adapters/v0_2_1.ex

@@ -73,15 +73,15 @@ defmodule Transport.Validators.NeTEx.ResultsAdapters.V0_2_1 do
   iex> validation_result = %{"xsd-schema" => [%{"code" => "xsd-123", "message" => "Resource 23504000009 hasn't expected class but Netex::OperatingPeriod", "criticity" => "error"}], "french-profile"=>[%{"code"=>"pan:french_profile:123", "criticity" => "error"}], "base-rules" => [%{"code" => "valid-day-bits", "message" => "Mandatory attribute valid_day_bits not found", "criticity" => "error"}]}
   iex> summary(validation_result)
   [
-    {"xsd-schema", %{count: 1, criticity: "error"}},
-    {"french-profile", %{count: 1, criticity: "error"}},
-    {"base-rules", %{count: 1, criticity: "error"}}
+    %{"category" => "xsd-schema", "stats" => %{"count" => 1, "criticity" => "error"}},
+    %{"category" => "french-profile", "stats" => %{"count" => 1, "criticity" => "error"}},
+    %{"category" => "base-rules", "stats" => %{"count" => 1, "criticity" => "error"}}
   ]
   iex> summary(%{})
   [
-    {"xsd-schema", %{count: 0, criticity: "NoError"}},
-    {"french-profile", %{count: 0, criticity: "NoError"}},
-    {"base-rules", %{count: 0, criticity: "NoError"}}
+    %{"category" => "xsd-schema", "stats" => %{"count" => 0, "criticity" => "NoError"}},
+    %{"category" => "french-profile", "stats" => %{"count" => 0, "criticity" => "NoError"}},
+    %{"category" => "base-rules", "stats" => %{"count" => 0, "criticity" => "NoError"}}
   ]
   """
   @impl Transport.Validators.NeTEx.ResultsAdapter
@@ -95,9 +95,9 @@ defmodule Transport.Validators.NeTEx.ResultsAdapters.V0_2_1 do
         |> Enum.map(fn error -> Map.get(error, "criticity", @no_error) end)
         |> Enum.min_by(&severity_level/1, fn -> @no_error end)
 
-      stats = %{count: length(errors), criticity: worst_criticity}
+      stats = %{"count" => length(errors), "criticity" => worst_criticity}
 
-      {category, stats}
+      %{"category" => category, "stats" => stats}
     end)
   end
 
@@ -114,6 +114,8 @@ defmodule Transport.Validators.NeTEx.ResultsAdapters.V0_2_1 do
   []
   iex> get_issues(validation_result, nil)
   [%{"code" => "xsd-123", "message" => "Resource 23504000009 hasn't expected class but Netex::OperatingPeriod", "criticity" => "error"}]
+  iex> get_issues(validation_result, %{})
+  [%{"code" => "xsd-123", "message" => "Resource 23504000009 hasn't expected class but Netex::OperatingPeriod", "criticity" => "error"}]
   iex> get_issues(%{}, nil)
   []
   iex> get_issues([], nil)