diff options
| author | Zog | 2018-04-09 12:54:07 +0200 |
|---|---|---|
| committer | Zog | 2018-04-09 12:54:07 +0200 |
| commit | 543e3d051731ef50f7420d03dd03849054925f32 (patch) | |
| tree | c9a9224f125730ebd2daabd7d44441a21c24c232 /app/controllers | |
| parent | cb3a2fecf94c658448a6886529efc417f8d8dd39 (diff) | |
| download | chouette-core-6360-workbenchimport-display.tar.bz2 | |
Refactor NetexImport creation6360-workbenchimport-display
And associates error message to the parent importer
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/api/v1/netex_imports_controller.rb | 39 |
1 files changed, 1 insertions, 38 deletions
diff --git a/app/controllers/api/v1/netex_imports_controller.rb b/app/controllers/api/v1/netex_imports_controller.rb index 2654fa088..94600e93b 100644 --- a/app/controllers/api/v1/netex_imports_controller.rb +++ b/app/controllers/api/v1/netex_imports_controller.rb @@ -25,56 +25,19 @@ module Api def create_models find_workbench - create_referential create_netex_import end def create_netex_import attributes = netex_import_params.merge creator: "Webservice" - - attributes = attributes.merge referential_id: @new_referential.id - @netex_import = Import::Netex.new attributes @netex_import.save! - - unless @netex_import.referential - Rails.logger.info "Can't create referential for import #{@netex_import.id}: #{@new_referential.inspect} #{@new_referential.metadatas.inspect} #{@new_referential.errors.full_messages}" - @netex_import.messages.create criticity: :error, message_key: "referential_creation" - end + @netex_import.create_referential rescue ActiveRecord::RecordInvalid render json: {errors: @netex_import.errors}, status: 406 finish_action! end - def create_referential - @new_referential = - Referential.new( - name: netex_import_params['name'], - organisation_id: @workbench.organisation_id, - workbench_id: @workbench.id, - metadatas: [metadata] - ) - @new_referential.save - end - - def metadata - metadata = ReferentialMetadata.new - - if netex_import_params['file'] - netex_file = STIF::NetexFile.new(netex_import_params['file'].to_io) - frame = netex_file.frames.first - - if frame - metadata.periodes = frame.periods - - line_objectids = frame.line_refs.map { |ref| "STIF:CODIFLIGNE:Line:#{ref}" } - metadata.line_ids = @workbench.lines.where(objectid: line_objectids).pluck(:id) - end - end - - metadata - end - def netex_import_params params .require('netex_import') |
