Add CSVImportable#process!

This extracts the `process!` method from `ImmunisationImport` and
`CohortImport` to the common concern used by both of them to ensure that
the behaviour is the same across both import models.

Author: thomasleese

app/models/cohort_import.rb

@@ -27,24 +27,6 @@
 class CohortImport < ApplicationRecord
   include CSVImportable
 
-  def process!
-    parse_rows! if rows.nil?
-    return if invalid?
-
-    ActiveRecord::Base.transaction do
-      save!
-
-      rows.each do |row|
-        location = Location.find_by(urn: row.school_urn)
-        patient =
-          location.patients.new(
-            row.to_patient.merge(parent: Parent.new(row.to_parent))
-          )
-        patient.save!
-      end
-    end
-  end
-
   private
 
   def required_headers
@@ -67,6 +49,10 @@ def required_headers
     ]
   end
 
+  def count_columns
+    %i[new_record_count exact_duplicate_record_count]
+  end
+
   def parse_row(row_data)
     CohortImportRow.new(
       row_data
@@ -75,4 +61,14 @@ def parse_row(row_data)
         .transform_keys { _1.downcase.to_sym }
     )
   end
+
+  def process_row(row)
+    location = Location.find_by(urn: row.school_urn)
+
+    location.patients.create!(
+      row.to_patient.merge(parent: Parent.new(row.to_parent))
+    )
+
+    :new_record_count
+  end
 end

app/models/concerns/csv_importable.rb

@@ -29,6 +29,8 @@ module CSVImportable
     validate :csv_has_records
     validate :headers_are_valid
     validate :rows_are_valid
+
+    before_save :ensure_processed_with_count_statistics
   end
 
   def csv=(file)
@@ -60,6 +62,30 @@ def parse_rows!
     self.rows = data.map { |row_data| parse_row(row_data) }
   end
 
+  def processed?
+    processed_at != nil
+  end
+
+  def process!
+    return if processed?
+
+    parse_rows! if rows.nil?
+    return if invalid?
+
+    counts = count_columns.index_with(0)
+
+    ActiveRecord::Base.transaction do
+      save!
+
+      rows.each do |row|
+        count_column_to_increment = process_row(row)
+        counts[count_column_to_increment] += 1
+      end
+
+      update!(processed_at: Time.zone.now, **counts)
+    end
+  end
+
   def remove!
     return if csv_removed?
     update!(csv_data: nil, csv_removed_at: Time.zone.now)
@@ -93,4 +119,12 @@ def rows_are_valid
       end
     end
   end
+
+  def ensure_processed_with_count_statistics
+    if processed? && count_columns.any? { |column| send(column).nil? }
+      raise "Count statistics must be set for a processed import."
+    elsif !processed? && count_columns.any? { |column| !send(column).nil? }
+      raise "Count statistics must not be set for a non-processed import."
+    end
+  end
 end

app/models/immunisation_import.rb

@@ -42,46 +42,6 @@ class ImmunisationImport < ApplicationRecord
     has_many :patients
   end
 
-  before_save :ensure_processed_with_count_statistics
-
-  COUNT_COLUMNS = %i[
-    exact_duplicate_record_count
-    new_record_count
-    not_administered_record_count
-  ].freeze
-
-  def processed?
-    processed_at != nil
-  end
-
-  def process!
-    return if processed?
-
-    parse_rows! if rows.nil?
-    return if invalid?
-
-    stats = COUNT_COLUMNS.index_with { |_column| 0 }
-
-    ActiveRecord::Base.transaction do
-      save!
-
-      rows.each do |row|
-        if (vaccination_record = row.to_vaccination_record)
-          if vaccination_record.new_record?
-            vaccination_record.save!
-            stats[:new_record_count] += 1
-          else
-            stats[:exact_duplicate_record_count] += 1
-          end
-        else
-          stats[:not_administered_record_count] += 1
-        end
-      end
-
-      update!(processed_at: Time.zone.now, **stats)
-    end
-  end
-
   def record!
     return if recorded?
 
@@ -127,6 +87,14 @@ def required_headers
     ]
   end
 
+  def count_columns
+    %i[
+      exact_duplicate_record_count
+      new_record_count
+      not_administered_record_count
+    ]
+  end
+
   def parse_row(row_data)
     ImmunisationImportRow.new(
       data: row_data,
@@ -136,11 +104,16 @@ def parse_row(row_data)
     )
   end
 
-  def ensure_processed_with_count_statistics
-    if processed? && COUNT_COLUMNS.any? { |column| send(column).nil? }
-      raise "Count statistics must be set for a processed import."
-    elsif !processed? && COUNT_COLUMNS.any? { |column| !send(column).nil? }
-      raise "Count statistics must not be set for a non-processed import."
+  def process_row(row)
+    if (vaccination_record = row.to_vaccination_record)
+      if vaccination_record.new_record?
+        vaccination_record.save!
+        :new_record_count
+      else
+        :exact_duplicate_record_count
+      end
+    else
+      :not_administered_record_count
     end
   end
 end

spec/models/immunisation_import_spec.rb

@@ -49,22 +49,6 @@
 
   it_behaves_like "a CSVImportable model"
 
-  it "raises if processed without updating the statistics" do
-    expect {
-      immunisation_import.update!(processed_at: Time.zone.now)
-    }.to raise_error(/Count statistics must be set/)
-  end
-
-  describe "#csv=" do
-    it "sets the data" do
-      expect(immunisation_import.csv_data).not_to be_empty
-    end
-
-    it "sets the filename" do
-      expect(immunisation_import.csv_filename).to eq("valid_flu.csv")
-    end
-  end
-
   describe "#load_data!" do
     before { immunisation_import.load_data! }
 

spec/support/a_csv_importable_model.rb

@@ -14,6 +14,22 @@
 
       it { should be_invalid }
     end
+
+    it "raises if processed without updating the statistics" do
+      expect { subject.update!(processed_at: Time.zone.now) }.to raise_error(
+        /Count statistics must be set/
+      )
+    end
+  end
+
+  describe "#csv=" do
+    it "sets the data" do
+      expect(subject.csv_data).not_to be_empty
+    end
+
+    it "sets the filename" do
+      expect(subject.csv_filename).not_to be_empty
+    end
   end
 
   describe "#csv_removed?" do
@@ -30,6 +46,17 @@
     end
   end
 
+  describe "#process!" do
+    let(:today) { Time.zone.local(2025, 1, 1) }
+
+    it "sets processed_at" do
+      expect { travel_to(today) { subject.process! } }.to change(
+        subject,
+        :processed_at
+      ).from(nil).to(today)
+    end
+  end
+
   describe "#remove!" do
     let(:today) { Time.zone.local(2020, 1, 1) }