Merge branch 'master' into 0000-docker

1 files changed, 10 insertions, 1 deletions

diff --git a/app/models/import.rb b/app/models/import.rb
index 19e835986..29aadcd56 100644
--- a/app/models/import.rb
+++ b/app/models/import.rb
@@ -13,13 +13,14 @@ class Import < ActiveRecord::Base
     where('started_at BETWEEN :begin AND :end', begin: period_range.begin, end: period_range.end)
    end
 
+  scope :blocked, -> { where('created_at < ? AND status = ?', 4.hours.ago, 'running') }
+
   extend Enumerize
   enumerize :status, in: %w(new pending successful warning failed running aborted canceled), scope: true, default: :new
 
   validates :name, presence: true
   validates :file, presence: true
   validates_presence_of :workbench, :creator
-  validates_format_of :file, with: %r{\.zip\z}i, message: I18n.t('activerecord.errors.models.import.attributes.file.wrong_file_extension')
 
   before_create :initialize_fields
 
@@ -43,6 +44,14 @@ class Import < ActiveRecord::Base
     %w(successful failed warning aborted canceled)
   end
 
+  def self.abort_old
+    where(
+      'created_at < ? AND status NOT IN (?)',
+      4.hours.ago,
+      finished_statuses
+    ).update_all(status: 'aborted')
+  end
+
   def notify_parent
     parent.child_change
     update(notified_parent_at: DateTime.now)