Browse Source

Add processed attribute to bulk upload

pull/2653/head
Manny Dinssa 2 years ago
parent
commit
b764e1fa1d
  1. 2
      app/controllers/lettings_logs_controller.rb
  2. 2
      app/controllers/sales_logs_controller.rb
  3. 2
      app/models/bulk_upload.rb
  4. 1
      app/services/bulk_upload/processor.rb
  5. 5
      db/migrate/20240927143916_add_processed_to_bulk_uploads.rb
  6. 1
      db/schema.rb

2
app/controllers/lettings_logs_controller.rb

@ -124,7 +124,7 @@ class LettingsLogsController < LogsController
redirect_to clear_filters_path(filter_type: @filter_type, organisation_id: params[:organisation_id]) and return
end
uploads = BulkUpload.lettings.where("created_at >= ?", 30.days.ago)
uploads = BulkUpload.lettings.visible.where("created_at >= ?", 30.days.ago)
unpaginated_filtered_uploads = filter_manager.filtered_uploads(uploads, search_term, filter_manager.session_filters)
@pagy, @bulk_uploads = pagy(unpaginated_filtered_uploads)

2
app/controllers/sales_logs_controller.rb

@ -94,7 +94,7 @@ class SalesLogsController < LogsController
redirect_to clear_filters_path(filter_type: @filter_type, organisation_id: params[:organisation_id]) and return
end
uploads = BulkUpload.sales.where("created_at >= ?", 30.days.ago)
uploads = BulkUpload.sales.visible.where("created_at >= ?", 30.days.ago)
unpaginated_filtered_uploads = filter_manager.filtered_uploads(uploads, search_term, session_filters)
@pagy, @bulk_uploads = pagy(unpaginated_filtered_uploads)

2
app/models/bulk_upload.rb

@ -12,6 +12,8 @@ class BulkUpload < ApplicationRecord
after_initialize :generate_identifier, unless: :identifier
scope :visible, -> { where(processed: true) }
scope :search_by_filename, ->(filename) { where("filename ILIKE ?", "%#{filename}%") }
scope :search_by_user_name, ->(name) { where(user_id: User.where("name ILIKE ?", "%#{name}%").select(:id)) }
scope :search_by_user_email, ->(email) { where(user_id: User.where("email ILIKE ?", "%#{email}%").select(:id)) }

1
app/services/bulk_upload/processor.rb

@ -37,6 +37,7 @@ class BulkUpload::Processor
send_failure_mail
ensure
downloader.delete_local_file!
bulk_upload.update!(processed: true)
end
def approve

5
db/migrate/20240927143916_add_processed_to_bulk_uploads.rb

@ -0,0 +1,5 @@
class AddProcessedToBulkUploads < ActiveRecord::Migration[7.0]
def change
add_column :bulk_uploads, :processed, :boolean, default: false
end
end

1
db/schema.rb

@ -45,6 +45,7 @@ ActiveRecord::Schema[7.0].define(version: 2024_09_25_095041) do
t.integer "organisation_id"
t.integer "moved_user_id"
t.integer "failed"
t.boolean "processed", default: false
t.index ["identifier"], name: "index_bulk_uploads_on_identifier", unique: true
t.index ["user_id"], name: "index_bulk_uploads_on_user_id"
end

Loading…
Cancel
Save