From 2484b8f8affd63b1e596fa42caea07772fffd88f Mon Sep 17 00:00:00 2001 From: natdeanlewissoftwire Date: Mon, 11 Dec 2023 12:28:23 +0000 Subject: [PATCH] feat: remove redundant user instance variable --- app/jobs/scheme_email_csv_job.rb | 2 +- app/services/csv/scheme_csv_service.rb | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/app/jobs/scheme_email_csv_job.rb b/app/jobs/scheme_email_csv_job.rb index 0941d92af..1dad752c5 100644 --- a/app/jobs/scheme_email_csv_job.rb +++ b/app/jobs/scheme_email_csv_job.rb @@ -8,7 +8,7 @@ class SchemeEmailCsvJob < ApplicationJob def perform(user, search_term = nil, filters = {}, all_orgs = false, organisation = nil, download_type = "combined") # rubocop:disable Style/OptionalBooleanParameter - sidekiq can't serialise named params unfiltered_schemes = organisation.present? && user.support? ? Scheme.where(owning_organisation_id: organisation.id) : user.schemes filtered_schemes = FilterManager.filter_schemes(unfiltered_schemes, search_term, filters, all_orgs, user) - csv_string = Csv::SchemeCsvService.new(user:, download_type:).prepare_csv(filtered_schemes) + csv_string = Csv::SchemeCsvService.new(download_type:).prepare_csv(filtered_schemes) case download_type when "schemes" diff --git a/app/services/csv/scheme_csv_service.rb b/app/services/csv/scheme_csv_service.rb index 08ff4adb1..ca405e278 100644 --- a/app/services/csv/scheme_csv_service.rb +++ b/app/services/csv/scheme_csv_service.rb @@ -3,8 +3,7 @@ module Csv include SchemesHelper include LocationsHelper - def initialize(user:, download_type:) - @user = user + def initialize(download_type:) @download_type = download_type end