Skip to content

NeTEx: meilleure sérialisation des résultats #5054

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

Open
ptitfred wants to merge 10 commits into
base: master
Choose a base branch
from
+879 −204
Open

NeTEx: meilleure sérialisation des résultats #5054

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
a4e7507
NeTEx: meilleure sérialisation des résultats
ptitfred Dec 8, 2025
e3591bf
Cleanup old multi_validation.binary_result
ptitfred Dec 11, 2025
c91040e
Test coverage
ptitfred Dec 11, 2025
30e6530
Adjust ResultsAdapter interface
ptitfred Dec 11, 2025
40d8d7b
Test coverage
ptitfred Dec 11, 2025
1a99abd
Dead code
ptitfred Dec 11, 2025
da15589
Validation : stockage binaire des résultats
ptitfred Dec 8, 2025
f425bb4
Merge remote-tracking branch 'mine/netex-validator/binary-results-par…
ptitfred Dec 14, 2025
9c4c392
Drop dead code
ptitfred Dec 14, 2025
f71d5ab
Drop unused index
ptitfred Dec 15, 2025
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
Prev Previous commit
Next Next commit
Dead code
  • Loading branch information
@ptitfred
ptitfred committed Dec 11, 2025
commit 1a99abd17bad80c6e898b03f929583c7373b441a
2 changes: 0 additions & 2 deletions apps/transport/lib/validators/netex/results_adapter.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ defmodule Transport.Validators.NeTEx.ResultsAdapter do

@callback summary(map()) :: list()
@callback count_by_severity(map()) :: map()
# DEPRECATED
@callback get_issues(map(), map()) :: list()
@callback get_issues(binary(), map(), Scrivener.Config.t()) :: {map(), {pos_integer(), list()}}
@callback digest(map()) :: map()
@callback issue_type(list()) :: nil | binary()
Expand Down
47 changes: 0 additions & 47 deletions apps/transport/lib/validators/netex/results_adapters/v0_1_0.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,41 +158,6 @@ defmodule Transport.Validators.NeTEx.ResultsAdapters.V0_1_0 do
def issue_type([]), do: nil
def issue_type([h | _]), do: h["code"] || @unknown_code

@doc """
Get issues from validation results. For a specific issue type if specified, or the most severe.

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> get_issues(validation_result, %{"issue_type" => "uic-operating-period"})
[%{"code" => "uic-operating-period", "message" => "Resource 23504000009 hasn't expected class but Netex::OperatingPeriod", "criticity" => "error"}]
iex> get_issues(validation_result, %{"issue_type" => "broken-file"})
[]
iex> get_issues(validation_result, nil)
[%{"code" => "uic-operating-period", "message" => "Resource 23504000009 hasn't expected class but Netex::OperatingPeriod", "criticity" => "error"}]
iex> get_issues(%{}, nil)
[]
iex> get_issues([], nil)
[]
"""
@impl Transport.Validators.NeTEx.ResultsAdapter
# DEPRECATED
def get_issues(%{} = validation_result, %{"issue_type" => issue_type}) do
validation_result
|> Map.get(issue_type, [])
|> order_issues_by_location()
end

# DEPRECATED
def get_issues(%{} = validation_result, _) do
validation_result
|> Map.values()
|> Enum.sort_by(fn [%{"criticity" => severity} | _] -> severity_level(severity) end)
|> List.first([])
|> order_issues_by_location()
end

# DEPRECATED
def get_issues(_, _), do: []

@doc """
Get issues from validation results. For a specific issue type if specified, or the most severe.
"""
Expand Down Expand Up @@ -234,18 +199,6 @@ defmodule Transport.Validators.NeTEx.ResultsAdapters.V0_1_0 do
|> DF.sort_by(&[&1["resource.filename"], &1["resource.line"], &1["message"]])
end

# DEPRECATED
def order_issues_by_location(issues) do
issues
|> Enum.sort_by(fn issue ->
message = Map.get(issue, "message", "")
resource = Map.get(issue, "resource", %{})
filename = Map.get(resource, "filename", "")
line = Map.get(resource, "line", "")
{filename, line, message}
end)
end

@impl Transport.Validators.NeTEx.ResultsAdapter
def french_profile_compliance_check, do: :none

Expand Down
42 changes: 0 additions & 42 deletions apps/transport/lib/validators/netex/results_adapters/v0_2_0.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,39 +157,6 @@ defmodule Transport.Validators.NeTEx.ResultsAdapters.V0_2_0 do
@impl Transport.Validators.NeTEx.ResultsAdapter
defdelegate issue_type(list), to: V0_1_0

@doc """
Get issues from validation results. For a specific issue type if specified, or the most severe.

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> get_issues(validation_result, %{"issues_category" => "xsd-schema"})
[%{"code" => "xsd-123", "message" => "Resource 23504000009 hasn't expected class but Netex::OperatingPeriod", "criticity" => "error"}]
iex> get_issues(validation_result, %{"issues_category" => "broken-file"})
[]
iex> get_issues(validation_result, nil)
[%{"code" => "xsd-123", "message" => "Resource 23504000009 hasn't expected class but Netex::OperatingPeriod", "criticity" => "error"}]
iex> get_issues(%{}, nil)
[]
iex> get_issues([], nil)
[]
"""
@impl Transport.Validators.NeTEx.ResultsAdapter
# DEPRECATED
def get_issues(%{} = validation_result, %{"issues_category" => issues_category}) do
validation_result
|> Map.get(issues_category, [])
|> order_issues_by_location()
end

# DEPRECATED
def get_issues(%{} = validation_result, _) do
validation_result
|> pick_preferred_category()
|> order_issues_by_location()
end

# DEPRECATED
def get_issues(_, _), do: []

@doc """
Get issues from validation results, filtered on category, and paginated.
"""
Expand Down Expand Up @@ -220,15 +187,6 @@ defmodule Transport.Validators.NeTEx.ResultsAdapters.V0_2_0 do

def get_issues(_, _, _), do: {%{"issues_category" => @xsd_schema_category}, {0, []}}

defp pick_preferred_category(%{} = validation_result) do
category =
@categories_preferred_order
|> Enum.find(fn category -> not is_nil(validation_result[category]) end)

validation_result
|> Map.get(category || @xsd_schema_category, [])
end

def pick_default_category(%Explorer.DataFrame{} = df), do: pick_default_category(df, @categories_preferred_order)

def pick_default_category(%Explorer.DataFrame{} = df, categories_preferred_order) do
Expand Down
44 changes: 0 additions & 44 deletions apps/transport/lib/validators/netex/results_adapters/v0_2_1.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,41 +106,6 @@ defmodule Transport.Validators.NeTEx.ResultsAdapters.V0_2_1 do
@impl Transport.Validators.NeTEx.ResultsAdapter
defdelegate issue_type(list), to: V0_2_0

@doc """
Get issues from validation results. For a specific issue type if specified, or the most severe.

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> get_issues(validation_result, %{"issues_category" => "xsd-schema"})
[%{"code" => "xsd-123", "message" => "Resource 23504000009 hasn't expected class but Netex::OperatingPeriod", "criticity" => "error"}]
iex> get_issues(validation_result, %{"issues_category" => "broken-file"})
[]
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)
[]
"""
@impl Transport.Validators.NeTEx.ResultsAdapter
# DEPRECATED
def get_issues(%{} = validation_result, %{"issues_category" => issues_category}) do
validation_result
|> Map.get(issues_category, [])
|> order_issues_by_location()
end

# DEPRECATED
def get_issues(%{} = validation_result, _) do
validation_result
|> pick_preferred_category()
|> order_issues_by_location()
end

# DEPRECATED
def get_issues(_, _), do: []

@doc """
Get issues from validation results, filtered on category, and paginated.
"""
Expand Down Expand Up @@ -173,15 +138,6 @@ defmodule Transport.Validators.NeTEx.ResultsAdapters.V0_2_1 do

defdelegate get_categories(df), to: V0_2_0

defp pick_preferred_category(%{} = validation_result) do
category =
@categories_preferred_order
|> Enum.find(fn category -> not is_nil(validation_result[category]) end)

validation_result
|> Map.get(category || @xsd_schema_category, [])
end

def pick_default_category(%Explorer.DataFrame{} = df) do
pick_default_category(df, @categories_preferred_order)
end
Expand Down