Refs: #3507@1h

Introduction of Presence Validation in Import model, for:

- workbench
- referential

4 files changed, 17 insertions, 2 deletions

diff --git a/app/controllers/api/v1/netex_imports_controller.rb b/app/controllers/api/v1/netex_imports_controller.rb
index 16a7cef69..d67d121c0 100644
--- a/app/controllers/api/v1/netex_imports_controller.rb
+++ b/app/controllers/api/v1/netex_imports_controller.rb
@@ -19,7 +19,7 @@ module Api
       def netex_import_params
         params
           .require('netex_import')
-          .permit(:file, :name, :referential_id)
+          .permit(:file, :name, :referential_id, :workbench_id)
       end
     end
   end
diff --git a/app/models/import.rb b/app/models/import.rb
index 3d276c4ae..d3aa6d21b 100644
--- a/app/models/import.rb
+++ b/app/models/import.rb
@@ -9,6 +9,7 @@ class Import < ActiveRecord::Base
   enumerize :status, in: %i(new downloading analyzing pending successful failed running aborted canceled)
 
   validates :file, presence: true
+  validates_presence_of :referential, :workbench
 
   before_create do
     self.token_download = SecureRandom.urlsafe_base64
diff --git a/app/models/netex_import.rb b/app/models/netex_import.rb
index d79346d0d..575cef816 100644
--- a/app/models/netex_import.rb
+++ b/app/models/netex_import.rb
@@ -2,7 +2,6 @@ require 'net/http'
 class NetexImport < Import
   after_commit :launch_java_import
 
-  validates_presence_of :referential, :workbench
 
   def launch_java_import
     logger.warn  "Call iev get #{Rails.configuration.iev_url}/boiv_iev/referentials/importer/new?id=#{id}"
diff --git a/app/workers/workbench_import_worker.rb b/app/workers/workbench_import_worker.rb
index 3c3d19a66..b1c4fa30f 100644
--- a/app/workers/workbench_import_worker.rb
+++ b/app/workers/workbench_import_worker.rb
@@ -9,6 +9,13 @@ class WorkbenchImportWorker
   end
 
   def download
+    logger.warn  "Call iev get #{Rails.configuration.fe_url}/boiv_iev/referentials/importer/new?id=#{id}"
+    begin
+      Net::HTTP.get(URI("#{Rails.configuration.front_end_url}/boiv_iev/referentials/importer/new?id=#{id}"))
+    rescue Exception => e
+      logger.error "IEV server error : e.message"
+      logger.error e.backtrace.inspect
+    end
     
     
       require 'pry'
@@ -16,4 +23,12 @@ class WorkbenchImportWorker
       42
 
   end
+
+  def import_uri
+     @__import_uri__ ||= URI(import_url) 
+  end
+  def import_url
+    @__import_url__ ||= File.join(download_workbench_import_path(import.workbench, import)) 
+  end
+
 end