diff options
Diffstat (limited to 'app/models/bulk_imports')
| -rw-r--r-- | app/models/bulk_imports/entity.rb | 2 | ||||
| -rw-r--r-- | app/models/bulk_imports/export_upload.rb | 1 | ||||
| -rw-r--r-- | app/models/bulk_imports/tracker.rb | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/app/models/bulk_imports/entity.rb b/app/models/bulk_imports/entity.rb index a2542e669e1..e49c4e09a50 100644 --- a/app/models/bulk_imports/entity.rb +++ b/app/models/bulk_imports/entity.rb @@ -53,7 +53,7 @@ class BulkImports::Entity < ApplicationRecord scope :by_user_id, ->(user_id) { joins(:bulk_import).where(bulk_imports: { user_id: user_id }) } scope :stale, -> { where('created_at < ?', 8.hours.ago).where(status: [0, 1]) } scope :by_bulk_import_id, ->(bulk_import_id) { where(bulk_import_id: bulk_import_id) } - scope :order_by_created_at, -> (direction) { order(created_at: direction) } + scope :order_by_created_at, ->(direction) { order(created_at: direction) } alias_attribute :destination_slug, :destination_name diff --git a/app/models/bulk_imports/export_upload.rb b/app/models/bulk_imports/export_upload.rb index a9cba5119af..4304032b28c 100644 --- a/app/models/bulk_imports/export_upload.rb +++ b/app/models/bulk_imports/export_upload.rb @@ -3,7 +3,6 @@ module BulkImports class ExportUpload < ApplicationRecord include WithUploads - include ObjectStorage::BackgroundMove self.table_name = 'bulk_import_export_uploads' diff --git a/app/models/bulk_imports/tracker.rb b/app/models/bulk_imports/tracker.rb index 357f4629078..b04ef1cb7ae 100644 --- a/app/models/bulk_imports/tracker.rb +++ b/app/models/bulk_imports/tracker.rb @@ -26,7 +26,7 @@ class BulkImports::Tracker < ApplicationRecord entity_scope = where(bulk_import_entity_id: entity_id) next_stage_scope = entity_scope.with_status(:created).select('MIN(stage)') - entity_scope.where(stage: next_stage_scope) + entity_scope.where(stage: next_stage_scope).with_status(:created) } def self.stage_running?(entity_id, stage) |