Browse Source

Clarifying comments

pull/851/head
Sam Collard 3 years ago
parent
commit
efa66fba91
  1. 2
      app/controllers/modules/lettings_logs_filter.rb
  2. 4
      app/jobs/email_csv_job.rb
  3. 2
      spec/jobs/email_csv_job_spec.rb

2
app/controllers/modules/lettings_logs_filter.rb

@ -8,7 +8,7 @@ module Modules::LettingsLogsFilter
current_filters = session[:lettings_logs_filters] current_filters = session[:lettings_logs_filters]
new_filters = current_filters.present? ? JSON.parse(current_filters) : {} new_filters = current_filters.present? ? JSON.parse(current_filters) : {}
current_user.lettings_logs_filters(specific_org:).each { |filter| new_filters[filter] = params[filter] if params[filter].present? } current_user.lettings_logs_filters(specific_org:).each { |filter| new_filters[filter] = params[filter] if params[filter].present? }
@session_filters = params["organisation_select"] == "all" ? new_filters.except("organisation") : new_filters params["organisation_select"] == "all" ? new_filters.except("organisation") : new_filters
end end
def session_filters(specific_org: false) def session_filters(specific_org: false)

4
app/jobs/email_csv_job.rb

@ -5,8 +5,8 @@ class EmailCsvJob < ApplicationJob
EXPIRATION_TIME = 3.hours.to_i EXPIRATION_TIME = 3.hours.to_i
def perform(user, search_term = nil, filters = {}, all_orgs = false, organisation = nil) # rubocop:disable Style/OptionalBooleanParameter def perform(user, search_term = nil, filters = {}, all_orgs = false, organisation = nil) # rubocop:disable Style/OptionalBooleanParameter - sidekiq can't serialise named params
unfiltered_logs = organisation.present? && user.support? ? LettingsLog.all.where(owning_organisation_id: organisation.id) : user.lettings_logs unfiltered_logs = organisation.present? && user.support? ? LettingsLog.where(owning_organisation_id: organisation.id) : user.lettings_logs
filtered_logs = FilterService.filter_lettings_logs(unfiltered_logs, search_term, filters, all_orgs, user) filtered_logs = FilterService.filter_lettings_logs(unfiltered_logs, search_term, filters, all_orgs, user)
filename = organisation.present? ? "logs-#{organisation.name}-#{Time.zone.now}.csv" : "logs-#{Time.zone.now}.csv" filename = organisation.present? ? "logs-#{organisation.name}-#{Time.zone.now}.csv" : "logs-#{Time.zone.now}.csv"

2
spec/jobs/email_csv_job_spec.rb

@ -60,7 +60,7 @@ describe EmailCsvJob do
def expect_csv def expect_csv
expect(storage_service).to receive(:write_file) do |_filename, data| expect(storage_service).to receive(:write_file) do |_filename, data|
# Ignore BOM # Ignore byte order marker
csv = CSV.parse(data[1..]) csv = CSV.parse(data[1..])
yield(csv) yield(csv)
end end

Loading…
Cancel
Save