Merge pull request #4182 from nhsuk/deceased-no-sessions

Don't add deceased patients to sessions

Author: thomasleese

app/models/patient_import_row.rb

@@ -39,6 +39,8 @@ def to_patient
   end
 
   def to_school_move(patient)
+    return if patient.deceased?
+
     if patient.new_record? || patient.school != school ||
          patient.home_educated != home_educated || patient.not_in_team?
       school_move =

spec/models/class_import_row_spec.rb

@@ -131,6 +131,24 @@
     end
   end
 
+  describe "#to_school_move" do
+    subject { class_import_row.to_school_move(patient) }
+
+    let(:data) { valid_data }
+
+    let(:patient) { class_import_row.to_patient }
+
+    context "without a date of death" do
+      it { should_not be_nil }
+    end
+
+    context "with a date of death" do
+      before { patient.update!(date_of_death: today) }
+
+      it { should be_nil }
+    end
+  end
+
   describe "#to_parents" do
     subject(:parents) { class_import_row.to_parents }
 

spec/models/cohort_import_row_spec.rb

@@ -561,6 +561,12 @@
 
     it { should_not be_nil }
 
+    context "with a date of death" do
+      before { patient.update!(date_of_death: today) }
+
+      it { should be_nil }
+    end
+
     describe "#school" do
       subject(:school) { school_move.school }