Merge pull request #3658 from nhsuk/refactor-patient-session-controllers

Refactor patient session controllers

Author: thomasleese

app/components/app_patient_page_component.html.erb

@@ -117,7 +117,7 @@
                           destroy_programme_vaccination_record_path(
                             programme,
                             vaccination_record,
-                            return_to: session_patient_programme_path(patient_id: patient.id),
+                            return_to: session_patient_programme_path(session, patient, programme),
                           ) %>
       <% end %>
     </div>

app/controllers/concerns/patient_session_programme_concern.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+class PatientSessions::ActivitiesController < PatientSessions::BaseController
+  before_action :record_access_log_entry, only: :show
+
+  def show
+  end
+
+  private
+
+  def access_log_entry_action = "log"
+end

app/controllers/patient_sessions/activities_controller.rb

@@ -0,0 +1,69 @@
+# frozen_string_literal: true
+
+class PatientSessions::BaseController < ApplicationController
+  before_action :set_session
+  before_action :set_patient
+  before_action :set_patient_session
+  before_action :set_programme
+  before_action :set_breadcrumb_item
+
+  layout "three_quarters"
+
+  private
+
+  def set_session
+    @session =
+      policy_scope(Session).includes(:location, :programmes).find_by!(
+        slug: params.fetch(:session_slug, params[:slug])
+      )
+  end
+
+  def set_patient
+    @patient =
+      policy_scope(Patient).includes(parent_relationships: :parent).find(
+        params.fetch(:patient_id, params[:id])
+      )
+  end
+
+  def set_patient_session
+    @patient_session =
+      PatientSession.find_by!(patient_id: @patient.id, session_id: @session.id)
+
+    # Assigned to already loaded objects
+    @patient_session.patient = @patient
+    @patient_session.session = @session
+  end
+
+  def set_programme
+    return unless params.key?(:programme_type) || params.key?(:type)
+
+    @programme =
+      @patient_session.programmes.find do |programme|
+        programme.type == params[:programme_type] ||
+          programme.type == params[:type]
+      end
+
+    raise ActiveRecord::RecordNotFound if @programme.nil?
+  end
+
+  def set_breadcrumb_item
+    return_to = params[:return_to]
+    return nil if return_to.blank?
+
+    known_return_to = %w[consent triage register record outcome]
+    return unless return_to.in?(known_return_to)
+
+    @breadcrumb_item = {
+      text: t(return_to, scope: %i[sessions tabs]),
+      href: send(:"session_#{return_to}_path")
+    }
+  end
+
+  def record_access_log_entry
+    @patient.access_log_entries.create!(
+      user: current_user,
+      controller: "patient_sessions",
+      action: access_log_entry_action
+    )
+  end
+end

app/controllers/patient_sessions/base_controller.rb

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
-class ConsentsController < ApplicationController
-  include PatientSessionProgrammeConcern
-
+class PatientSessions::ConsentsController < PatientSessions::BaseController
   before_action :set_consent, except: %i[create send_request]
   before_action :ensure_can_withdraw, only: %i[edit_withdraw update_withdraw]
   before_action :ensure_can_invalidate,
@@ -19,7 +17,7 @@ def create
     if @draft_consent.save
       redirect_to draft_consent_path(Wicked::FIRST_STEP)
     else
-      render "patient_sessions/show", status: :unprocessable_entity
+      render "patient_sessions/programmes/show", status: :unprocessable_entity
     end
   end
 

app/controllers/consents_controller.rb renamed to app/controllers/patient_sessions/consents_controller.rb

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
-class GillickAssessmentsController < ApplicationController
-  include PatientSessionProgrammeConcern
-
+class PatientSessions::GillickAssessmentsController < PatientSessions::BaseController
   before_action :set_gillick_assessment
 
   def edit

app/controllers/gillick_assessments_controller.rb renamed to app/controllers/patient_sessions/gillick_assessments_controller.rb

@@ -1,20 +1,11 @@
 # frozen_string_literal: true
 
-class PatientSessionsController < ApplicationController
-  include PatientSessionProgrammeConcern
-
-  before_action :set_breadcrumb_item
-
-  before_action :record_access_log_entry, except: :record_already_vaccinated
-
-  layout "three_quarters"
+class PatientSessions::ProgrammesController < PatientSessions::BaseController
+  before_action :record_access_log_entry, only: :show
 
   def show
   end
 
-  def log
-  end
-
   def record_already_vaccinated
     unless @patient_session.can_record_as_already_vaccinated?(
              programme: @programme
@@ -42,24 +33,5 @@ def record_already_vaccinated
 
   private
 
-  def set_breadcrumb_item
-    return_to = params[:return_to]
-    return nil if return_to.blank?
-
-    known_return_to = %w[consent triage register record outcome]
-    return unless return_to.in?(known_return_to)
-
-    @breadcrumb_item = {
-      text: t(return_to, scope: %i[sessions tabs]),
-      href: send(:"session_#{return_to}_path")
-    }
-  end
-
-  def record_access_log_entry
-    @patient.access_log_entries.create!(
-      user: current_user,
-      controller: "patient_sessions",
-      action: action_name
-    )
-  end
+  def access_log_entry_action = :show
 end

app/controllers/patient_sessions_controller.rb renamed to app/controllers/patient_sessions/programmes_controller.rb

@@ -1,14 +1,9 @@
 # frozen_string_literal: true
 
-class SessionAttendancesController < ApplicationController
-  before_action :set_session
-  before_action :set_patient
-  before_action :set_patient_session
+class PatientSessions::SessionAttendancesController < PatientSessions::BaseController
   before_action :set_session_date
   before_action :set_session_attendance
 
-  layout "three_quarters"
-
   def edit
   end
 
@@ -35,8 +30,9 @@ def update
       end
 
       redirect_to session_patient_programme_path(
-                    patient_id: @patient.id,
-                    programme_type: @patient_session.programmes.first.type
+                    @session,
+                    @patient,
+                    @patient_session.programmes.first
                   )
     else
       render :edit, status: :unprocessable_entity
@@ -45,19 +41,6 @@ def update
 
   private
 
-  def set_session
-    @session = policy_scope(Session).find_by!(slug: params[:session_slug])
-  end
-
-  def set_patient
-    @patient = policy_scope(Patient).find(params[:patient_id])
-  end
-
-  def set_patient_session
-    @patient_session =
-      PatientSession.find_by!(patient: @patient, session: @session)
-  end
-
   def set_session_date
     @session_date = @session.session_dates.find_by!(value: Date.current)
   end

app/controllers/session_attendances_controller.rb renamed to app/controllers/patient_sessions/session_attendances_controller.rb

@@ -1,13 +1,8 @@
 # frozen_string_literal: true
 
-class TriagesController < ApplicationController
-  include PatientSessionProgrammeConcern
+class PatientSessions::TriagesController < PatientSessions::BaseController
   include TriageMailerConcern
 
-  before_action :set_session
-  before_action :set_patient
-  before_action :set_patient_session
-  before_action :set_programme
   before_action :set_triage
 
   after_action :verify_authorized
@@ -32,12 +27,12 @@ def create
         heading: "Triage outcome updated for",
         heading_link_text: @patient.full_name,
         heading_link_href:
-          session_patient_programme_path(patient_id: @patient.id)
+          session_patient_programme_path(@session, @patient, @programme)
       }
 
       redirect_to redirect_path
     else
-      render "patient_sessions/show", status: :unprocessable_entity
+      render "patient_sessions/programmes/show", status: :unprocessable_entity
     end
   end
 

app/controllers/triages_controller.rb renamed to app/controllers/patient_sessions/triages_controller.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
-class VaccinationsController < ApplicationController
-  include PatientSessionProgrammeConcern
+class PatientSessions::VaccinationsController < PatientSessions::BaseController
   include TodaysBatchConcern
   include VaccinationMailerConcern
 
@@ -42,7 +41,7 @@ def create
                     I18n.t(steps.first, scope: :wicked)
                   )
     else
-      render "patient_sessions/show", status: :unprocessable_entity
+      render "patient_sessions/programmes/show", status: :unprocessable_entity
     end
   end