From efa66fba91913604fd5134f86e4c12e6787bfb45 Mon Sep 17 00:00:00 2001 From: Sam Collard Date: Mon, 12 Sep 2022 17:03:57 +0100 Subject: [PATCH] Clarifying comments --- app/controllers/modules/lettings_logs_filter.rb | 2 +- app/jobs/email_csv_job.rb | 4 ++-- spec/jobs/email_csv_job_spec.rb | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/controllers/modules/lettings_logs_filter.rb b/app/controllers/modules/lettings_logs_filter.rb index d06f241c2..200a0db41 100644 --- a/app/controllers/modules/lettings_logs_filter.rb +++ b/app/controllers/modules/lettings_logs_filter.rb @@ -8,7 +8,7 @@ module Modules::LettingsLogsFilter current_filters = session[:lettings_logs_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? } - @session_filters = params["organisation_select"] == "all" ? new_filters.except("organisation") : new_filters + params["organisation_select"] == "all" ? new_filters.except("organisation") : new_filters end def session_filters(specific_org: false) diff --git a/app/jobs/email_csv_job.rb b/app/jobs/email_csv_job.rb index 6d59b3acd..033ead7ae 100644 --- a/app/jobs/email_csv_job.rb +++ b/app/jobs/email_csv_job.rb @@ -5,8 +5,8 @@ class EmailCsvJob < ApplicationJob EXPIRATION_TIME = 3.hours.to_i - def perform(user, search_term = nil, filters = {}, all_orgs = false, organisation = nil) # rubocop:disable Style/OptionalBooleanParameter - unfiltered_logs = organisation.present? && user.support? ? LettingsLog.all.where(owning_organisation_id: organisation.id) : user.lettings_logs + 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.where(owning_organisation_id: organisation.id) : user.lettings_logs 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" diff --git a/spec/jobs/email_csv_job_spec.rb b/spec/jobs/email_csv_job_spec.rb index 806341ca1..ae3e14b90 100644 --- a/spec/jobs/email_csv_job_spec.rb +++ b/spec/jobs/email_csv_job_spec.rb @@ -60,7 +60,7 @@ describe EmailCsvJob do def expect_csv expect(storage_service).to receive(:write_file) do |_filename, data| - # Ignore BOM + # Ignore byte order marker csv = CSV.parse(data[1..]) yield(csv) end