Update actual_upcoming_session logic

This defaults to the organisation's generic clinic session if no
upcoming session is found.

Author: tvararu

app/controllers/concerns/consent_form_mailer_concern.rb

@@ -16,7 +16,8 @@ def send_consent_form_confirmation(consent_form)
       )
     elsif consent_form.needs_triage?
       mailer.confirmation_triage.deliver_later
-    elsif consent_form.actual_upcoming_session.nil? ||
+    elsif consent_form.actual_upcoming_session ==
+          consent_form.organisation.generic_clinic_session ||
           consent_form.actual_upcoming_session.completed? ||
           consent_form.actual_upcoming_session.closed?
       mailer.confirmation_clinic.deliver_later

app/models/consent_form.rb

@@ -348,16 +348,22 @@ def actual_upcoming_session
           Session.upcoming.has_programme(programme).where(organisation:)
 
         if location.clinic?
-          # If they've been booked in to a clinic we don't move them to a school
-          # session as it's likely they're in a clinic for a reason.
+          # If they've been booked in to a clinic we don't move them to a
+          # school session as it's likely they're in a clinic for a reason.
           session_scope.find_by(location:)
         elsif school
           session_scope.find_by(location: school)
         elsif education_setting_home?
           session_scope.find_by(location: organisation.generic_clinic)
         else
           session_scope.find_by(location:)
-        end
+        end => upcoming_session
+
+        # There are no upcoming sessions available for their chosen location,
+        # either the original session or a different school or a clinic if
+        # home educated. This can happen if the parent fills out the form
+        # late.
+        upcoming_session || organisation.generic_clinic_session
       end
   end
 
@@ -424,24 +430,14 @@ def match_with_patient!(patient)
       if patient.changed?
         patient.save!
 
-        unless patient.deceased? || patient.invalidated?
-          move_patient_to_session =
-            if actual_upcoming_session.nil?
-              # There are no upcoming sessions available for their chosen location,
-              # either the original session or a different school or a clinic if
-              # home educated. This can happen if the parent fills out the form
-              # late.
-              organisation.generic_clinic_session
-            elsif original_session != actual_upcoming_session
-              actual_upcoming_session
-            end
+        patient_can_move =
+          !patient.deceased? && !patient.invalidated? && actual_upcoming_session
 
-          if move_patient_to_session
-            patient.move_to_session!(
-              move_patient_to_session,
-              from: original_session
-            )
-          end
+        if patient_can_move
+          patient.move_to_session!(
+            actual_upcoming_session,
+            from: original_session
+          )
         end
       end