From 225249d819b743483c7a968c2401aa052b7db86f Mon Sep 17 00:00:00 2001 From: natdeanlewissoftwire Date: Mon, 11 Dec 2023 10:27:00 +0000 Subject: [PATCH] feat: update csv service --- app/jobs/scheme_email_csv_job.rb | 6 ++---- app/services/csv/scheme_csv_service.rb | 1 - 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/app/jobs/scheme_email_csv_job.rb b/app/jobs/scheme_email_csv_job.rb index 2e3f21652..b3b2b75fa 100644 --- a/app/jobs/scheme_email_csv_job.rb +++ b/app/jobs/scheme_email_csv_job.rb @@ -14,12 +14,10 @@ class SchemeEmailCsvJob < ApplicationJob csv_string = Csv::SchemeCsvService.new(user:).prepare_csv(filtered_schemes) filename = "#{['schemes', organisation&.name, Time.zone.now].compact.join('-')}.csv" when "locations" - filtered_locations = filtered_schemes.map(&:locations).flatten - csv_string = Csv::LocationCsvService.new(user:).prepare_csv(filtered_locations) + csv_string = Csv::LocationCsvService.new(user:).prepare_csv(filtered_schemes) filename = "#{['locations', organisation&.name, Time.zone.now].compact.join('-')}.csv" when "combined" - filtered_locations = filtered_schemes.map(&:locations).flatten - csv_string = Csv::SchemeAndLocationCsvService.new(user:).prepare_csv(filtered_locations) + csv_string = Csv::SchemeAndLocationCsvService.new(user:).prepare_csv(filtered_schemes) filename = "#{['schemes-and-locations', organisation&.name, Time.zone.now].compact.join('-')}.csv" end diff --git a/app/services/csv/scheme_csv_service.rb b/app/services/csv/scheme_csv_service.rb index c3436b604..68e369c57 100644 --- a/app/services/csv/scheme_csv_service.rb +++ b/app/services/csv/scheme_csv_service.rb @@ -45,7 +45,6 @@ module Csv "scheme_service_name" => %w[service_name], "scheme_status" => %w[status], "scheme_sensitive" => %w[sensitive], - "scheme_type" => [], "scheme_registered_under_care_act" => %w[registered_under_care_act], "scheme_support_services_provided_by" => %w[arrangement_type], "scheme_primary_client_group" => %w[primary_client_group],