diff options
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/import/base.rb | 1 | ||||
| -rw-r--r-- | app/models/import/gtfs.rb | 3 | ||||
| -rw-r--r-- | app/models/import/netex.rb | 7 | 
3 files changed, 6 insertions, 5 deletions
| diff --git a/app/models/import/base.rb b/app/models/import/base.rb index 333fb0f56..606c39974 100644 --- a/app/models/import/base.rb +++ b/app/models/import/base.rb @@ -44,6 +44,7 @@ class Import::Base < ApplicationModel    end    def aborted! +    Rails.logger.info "=== aborted ==="      update status: :aborted    end diff --git a/app/models/import/gtfs.rb b/app/models/import/gtfs.rb index e1bac36a6..4f0dde9d1 100644 --- a/app/models/import/gtfs.rb +++ b/app/models/import/gtfs.rb @@ -28,10 +28,11 @@ class Import::Gtfs < Import::Base      import_without_status      update status: 'successful', ended_at: Time.now -    referential&.ready! +    referential&.active!    rescue Exception => e      update status: 'failed', ended_at: Time.now      Rails.logger.error "Error in GTFS import: #{e} #{e.backtrace.join('\n')}" +    create_message criticity: :error, message_key: :full_text, message_attributes: {text: e.message}      referential&.failed!    ensure      notify_parent diff --git a/app/models/import/netex.rb b/app/models/import/netex.rb index e27f1a34c..f64a18e98 100644 --- a/app/models/import/netex.rb +++ b/app/models/import/netex.rb @@ -2,15 +2,12 @@ require 'net/http'  class Import::Netex < Import::Base    before_destroy :destroy_non_ready_referential -  after_commit :call_iev_callback, on: :create -    after_commit do      main_resource.update_status_from_importer self.status      true    end    before_save do -    self.status = 'aborted' unless referential      self.referential&.failed! if self.status == 'aborted' || self.status == 'failed'    end @@ -47,7 +44,7 @@ class Import::Netex < Import::Base        save!      else        Rails.logger.info "Can't create referential for import #{self.id}: #{referential.inspect} #{referential.metadatas.inspect} #{referential.errors.messages}" -      aborted! +        if referential.metadatas.all?{|m| m.line_ids.empty? && m.line_ids.empty?}          create_message criticity: :error, message_key: "referential_creation_missing_lines", message_attributes: {referential_name: referential.name}        elsif (overlapped_referential_ids = referential.overlapped_referential_ids).any? @@ -69,6 +66,8 @@ class Import::Netex < Import::Base            resource_attributes: referential.errors.messages          )        end +      self.referential = nil +      aborted!      end    end | 
