diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/api/v1/netex_imports_controller.rb | 32 | ||||
| -rw-r--r-- | app/views/api/v1/netex_imports/create.json.rabl | 4 |
2 files changed, 19 insertions, 17 deletions
diff --git a/app/controllers/api/v1/netex_imports_controller.rb b/app/controllers/api/v1/netex_imports_controller.rb index e9b8242bd..b4d3caf16 100644 --- a/app/controllers/api/v1/netex_imports_controller.rb +++ b/app/controllers/api/v1/netex_imports_controller.rb @@ -4,27 +4,29 @@ module Api def create respond_to do | format | - format.json do - workbench = Workbench.where(id: netex_import_params['workbench_id']).first - if workbench - @referential = Referential.new(name: netex_import_params['name'], organisation_id: workbench.organisation_id, workbench_id: workbench.id) - @import = NetexImport.new(netex_import_params) - if @import.valid? && @referential.valid? - @import.save! - @referential.save! - else - render json: {errors: @import.errors.to_h.merge( @referential.errors.to_h )}, status: 406 - end - else - render json: {errors: {'workbench_id' => 'missing'}}, status: 406 - end - end + format.json(&method(:create_models)) end end private + def create_models + require 'pry' + binding.pry + workbench = Workbench.where(id: netex_import_params['workbench_id']).first + return render json: {errors: {'workbench_id' => 'missing'}}, status: 406 unless workbench + + @referential = Referential.new(name: netex_import_params['name'], organisation_id: workbench.organisation_id, workbench_id: workbench.id) + @netex_import = NetexImport.new(netex_import_params.merge(referential_id: @referential.id)) + if @netex_import.valid? && @referential.valid? + @netex_import.save! + @referential.save! + else + render json: {errors: @netex_import.errors.to_h.merge( @referential.errors.to_h )}, status: 406 + end + end + def netex_import_params params .require('netex_import') diff --git a/app/views/api/v1/netex_imports/create.json.rabl b/app/views/api/v1/netex_imports/create.json.rabl index 1361cdb80..f37703349 100644 --- a/app/views/api/v1/netex_imports/create.json.rabl +++ b/app/views/api/v1/netex_imports/create.json.rabl @@ -1,3 +1,3 @@ -object @import -attributes :id, :type +object @netex_import +attributes :id, :workbench_id, :referential_id |