aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--app/models/csv_export.rb23
-rw-r--r--app/models/csv_import.rb6
-rw-r--r--app/models/export_task.rb12
-rw-r--r--app/models/gtfs_export.rb18
-rw-r--r--app/models/gtfs_import.rb30
-rw-r--r--app/models/hub_export.rb16
-rw-r--r--app/models/import_task.rb28
-rw-r--r--app/models/kml_export.rb14
-rw-r--r--app/models/neptune_export.rb20
-rw-r--r--app/models/neptune_import.rb18
-rw-r--r--app/models/netex_export.rb16
-rw-r--r--app/models/netex_import.rb18
12 files changed, 89 insertions, 130 deletions
diff --git a/app/models/csv_export.rb b/app/models/csv_export.rb
deleted file mode 100644
index f7bbb7ed7..000000000
--- a/app/models/csv_export.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-class CsvExport < ExportTask
-
- enumerize :references_type, in: %w( all network line company groupofline )
-
- def action_params
- {
- "parameters" => {
- "kml-export" => {
- "name" => name,
- "references_type" => references_type,
- "user_name" => user_name,
- "organisation_name" => organisation.name,
- "referential_name" => referential.name
- }
- }
- }
- end
-
- def data_format
- "csv"
- end
-
-end
diff --git a/app/models/csv_import.rb b/app/models/csv_import.rb
deleted file mode 100644
index 2635fee71..000000000
--- a/app/models/csv_import.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-class CsvImport < ImportTask
-
- attr_accessor :object_id_prefix
- validates_presence_of :object_id_prefix
-
-end
diff --git a/app/models/export_task.rb b/app/models/export_task.rb
index eaa73f63d..931cc677f 100644
--- a/app/models/export_task.rb
+++ b/app/models/export_task.rb
@@ -50,14 +50,18 @@ class ExportTask
self.data_format.values
end
+ def params
+ {}.tap do |h|
+ h["parameters"] = action_params
+ end
+ end
+
def action_params
- {
- "parameters" => {}
- }
+ {}
end
def action_params_io
- file = StringIO.new( action_params.to_s )
+ file = StringIO.new( params.to_json.to_s )
Faraday::UploadIO.new(file, "application/json", "parameters.json")
end
diff --git a/app/models/gtfs_export.rb b/app/models/gtfs_export.rb
index 279cc62d7..91b3fadc0 100644
--- a/app/models/gtfs_export.rb
+++ b/app/models/gtfs_export.rb
@@ -19,16 +19,14 @@ class GtfsExport < ExportTask
def action_params
{
- "parameters" => {
- "gtfs-export" => {
- "name" => name,
- "references_type" => references_type,
- "user_name" => user_name,
- "organisation_name" => organisation.name,
- "referential_name" => referential.name,
- "time_zone" => time_zone,
- "object_id_prefix" => object_id_prefix
- }
+ "gtfs-export" => {
+ "name" => name,
+ "references_type" => references_type,
+ "user_name" => user_name,
+ "organisation_name" => organisation.name,
+ "referential_name" => referential.name,
+ "time_zone" => time_zone,
+ "object_id_prefix" => object_id_prefix
}
}
end
diff --git a/app/models/gtfs_import.rb b/app/models/gtfs_import.rb
index 434fa3b3d..28bf074ad 100644
--- a/app/models/gtfs_import.rb
+++ b/app/models/gtfs_import.rb
@@ -12,22 +12,20 @@ class GtfsImport < ImportTask
end
def action_params
- { "parameters" =>
- {
- "gtfs-import" => {
- "no_save" => false,
- "user_name" => user_name,
- "name" => name,
- "organisation_name" => organisation.name,
- "referential_name" => referential.name,
- "object_id_prefix" => object_id_prefix,
- "max_distance_for_commercial" => max_distance_for_commercial,
- "ignore_last_word" => ignore_last_word,
- "ignore_end_chars" => ignore_end_chars,
- "max_distance_for_connection_link" => max_distance_for_connection_link,
- "references_type" => references_type
- }
- }
+ {
+ "gtfs-import" => {
+ "no_save" => false,
+ "user_name" => user_name,
+ "name" => name,
+ "organisation_name" => organisation.name,
+ "referential_name" => referential.name,
+ "object_id_prefix" => object_id_prefix,
+ "max_distance_for_commercial" => max_distance_for_commercial,
+ "ignore_last_word" => ignore_last_word,
+ "ignore_end_chars" => ignore_end_chars,
+ "max_distance_for_connection_link" => max_distance_for_connection_link,
+ "references_type" => references_type
+ }
}
end
diff --git a/app/models/hub_export.rb b/app/models/hub_export.rb
index 8bd2e3a96..7d7ffc15b 100644
--- a/app/models/hub_export.rb
+++ b/app/models/hub_export.rb
@@ -21,16 +21,14 @@ class HubExport < ExportTask
def action_params
{
- "parameters" => {
- "hub-export" => {
- "name" => name,
- "references_type" => references_type,
- "user_name" => user_name,
- "organisation_name" => organisation.name,
- "referential_name" => referential.name,
- "start_date" => start_date,
+ "hub-export" => {
+ "name" => name,
+ "references_type" => references_type,
+ "user_name" => user_name,
+ "organisation_name" => organisation.name,
+ "referential_name" => referential.name,
+ "start_date" => start_date,
"end_date" => end_date
- }
}
}
end
diff --git a/app/models/import_task.rb b/app/models/import_task.rb
index b454983d4..2db120afd 100644
--- a/app/models/import_task.rb
+++ b/app/models/import_task.rb
@@ -59,21 +59,28 @@ class ImportTask
end
end
+ def params
+ {}.tap do |h|
+ h["parameters"] = action_params.merge(validation_params)
+ end
+ end
+
def action_params
- {
- "parameters" => {}
- }
+ {}
end
+ def validation_params
+ {
+ "validation" => rule_parameter_set.parameters
+ } if rule_parameter_set.present?
+ end
def self.data_formats
self.data_format.values
end
def params_io
- params = action_params.merge(validation_params)
- puts params.inspect
- file = StringIO.new( params.to_s )
+ file = StringIO.new( params.to_json.to_s )
Faraday::UploadIO.new(file, "application/json", "parameters.json")
end
@@ -84,14 +91,7 @@ class ImportTask
elsif file_extname == ".xml"
Faraday::UploadIO.new(file, "application/xml", original_filename )
end
- end
-
- # TODO : How to find RuleParameterSet
- def validation_params
- {
- "validation" => rule_parameter_set.parameters
- } if rule_parameter_set.present?
- end
+ end
def save_resources
FileUtils.mkdir_p root
diff --git a/app/models/kml_export.rb b/app/models/kml_export.rb
index 186108f6d..0aed77533 100644
--- a/app/models/kml_export.rb
+++ b/app/models/kml_export.rb
@@ -4,14 +4,12 @@ class KmlExport < ExportTask
def action_params
{
- "parameters" => {
- "kml-export" => {
- "name" => name,
- "references_type" => references_type,
- "user_name" => user_name,
- "organisation_name" => organisation.name,
- "referential_name" => referential.name
- }
+ "kml-export" => {
+ "name" => name,
+ "references_type" => references_type,
+ "user_name" => user_name,
+ "organisation_name" => organisation.name,
+ "referential_name" => referential.name
}
}
end
diff --git a/app/models/neptune_export.rb b/app/models/neptune_export.rb
index 90ccc1389..a14d86aae 100644
--- a/app/models/neptune_export.rb
+++ b/app/models/neptune_export.rb
@@ -8,17 +8,15 @@ class NeptuneExport < ExportTask
def action_params
{
- "parameters" => {
- "neptune-export" => {
- "name" => name,
- "references_type" => references_type,
- "user_name" => user_name,
- "organisation_name" => organisation.name,
- "referential_name" => referential.name,
- "projection_type" => projection_type || "",
- "start_date" => start_date,
- "end_date" => end_date
- }
+ "neptune-export" => {
+ "name" => name,
+ "references_type" => references_type,
+ "user_name" => user_name,
+ "organisation_name" => organisation.name,
+ "referential_name" => referential.name,
+ "projection_type" => projection_type || "",
+ "start_date" => start_date,
+ "end_date" => end_date
}
}
end
diff --git a/app/models/neptune_import.rb b/app/models/neptune_import.rb
index ae5350eee..e313e3988 100644
--- a/app/models/neptune_import.rb
+++ b/app/models/neptune_import.rb
@@ -1,16 +1,14 @@
class NeptuneImport < ImportTask
def action_params
- { "parameters" =>
- {
- "neptune-import" => {
- "no_save" => false,
- "user_name" => user_name,
- "name" => name,
- "organisation_name" => organisation.name,
- "referential_name" => referential.name,
- }
- }
+ {
+ "neptune-import" => {
+ "no_save" => false,
+ "user_name" => user_name,
+ "name" => name,
+ "organisation_name" => organisation.name,
+ "referential_name" => referential.name,
+ }
}
end
diff --git a/app/models/netex_export.rb b/app/models/netex_export.rb
index 65f9f5340..326a9bb27 100644
--- a/app/models/netex_export.rb
+++ b/app/models/netex_export.rb
@@ -3,15 +3,13 @@ class NetexExport < ExportTask
enumerize :references_type, in: %w( all network line company groupofline )
def action_params
- {
- "parameters" => {
- "netex-export" => {
- "name" => name,
- "references_type" => references_type,
- "user_name" => user_name,
- "organisation_name" => organisation.name,
- "referential_name" => referential.name,
- }
+ {
+ "netex-export" => {
+ "name" => name,
+ "references_type" => references_type,
+ "user_name" => user_name,
+ "organisation_name" => organisation.name,
+ "referential_name" => referential.name,
}
}
end
diff --git a/app/models/netex_import.rb b/app/models/netex_import.rb
index cc20ef269..4668ad572 100644
--- a/app/models/netex_import.rb
+++ b/app/models/netex_import.rb
@@ -1,16 +1,14 @@
class NetexImport < ImportTask
def action_params
- { "parameters" =>
- {
- "netex-import" => {
- "no_save" => false,
- "user_name" => user_name,
- "name" => name,
- "organisation_name" => organisation.name,
- "referential_name" => referential.name,
- }
- }
+ {
+ "netex-import" => {
+ "no_save" => false,
+ "user_name" => user_name,
+ "name" => name,
+ "organisation_name" => organisation.name,
+ "referential_name" => referential.name,
+ }
}
end
generated by cgit v1.2.3 (git 2.25.1) at 2025-11-02 22:07:46 +0000