wip

Author: thomasleese

app/controllers/draft_sessions_controller.rb

@@ -21,13 +21,13 @@ class DraftSessionsController < ApplicationController
   skip_after_action :verify_policy_scoped
 
   def show
-    authorize @session, :edit?
+    authorize @session, @session.new_record? ? :new? : :edit?
 
     render_wizard
   end
 
   def update
-    authorize @session, :update?
+    authorize @session, @session.new_record? ? :create? : :update?
 
     jump_to("confirm") if @draft_session.editing? && current_step != :confirm
 
@@ -52,7 +52,7 @@ def set_draft_session
   end
 
   def set_session
-    @session = @draft_session.session
+    @session = @draft_session.session || Session.new
   end
 
   def set_steps

app/controllers/sessions_controller.rb

@@ -4,7 +4,9 @@ class SessionsController < ApplicationController
   include SessionSearchFormConcern
 
   before_action :set_session_search_form, only: :index
-  before_action :set_session, except: :index
+  before_action :set_session, except: %i[index new]
+
+  skip_after_action :verify_policy_scoped, only: :new
 
   def index
     @programmes = current_user.selected_team.programmes
@@ -20,6 +22,17 @@ def index
     render layout: "full"
   end
 
+  def new
+    @draft_session = DraftSession.new(request_session: session, current_user:)
+
+    @draft_session.clear_attributes
+    @draft_session.assign_attributes(create_params)
+
+    @draft_session.save!
+
+    redirect_to draft_session_path(Wicked::FIRST_STEP)
+  end
+
   def show
     respond_to do |format|
       format.html { render layout: "full" }
@@ -93,4 +106,12 @@ def patient_counts_for_sessions(sessions)
       .group("sessions.id")
       .count("DISTINCT patients.id")
   end
+
+  def create_params
+    {
+      academic_year: AcademicYear.pending,
+      session_dates: [DraftSessionDate.new],
+      team_id: current_team.id
+    }
+  end
 end

app/models/draft_session.rb

@@ -40,12 +40,12 @@ def wizard_steps
 
     steps << :location_type unless editing?
 
-    steps << :dates
-    steps << :dates_check if school?
-
     steps << :programmes
     steps << :programmes_check if school?
 
+    steps << :dates
+    steps << :dates_check if school?
+
     if include_notification_steps?
       steps += %i[consent_requests consent_reminders] if school?
       steps << :invitations if generic_clinic?
@@ -250,8 +250,8 @@ def writable_attribute_names
   end
 
   def include_notification_steps?
-    dates.present? && session.consent_notifications.empty? &&
-      session.session_notifications.empty?
+    dates.present? && session&.consent_notifications&.empty? &&
+      session&.session_notifications&.empty?
   end
 
   def new_programme_types

app/models/draft_session_date.rb

@@ -30,6 +30,7 @@ def self.load(arr)
     end
 
     def self.dump(values)
+      return if values.nil?
       values.map { |value| value.is_a?(Hash) ? value : value.attributes }
     end
   end

app/views/draft_sessions/dates.html.erb

@@ -12,7 +12,7 @@
       <% @draft_session.session_dates.each_with_index do |session_date, index| %>
         <%= f.fields_for "session_date_#{index}", session_date do |ff| %>
           <li class="app-add-another__list-item">
-            <% if @draft_session.session.has_been_attended?(date: session_date.value) %>
+            <% if @draft_session.session&.has_been_attended?(date: session_date.value) %>
               <h2 class="nhsuk-heading-m">
                 <%= session_date.value.to_fs(:long) %>
               </h2>

app/views/sessions/index.html.erb

@@ -2,6 +2,10 @@
 
 <%= h1 t(".title"), size: "xl" %>
 
+<% if Flipper.enabled?(:schools_and_sessions) %>
+  <%= govuk_button_link_to "Add a new session", new_session_path, secondary: true %>
+<% end %>
+
 <div class="nhsuk-grid-row">
   <div class="app-grid-column-filters">
     <%= render AppSessionSearchFormComponent.new(

config/routes.rb

@@ -249,7 +249,7 @@
     get "sessions"
   end
 
-  resources :sessions, only: %i[index show edit], param: :slug do
+  resources :sessions, only: %i[index new show edit], param: :slug do
     resource :patients, only: :show, controller: "sessions/patients"
     resource :consent, only: :show, controller: "sessions/consent"
     resource :triage, only: :show, controller: "sessions/triage"