rename a few columns and statuses

Author: vdegove

apps/transport/lib/irve/consolidation.ex

@@ -149,7 +149,7 @@ defmodule Transport.IRVE.Consolidation do
       |> Explorer.DataFrame.select([
         "dataset_id",
         "resource_id",
-        "status",
+        "consolidation_status",
         "error_type",
         "estimated_pdc_count",
         "file_extension",

apps/transport/lib/irve/database_importer.ex

@@ -17,7 +17,7 @@ defmodule Transport.IRVE.DatabaseImporter do
 
   # return:
   # - `:import_successful` if the import went fine
-  # - `:already_in_db` if the same content (based on file checksum) is in db for
+  # - `:already_up_to_date` if the same content (based on file checksum) is in db for
   #     the provided combination of ids
   # (else raise an error)
   def try_write_to_db(file_path, %{
@@ -40,7 +40,7 @@ defmodule Transport.IRVE.DatabaseImporter do
   rescue
     e in [Ecto.ConstraintError] ->
       if e.type == :unique && e.constraint == "irve_valid_file_datagouv_resource_id_checksum_index" do
-        :already_in_db
+        :already_up_to_date
       else
         reraise(e, __STACKTRACE__)
       end

apps/transport/lib/irve/report_item.ex

@@ -4,15 +4,15 @@ defmodule Transport.IRVE.ReportItem do
   IRVE file into a structure with all the same keys.
   (as expected by the `DataFrame` that we use to create the CSV file).
   """
-  @enforce_keys [:dataset_id, :resource_id, :url, :dataset_title, :status, :estimated_pdc_count]
+  @enforce_keys [:dataset_id, :resource_id, :url, :dataset_title, :consolidation_status, :estimated_pdc_count]
   defstruct [
     :dataset_id,
     :resource_id,
     :url,
     :dataset_title,
     :datagouv_organization_or_owner,
     :datagouv_last_modified,
-    :status,
+    :consolidation_status,
     :error_message,
     :error_type,
     :estimated_pdc_count,
@@ -38,7 +38,7 @@ defmodule Transport.IRVE.ReportItem do
   def to_map(%__MODULE__{} = report_row) do
     report_row
     |> Map.from_struct()
-    |> Map.update!(:status, &to_string/1)
+    |> Map.update!(:consolidation_status, &to_string/1)
   end
 
   defp new(resource, status, error_message, error_type) do
@@ -49,7 +49,7 @@ defmodule Transport.IRVE.ReportItem do
       dataset_title: resource.dataset_title,
       datagouv_organization_or_owner: resource.datagouv_organization_or_owner,
       datagouv_last_modified: resource.datagouv_last_modified,
-      status: status,
+      consolidation_status: status,
       estimated_pdc_count: resource[:estimated_pdc_count],
       error_message: error_message,
       error_type: error_type,

apps/transport/test/transport/irve/consolidation_test.exs

@@ -33,7 +33,7 @@ defmodule Transport.IRVE.ConsolidationTest do
           %{
             "dataset_id" => "another-dataset-id",
             "resource_id" => "another-resource-id",
-            "status" => "file_level_errors",
+            "consolidation_status" => "file_level_errors",
             "error_type" => nil,
             "estimated_pdc_count" => "1",
             "file_extension" => ".csv",
@@ -50,7 +50,7 @@ defmodule Transport.IRVE.ConsolidationTest do
           %{
             "dataset_id" => "individual-published-dataset-id",
             "resource_id" => "individual-published-resource-id",
-            "status" => "producer_not_an_organization",
+            "consolidation_status" => "producer_not_an_organization",
             "error_type" => nil,
             "estimated_pdc_count" => "1",
             "file_extension" => ".csv",
@@ -63,7 +63,7 @@ defmodule Transport.IRVE.ConsolidationTest do
           %{
             "dataset_id" => "the-dataset-id",
             "resource_id" => "the-resource-id",
-            "status" => "import_successful",
+            "consolidation_status" => "import_successful",
             "error_type" => nil,
             "estimated_pdc_count" => "1",
             "file_extension" => ".csv",
@@ -79,7 +79,7 @@ defmodule Transport.IRVE.ConsolidationTest do
         |> Explorer.DataFrame.select([
           "dataset_id",
           "resource_id",
-          "status",
+          "consolidation_status",
           "error_type",
           "estimated_pdc_count",
           "file_extension",