Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Unification des APIs des validateurs GTFS & NeTEx #4175

Merged
merged 1 commit into from
Sep 11, 2024
Merged

Unification des APIs des validateurs GTFS & NeTEx #4175

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/transport/lib/transport_web/templates/dataset/_resource.html.heex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@
<%= if severity == "NoError" do %>
<%= dgettext("page-dataset-details", "No error detected") %>
<% else %>
<%= "#{count} #{String.downcase(GTFSTransport.severities(severity)[:text])}" %>
<%= "#{count} #{String.downcase(GTFSTransport.severity(severity)[:text])}" %>
<% end %>
</span>
</a>
Expand Down
2 changes: 1 addition & 1 deletion apps/transport/lib/transport_web/templates/resource/_validation_summary.html.heex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<%= for {severity, issues} <- @validation_summary do %>
<%= if Map.get(@severities_count, severity, 0) > 0 do %>
<div class="validation-issue">
<h4><%= @severities_count[severity] %> <%= severities(severity).text %></h4>
<h4><%= @severities_count[severity] %> <%= severity(severity).text %></h4>
<ul>
<%= for {key, issue} <- issues do %>
<li>
Expand Down
10 changes: 5 additions & 5 deletions apps/transport/lib/validators/gtfs_transport_validator.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,8 @@ defmodule Transport.Validators.GTFSTransport do
"Information" => %{level: 3, text: dgettext("gtfs-transport-validator", "Informations")}
}

@spec severities(binary()) :: %{level: integer(), text: binary()}
def severities(key), do: severities_map()[key]
@spec severity(binary()) :: %{level: integer(), text: binary()}
def severity(key), do: severities_map()[key]

@doc """
Get issues from validation results. For a specific issue type if specified, or the most severe.
Expand All @@ -99,7 +99,7 @@ defmodule Transport.Validators.GTFSTransport do
def get_issues(%{} = validation_result, _) do
validation_result
|> Map.values()
|> Enum.sort_by(fn [%{"severity" => severity} | _] -> severities(severity).level end)
|> Enum.sort_by(fn [%{"severity" => severity} | _] -> severity(severity).level end)
|> List.first([])
end

Expand Down Expand Up @@ -128,7 +128,7 @@ defmodule Transport.Validators.GTFSTransport do
end)
|> Map.new()
|> Enum.group_by(fn {_, issue} -> issue.severity end)
|> Enum.sort_by(fn {severity, _} -> severities(severity).level end)
|> Enum.sort_by(fn {severity, _} -> severity(severity).level end)
end

@doc """
Expand Down Expand Up @@ -167,7 +167,7 @@ defmodule Transport.Validators.GTFSTransport do
def count_max_severity(%{} = validation_result) do
validation_result
|> count_by_severity()
|> Enum.min_by(fn {severity, _count} -> severity |> severities() |> Map.get(:level) end)
|> Enum.min_by(fn {severity, _count} -> severity |> severity() |> Map.get(:level) end)
end

@spec mine?(any) :: boolean()
Expand Down