Make NetexImport#parent mandatory. Refs #4273

3 files changed, 8 insertions, 4 deletions

diff --git a/app/controllers/api/v1/netex_imports_controller.rb b/app/controllers/api/v1/netex_imports_controller.rb
index bf88448ba..ba6f46047 100644
--- a/app/controllers/api/v1/netex_imports_controller.rb
+++ b/app/controllers/api/v1/netex_imports_controller.rb
@@ -54,7 +54,7 @@ module Api
       def netex_import_params
         params
           .require('netex_import')
-          .permit(:file, :name, :workbench_id)
+          .permit(:file, :name, :workbench_id, :parent_id, :parent_type)
       end
     end
   end
diff --git a/app/models/netex_import.rb b/app/models/netex_import.rb
index 7cb551117..1b3eaff18 100644
--- a/app/models/netex_import.rb
+++ b/app/models/netex_import.rb
@@ -2,6 +2,8 @@ require 'net/http'
 class NetexImport < Import
   after_commit :launch_java_import, on: :create
 
+  validates_presence_of :parent
+
   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 6da8eccc4..27dc5916f 100644
--- a/app/workers/workbench_import_worker.rb
+++ b/app/workers/workbench_import_worker.rb
@@ -101,8 +101,10 @@ class WorkbenchImportWorker
       %x{unzip -oqq #{file.path} -d #{dest}}
     end
     { netex_import:
-      { workbench_id: @workbench_import.workbench_id,
-        name: name,
-        file: HTTPService.upload(file, 'application/zip', name) } }
+        { parent_id: @workbench_import.id,
+          parent_type: @workbench_import.class.name,
+          workbench_id: @workbench_import.workbench_id,
+          name: name,
+          file: HTTPService.upload(file, 'application/zip', name) } }
   end
 end