Fix task to return true or false for save

3 files changed, 51 insertions, 38 deletions

diff --git a/app/models/compliance_check_task.rb b/app/models/compliance_check_task.rb
index 32cc08c19..9ec6bbe27 100644
--- a/app/models/compliance_check_task.rb
+++ b/app/models/compliance_check_task.rb
@@ -30,14 +30,19 @@ class ComplianceCheckTask
     organisation.rule_parameter_sets.find(rule_parameter_set_id) if rule_parameter_set_id.present?
   end
 
-  def save        
-    # Call Iev Server
-    begin 
-      Ievkit.create_job( referential.slug, "validator", "", {
-                          :file1 => params_io,
-                        } )     
-    rescue Exception => exception
-      raise exception
+  def save
+    if valid?
+      # Call Iev Server
+      begin 
+        Ievkit.create_job( referential.slug, "validator", "", {
+                             :file1 => params_io,
+                           } )     
+      rescue Exception => exception
+        raise exception
+      end
+      true
+    else
+      false
     end
   end
   
diff --git a/app/models/export_task.rb b/app/models/export_task.rb
index fe85e335a..c346d0597 100644
--- a/app/models/export_task.rb
+++ b/app/models/export_task.rb
@@ -36,14 +36,19 @@ class ExportTask
     referential.organisation
   end
 
-  def save        
-    # Call Iev Server
-    begin 
-      Ievkit.create_job( referential.slug, "exporter", data_format, {
-                          :file1 => params_io,
-                        } )     
-    rescue Exception => exception
-      raise exception
+  def save
+    if valid?
+      # Call Iev Server
+      begin 
+        Ievkit.create_job( referential.slug, "exporter", data_format, {
+                             :file1 => params_io,
+                           } )     
+      rescue Exception => exception
+        raise exception
+      end
+      true
+    else
+      false
     end
   end
 
diff --git a/app/models/import_task.rb b/app/models/import_task.rb
index 795a964dc..0a5a299af 100644
--- a/app/models/import_task.rb
+++ b/app/models/import_task.rb
@@ -37,25 +37,30 @@ class ImportTask
   end
 
   def save
-    # Save resources 
-    save_resources
-
-    # Call Iev Server
-    begin 
-      Ievkit.create_job(referential.slug, "importer", data_format, {
-                                                  :file1 => params_io,
-                                                  :file2 => transport_data_io
-                        }
-                        
-                       )
-
-      # Delete resources
-      delete_resources
-    rescue Exception => exception
-      # If iev server has an error must delete resources before
-      delete_resources
-
-      raise exception
+    if valid?
+      # Save resources 
+      save_resources
+      
+      # Call Iev Server
+      begin 
+        Ievkit.create_job(referential.slug, "importer", data_format, {
+                            :file1 => params_io,
+                            :file2 => transport_data_io
+                          }
+                          
+                         )
+        
+        # Delete resources
+        delete_resources        
+      rescue Exception => exception
+        # If iev server has an error must delete resources before
+        delete_resources
+        
+        raise exception
+      end
+      true
+    else
+      false
     end
   end
 
@@ -95,8 +100,6 @@ class ImportTask
 
   def save_resources
     FileUtils.mkdir_p root
-    puts resources.inspect
-    puts saved_resources_path.inspect
     FileUtils.cp resources.path, saved_resources_path
   end
 
@@ -109,7 +112,7 @@ class ImportTask
   end
   
   def file_extname
-    File.extname(resources.original_filename)
+    File.extname(original_filename) if original_filename
   end
 
   def saved_resources_path