diff options
| -rw-r--r-- | app/models/import.rb | 22 | ||||
| -rw-r--r-- | app/services/parent_import_notifier.rb | 2 |
2 files changed, 12 insertions, 12 deletions
diff --git a/app/models/import.rb b/app/models/import.rb index 507b40f38..47f41893f 100644 --- a/app/models/import.rb +++ b/app/models/import.rb @@ -13,15 +13,23 @@ class Import < ActiveRecord::Base before_create :initialize_fields + def self.failing_statuses + symbols_with_indifferent_access(%i(failed aborted canceled)) + end + + def self.finished_statuses + symbols_with_indifferent_access(%i(successful failed aborted canceled)) + end + def notify_parent parent.child_change(self) update(notified_parent_at: DateTime.now) end def child_change(child) - return if finished_statuses.include?(status) + return if self.class.finished_statuses.include?(status) - if failing_statuses.include?(child.status) + if self.class.failing_statuses.include?(child.status) return update(status: 'failed') end @@ -39,15 +47,7 @@ class Import < ActiveRecord::Base self.status = Import.status.new end - def failing_statuses - symbols_with_indifferent_access(%i(failed aborted canceled)) - end - - def finished_statuses - symbols_with_indifferent_access(%i(successful failed aborted canceled)) - end - - def symbols_with_indifferent_access(array) + def self.symbols_with_indifferent_access(array) array.flat_map { |symbol| [symbol, symbol.to_s] } end end diff --git a/app/services/parent_import_notifier.rb b/app/services/parent_import_notifier.rb index 8581cb97a..47e6755e4 100644 --- a/app/services/parent_import_notifier.rb +++ b/app/services/parent_import_notifier.rb @@ -8,7 +8,7 @@ class ParentImportNotifier Import .where( notified_parent_at: nil, - status: [:failed, :successful, :aborted, :canceled] + status: Import.finished_statuses ) .where.not(parent: nil) end |