Merge pull request #6461 from NHSDigital/seed-without-school-moves

Update school move factories

Author: thomasleese

spec/factories/school_moves.rb

@@ -29,40 +29,31 @@
 #
 FactoryBot.define do
   factory :school_move do
+    transient { team { nil } }
+
     patient
 
     academic_year { AcademicYear.pending }
     source { SchoolMove.sources.keys.sample }
 
     trait :to_school do
-      home_educated { nil }
-      team { nil }
       school
     end
 
     trait :to_home_educated do
-      home_educated { true }
-      team
-      school { nil }
+      team { create(:team) }
+      school { team.home_educated_school }
     end
 
     trait :to_unknown_school do
-      home_educated { false }
-      team
-      school { nil }
+      team { create(:team) }
+      school { team.unknown_school }
     end
 
     after(:create) do |school_move|
-      team_scope =
-        if (id = school_move.team_id)
-          Team.where(id:)
-        else
-          school_move.school.teams
-        end
-
       PatientTeamUpdater.call(
         patient_scope: Patient.where(id: school_move.patient_id),
-        team_scope:
+        team_scope: school_move.school.teams
       )
     end
   end

spec/lib/patient_team_updater_spec.rb

@@ -28,7 +28,7 @@
       end
     end
 
-    context "with a school move by school" do
+    context "with a school move" do
       before do
         create(
           :school_move,
@@ -48,19 +48,6 @@
       end
     end
 
-    context "with a school move by team" do
-      before do
-        create(:school_move, :to_home_educated, patient:, team:)
-        PatientTeam.delete_all
-      end
-
-      it "adds the patient to the team" do
-        expect(patient.teams).to be_empty
-        expect { call }.to change(PatientTeam, :count).by(1)
-        expect(PatientTeam.last.sources).to contain_exactly("school_move_team")
-      end
-    end
-
     context "with a vaccination record by import" do
       before do
         create(

spec/models/patient_spec.rb

@@ -1310,7 +1310,7 @@
       end
     end
 
-    context "when the old patient has a school move to a school" do
+    context "when the old patient has school moves" do
       let(:team) { create(:team) }
       let(:school) { create(:school, team:) }
 
@@ -1329,48 +1329,6 @@
         )
       end
     end
-
-    context "when the old patient has a school move to an unknown school" do
-      let(:team) { create(:team) }
-
-      before do
-        create(:school_move, :to_unknown_school, patient: old_patient, team:)
-      end
-
-      it "adds any school moves from the old patient" do
-        expect(new_patient.school_moves.size).to eq(1)
-        expect(new_patient.school_moves.first.home_educated).to be(false)
-      end
-
-      it "adds the new patient to the teams" do
-        expect(new_patient.patient_teams.size).to eq(1)
-        expect(new_patient.patient_teams.first.team_id).to eq(team.id)
-        expect(new_patient.patient_teams.first.sources).to contain_exactly(
-          "school_move_team"
-        )
-      end
-    end
-
-    context "when the old patient has a school move to home-schooled" do
-      let(:team) { create(:team) }
-
-      before do
-        create(:school_move, :to_home_educated, patient: old_patient, team:)
-      end
-
-      it "adds any school moves from the old patient" do
-        expect(new_patient.school_moves.size).to eq(1)
-        expect(new_patient.school_moves.first.home_educated).to be(true)
-      end
-
-      it "adds the new patient to the teams" do
-        expect(new_patient.patient_teams.size).to eq(1)
-        expect(new_patient.patient_teams.first.team_id).to eq(team.id)
-        expect(new_patient.patient_teams.first.sources).to contain_exactly(
-          "school_move_team"
-        )
-      end
-    end
   end
 
   describe "#destroy_childless_parents" do

spec/models/school_move_spec.rb

@@ -99,9 +99,7 @@
 
     shared_examples "sets the patient to home-schooled" do
       it "sets the patient to home-schooled" do
-        expect { confirm! }.to change(patient, :school).to(
-          school_move.team.home_educated_school
-        )
+        expect { confirm! }.to change(patient, :school).to(school_move.school)
       end
     end