ComplianceCheckTask to ComplianceCheck : fixing Conflicts

17 files changed, 172 insertions, 255 deletions

diff --git a/app/assets/stylesheets/main/exports.css.scss b/app/assets/stylesheets/main/exports.css.scss
index dd5a38f48..b4f8cfbad 100644
--- a/app/assets/stylesheets/main/exports.css.scss
+++ b/app/assets/stylesheets/main/exports.css.scss
@@ -7,60 +7,5 @@
 }
 
 #workspace.exports.show {
-  .resume {
-        &:after{
-            content: " ";
-            display: block;
-            height: 0;
-            clear: both;
-            visibility: hidden;
-        }
-
-        #files_statistics { height: 225px; }
-        #objects_statistics { height: 225px; }
-
-        .caption {
-            text-align :center;
-            font-weight: bold;
-        }
-    }
-
-    .report {
-        margin-top: 20px;
-
-        .files {
-            img {
-                margin-right: 5px;
-            }
-
-            .file_name{
-                font-weight: bold;
-                margin-right: 30px;
-            }
-        }
-
-        .files_error{
-            color: #e22b1b;
-            display: none;
-        }
-
-        .files_ignored{
-            color: #898e7f;
-            display: none;
-        }
-
-        .files_ok{
-            color: #8fc861;
-            display: none;
-        }
-
-        .lines{
-            display: none;
-                      
-            th, td{
-                text-align: center;
-            }
-
-        }
-    }
+  @import "../modules/report";
 }
diff --git a/app/assets/stylesheets/main/imports.css.scss b/app/assets/stylesheets/main/imports.css.scss
index 8ac7314ff..a91bb3afe 100644
--- a/app/assets/stylesheets/main/imports.css.scss
+++ b/app/assets/stylesheets/main/imports.css.scss
@@ -3,75 +3,12 @@
 }
 
 #workspace.imports.show {
-
-    .status {
-        margin-left: 10px;
-    }
-    
-    .status_aborted,.status_canceled { color: #a94442;}
-    .status_created { color: #31708f;}
-    .status_scheduled { color: #31708f;}
-    .status_terminated { color: #3c763d;}
+    @import "../modules/report";
     
     .links{
         margin: 0 0 20px 0;
         img{ margin: 0 5px 0 15px; }
     }
 
-    .resume {
-        &:after{
-            content: " ";
-            display: block;
-            height: 0;
-            clear: both;
-            visibility: hidden;
-        }
-
-        #files_statistics { height: 225px; }
-        #objects_statistics { height: 225px; }
-
-        .caption {
-            text-align :center;
-            font-weight: bold;
-        }
-    }
-
-    .report {
-        margin-top: 20px;
-
-        .files {
-            img {
-                margin-right: 5px;
-            }
-
-            .file_name{
-                font-weight: bold;
-                margin-right: 30px;
-            }
-        }
-
-        .files_error{
-            color: #e22b1b;
-            display: none;
-        }
-
-        .files_ignored{
-            color: #898e7f;
-            display: none;
-        }
-
-        .files_ok{
-            color: #8fc861;
-            display: none;
-        }
-
-        .lines{
-            display: none;
-
-            th, td{
-                text-align: center;
-            }
-
-        }
-    }
+    
 }
diff --git a/app/assets/stylesheets/modules/report.css.scss b/app/assets/stylesheets/modules/report.css.scss
new file mode 100644
index 000000000..f983925f3
--- /dev/null
+++ b/app/assets/stylesheets/modules/report.css.scss
@@ -0,0 +1,65 @@
+.status {
+  margin-left: 10px;
+}   
+
+.status_aborted,.status_canceled { color: #a94442;}
+.status_started { color: #31708f;}
+.status_scheduled { color: #31708f;}
+.status_terminated { color: #3c763d;}
+
+.resume {
+  &:after{
+    content: " ";
+    display: block;
+    height: 0;
+    clear: both;
+    visibility: hidden;
+  }
+
+  #files_statistics { height: 225px; }
+  #objects_statistics { height: 225px; }
+
+  .caption {
+    text-align :center;
+  font-weight: bold;
+  }
+}
+
+.report {
+  margin-top: 20px;
+
+  .files {
+    img {
+      margin-right: 5px;
+      }
+
+    .file_name{
+      font-weight: bold;
+      margin-right: 30px;
+      }
+  }
+
+  .files_error{
+    color: #e22b1b;
+    display: none;
+  }
+
+  .files_ignored{
+    color: #898e7f;
+    display: none;
+  }
+
+  .files_ok{
+    color: #8fc861;
+    display: none;
+  }
+
+  .lines{
+    display: none;
+    
+    th, td{
+      text-align: center;
+      }
+        
+  }
+}  
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.rb b/app/models/import.rb
index d7f386bc7..4fc5e7685 100644
--- a/app/models/import.rb
+++ b/app/models/import.rb
@@ -28,7 +28,16 @@ class Import
     end
   end 
 
-  def compliance_check_result
+  def rule_parameter_set
+    rule_parameter_set_path = links["validation_params"]
+    if rule_parameter_set_path
+      response = Ievkit.get(rule_parameter_set_path)
+    else
+      raise Ievkit::Error("Impossible to access rule parameter set path link for import")
+    end
+  end
+  
+  def compliance_check
     compliance_check_path = links["validation_report"]
     if compliance_check_path
       response = Ievkit.get(compliance_check_path)
diff --git a/app/models/import_task.rb b/app/models/import_task.rb
index 797085752..2db120afd 100644
--- a/app/models/import_task.rb
+++ b/app/models/import_task.rb
@@ -43,7 +43,7 @@ class ImportTask
     # Call Iev Server
     begin 
       Ievkit.create_job(referential.name, "importer", data_format, {
-                                                  :file1 => action_params_io,
+                                                  :file1 => params_io,
                                                   :file2 => transport_data_io
                         }
                         
@@ -59,21 +59,30 @@ 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 action_params_io
-    file = StringIO.new( action_params.to_s )
+
+  def params_io
+    file = StringIO.new( params.to_json.to_s )
     Faraday::UploadIO.new(file, "application/json", "parameters.json")
-  end
+  end 
 
   def transport_data_io
     file = File.new(saved_resources_path, "r")
@@ -82,12 +91,7 @@ class ImportTask
     elsif file_extname == ".xml"
       Faraday::UploadIO.new(file, "application/xml", original_filename )
     end   
-  end
-
-  # TODO : How to find RuleParameterSet
-  def rule_parameter_set_io
-    UploadIO.new(rule_parameter_set.parameters, "application/octet-stream", "rule_parameter_set") 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
     
diff --git a/lib/ievkit/serializer.rb b/lib/ievkit/serializer.rb
index 8110ab3b5..a0475cee5 100644
--- a/lib/ievkit/serializer.rb
+++ b/lib/ievkit/serializer.rb
@@ -61,7 +61,7 @@ module Ievkit
     #
     # Returns an encoded String.
     def encode(data)
-      @dump.call(encode_object(data))
+      data #@dump.call(encode_object(data))
     end
     alias dump encode
 
@@ -92,10 +92,8 @@ module Ievkit
         when Date then hash[key] = value.to_time.utc.xmlschema
         when Time then hash[key] = value.utc.xmlschema
         when Hash then hash[key] = encode_hash(value)
-        when UploadIO then hash[key] = value
         end
       end
-      puts "hash #{hash.inspect}"
       hash
     end