Merge pull request #6435 from NHSDigital/reset-school-move-attributes

Ensure all school move attributes are reset

Author: thomasleese

app/models/patient_changeset.rb

@@ -290,9 +290,12 @@ def school_move
           school_move =
             patient.school_moves.includes(:school_teams).first ||
               SchoolMove.new(patient:)
+
+          # TODO: Simplify this once we no longer have changesets with
+          #  `school_id` set to `nil`.
           school_move.assign_attributes(
-            # TODO: Simplify this once we no longer have changesets with
-            #  `school_id` set to `nil`.
+            academic_year:,
+            home_educated: nil,
             school:
               school ||
                 (
@@ -302,9 +305,10 @@ def school_move
                     team.unknown_school
                   end
                 ),
-            academic_year:,
+            team_id: nil,
             source: school_move_source
           )
+
           # TODO: Figure out why this is necessary.
           school_move.strict_loading!(false)
           school_move