aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--app/controllers/api/v1/netex_imports_controller.rb2
-rw-r--r--app/models/concerns/iev_interfaces/task.rb2
-rw-r--r--app/models/import/netex.rb3
-rw-r--r--spec/models/import/gtfs_spec.rb13
4 files changed, 14 insertions, 6 deletions
diff --git a/app/controllers/api/v1/netex_imports_controller.rb b/app/controllers/api/v1/netex_imports_controller.rb
index 94600e93b..186ddc35c 100644
--- a/app/controllers/api/v1/netex_imports_controller.rb
+++ b/app/controllers/api/v1/netex_imports_controller.rb
@@ -32,7 +32,7 @@ module Api
attributes = netex_import_params.merge creator: "Webservice"
@netex_import = Import::Netex.new attributes
@netex_import.save!
- @netex_import.create_referential
+ @netex_import.create_referential!
rescue ActiveRecord::RecordInvalid
render json: {errors: @netex_import.errors}, status: 406
finish_action!
diff --git a/app/models/concerns/iev_interfaces/task.rb b/app/models/concerns/iev_interfaces/task.rb
index bc78ff28c..f052b3a8f 100644
--- a/app/models/concerns/iev_interfaces/task.rb
+++ b/app/models/concerns/iev_interfaces/task.rb
@@ -25,7 +25,7 @@ module IevInterfaces::Task
scope :blocked, -> { where('created_at < ? AND status = ?', 4.hours.ago, 'running') }
- before_create :initialize_fields
+ before_save :initialize_fields, on: :create
after_save :notify_parent
end
diff --git a/app/models/import/netex.rb b/app/models/import/netex.rb
index 83b654f81..93604c5f9 100644
--- a/app/models/import/netex.rb
+++ b/app/models/import/netex.rb
@@ -10,7 +10,7 @@ class Import::Netex < Import::Base
validates_presence_of :parent
- def create_referential
+ def create_referential!
self.referential =
Referential.new(
name: self.name,
@@ -27,6 +27,7 @@ class Import::Netex < Import::Base
parent.messages.create criticity: :error, message_key: "referential_creation", message_attributes: {referential_name: referential.name}
end
end
+ save!
end
private
diff --git a/spec/models/import/gtfs_spec.rb b/spec/models/import/gtfs_spec.rb
index 66607c27f..b4b23be00 100644
--- a/spec/models/import/gtfs_spec.rb
+++ b/spec/models/import/gtfs_spec.rb
@@ -246,7 +246,6 @@ RSpec.describe Import::Gtfs do
end
describe "#download_local_file" do
-
let(:file) { "google-sample-feed.zip" }
let(:import) do
Import::Gtfs.create! name: "GTFS test", creator: "Test", workbench: workbench, file: open_fixture(file), download_host: "rails_host"
@@ -261,7 +260,6 @@ RSpec.describe Import::Gtfs do
it "should download local_file" do
expect(File.read(import.download_local_file)).to eq(read_fixture(file))
end
-
end
describe "#download_host" do
@@ -270,7 +268,16 @@ RSpec.describe Import::Gtfs do
expect(Import::Gtfs.new.download_host).to eq("download_host")
end
-
end
+ describe "#download_path" do
+ let(:file) { "google-sample-feed.zip" }
+ let(:import) do
+ Import::Gtfs.create! name: "GTFS test", creator: "Test", workbench: workbench, file: open_fixture(file), download_host: "rails_host"
+ end
+
+ it "should return the pathwith the token" do
+ expect(import.download_path).to eq("/workbenches/#{import.workbench_id}/imports/#{import.id}/download?token=#{import.token_download}")
+ end
+ end
end