Merge pull request #4202 from nhsuk/cli-generate-cohort-import-updates

Update cohort import filename

Author: misaka

app/lib/mavis_cli/generate/cohort_imports.rb

@@ -11,18 +11,25 @@ class CohortImports < Dry::CLI::Command
              required: true,
              default: 10,
              desc: "Number of patients to create"
+      option :ods_code,
+             type: :string,
+             default: "A9A5A",
+             desc: "ODS code of the organisation to use for the cohort import"
 
-      def call(patients:)
+      def call(patients:, ods_code:)
         MavisCLI.load_rails
 
         patient_count = patients.to_i
-        puts "Generating cohort import with #{patient_count} patients..."
         progress_bar = MavisCLI.progress_bar(patient_count)
 
+        puts "Generating cohort import for ods code #{ods_code} with" \
+               " #{patient_count} patients..."
+
         result =
           ::Generate::CohortImports.call(
-            patient_count: patient_count,
-            progress_bar: progress_bar
+            ods_code:,
+            patient_count:,
+            progress_bar:
           )
 
         puts "\nCohort import CSV generated: #{result}"

lib/generate/cohort_imports.rb

@@ -74,8 +74,19 @@ def patients
     delegate :organisation, to: :team
 
     def cohort_import_csv_filepath
+      timestamp = Time.current.strftime("%Y%m%d%H%M%S")
+      size =
+        ActiveSupport::NumberHelper.number_to_human(
+          @patient_count,
+          units: {
+            thousand: "k",
+            million: "m"
+          },
+          format: "%n%u"
+        )
       Rails.root.join(
-        "tmp/perf-test-cohort-import-#{organisation.ods_code}-#{programme.type}.csv"
+        "tmp/cohort-import-" \
+          "#{organisation.ods_code}-#{programme.type}-#{size}-#{timestamp}.csv"
       )
     end
 
@@ -174,7 +185,7 @@ def build_patient
         end
     end
 
-    def date_of_birth_for_year(year_group, academic_year: AcademicYear.current)
+    def date_of_birth_for_year(year_group, academic_year: AcademicYear.pending)
       if year_group < 12
         rand(
           year_group.to_birth_academic_year(

spec/features/cli_generate_cohort_imports_spec.rb

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+describe "mavis generate cohort-imports" do
+  it "generates a cohort import CSV file" do
+    given_an_organisation_exists
+    and_there_are_three_sessions_in_the_organisation
+    when_i_run_the_generate_cohort_imports_command
+    then_a_cohort_import_csv_file_is_created
+  end
+
+  def given_an_organisation_exists
+    @programme = Programme.hpv.first || create(:programme, :hpv)
+    @organisation = create(:organisation, ods_code: "R1Y")
+  end
+
+  def and_there_are_three_sessions_in_the_organisation
+    @sessions =
+      create_list(
+        :session,
+        3,
+        organisation: @organisation,
+        programmes: [@programme]
+      )
+  end
+
+  def when_i_run_the_generate_cohort_imports_command
+    freeze_time do
+      @output =
+        capture_output do
+          Dry::CLI.new(MavisCLI).call(
+            arguments: %w[generate cohort-imports -o R1Y -p 100]
+          )
+        end
+      @timestamp = Time.current.strftime("%Y%m%d%H%M%S")
+    end
+  end
+
+  def then_a_cohort_import_csv_file_is_created
+    expect(@output).to include(
+      "Generating cohort import for ods code R1Y with 100 patients"
+    )
+    expect(@output).to match(
+      /Cohort import CSV generated:.*cohort-import-R1Y-hpv-100-#{@timestamp}.csv/
+    )
+
+    expect(
+      File.readlines(
+        Rails.root.join("tmp", "cohort-import-R1Y-hpv-100-#{@timestamp}.csv")
+      ).length
+    ).to eq 101
+  end
+end