From f81fe99d4dd6ab3794d80cffbe43cf7a0d107343 Mon Sep 17 00:00:00 2001 From: Kat Date: Thu, 3 Aug 2023 12:15:05 +0100 Subject: [PATCH] pluralize method names --- app/services/imports/import_report_service.rb | 2 +- lib/tasks/full_import.rake | 10 +++++----- spec/lib/tasks/full_import_spec.rb | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app/services/imports/import_report_service.rb b/app/services/imports/import_report_service.rb index 3f543cc35..1267a75f6 100644 --- a/app/services/imports/import_report_service.rb +++ b/app/services/imports/import_report_service.rb @@ -8,7 +8,7 @@ module Imports BYTE_ORDER_MARK = "\uFEFF".freeze # Required to ensure Excel always reads CSV as UTF-8 - def create_report(report_suffix) + def create_reports(report_suffix) generate_missing_data_coordinators_report(report_suffix) generate_logs_report(report_suffix) end diff --git a/lib/tasks/full_import.rake b/lib/tasks/full_import.rake index 22f47ccfa..28af8c4dc 100644 --- a/lib/tasks/full_import.rake +++ b/lib/tasks/full_import.rake @@ -94,19 +94,19 @@ namespace :import do end desc "Generate migrated logs report" - task :generate_report, %i[institutions_csv_name] => :environment do |_task, args| + task :generate_reports, %i[institutions_csv_name] => :environment do |_task, args| institutions_csv_name = args[:institutions_csv_name] - raise "Usage: rake import:generate_report['institutions_csv_name']" if institutions_csv_name.blank? + raise "Usage: rake import:generate_reports['institutions_csv_name']" if institutions_csv_name.blank? s3_service = Storage::S3Service.new(Configuration::PaasConfigurationService.new, ENV["IMPORT_PAAS_INSTANCE"]) institutions_csv = CSV.parse(s3_service.get_file_io(institutions_csv_name), headers: true) - Imports::ImportReportService.new(s3_service, institutions_csv).create_report(institutions_csv_name) + Imports::ImportReportService.new(s3_service, institutions_csv).create_reports(institutions_csv_name) end desc "Run import from logs step to end" - task :logs_onwards, %i[institutions_csv_name] => %i[environment logs trigger_invites generate_report] + task :logs_onwards, %i[institutions_csv_name] => %i[environment logs trigger_invites generate_reports] desc "Run a full import for the institutions listed in the named file on s3" - task :full, %i[institutions_csv_name] => %i[environment initial logs trigger_invites generate_report] + task :full, %i[institutions_csv_name] => %i[environment initial logs trigger_invites generate_reports] end diff --git a/spec/lib/tasks/full_import_spec.rb b/spec/lib/tasks/full_import_spec.rb index 2b6f6984b..f263f15fc 100644 --- a/spec/lib/tasks/full_import_spec.rb +++ b/spec/lib/tasks/full_import_spec.rb @@ -16,8 +16,8 @@ describe "full import", type: :task do allow(ENV).to receive(:[]).with("IMPORT_PAAS_INSTANCE").and_return(instance_name) end - describe "import:generate_report" do - subject(:task) { Rake::Task["import:generate_report"] } + describe "import:generate_reports" do + subject(:task) { Rake::Task["import:generate_reports"] } before do Rake.application.rake_require("tasks/full_import") @@ -35,7 +35,7 @@ describe "full import", type: :task do it "creates a report using given organisation csv" do expect(Storage::S3Service).to receive(:new).with(paas_config_service, instance_name) expect(Imports::ImportReportService).to receive(:new).with(storage_service, CSV.parse(orgs_list, headers: true)) - expect(import_report_service).to receive(:create_report).with("some_name") + expect(import_report_service).to receive(:create_reports).with("some_name") task.invoke("some_name") end