Jc/refactor claims to wizard pattern

app/controllers/claims/schools/claims/add_claim_controller.rb

@@ -0,0 +1,46 @@
+class Claims::Schools::Claims::AddClaimController < Claims::ApplicationController
+  include WizardController
+  include Claims::BelongsToSchool
+
+  before_action :has_school_accepted_grant_conditions?
+  before_action :set_wizard
+  before_action :authorize_claim
+
+  helper_method :index_path
+
+  def update
+    if [email protected]_step
+      render "edit"
+    elsif @wizard.next_step.present?
+      redirect_to step_path(@wizard.next_step)
+    elsif @wizard.valid?
+      @wizard.create_claim
+      @wizard.reset_state
+      redirect_to confirmation_claims_school_claim_path(@school, @wizard.claim)
+    else
+      redirect_to rejected_claims_school_claims_path(@school)
+    end
+  end
+
+  private
+
+  def set_wizard
+    state = session[state_key] ||= {}
+    current_step = params[:step]&.to_sym
+    @wizard = Claims::AddClaimWizard.new(
+      school: @school, created_by: current_user, params:, state:, current_step:,
+    )
+  end
+
+  def authorize_claim
+    authorize Claims::Claim, :create?
+  end
+
+  def step_path(step)
+    add_claim_claims_school_claims_path(state_key:, step:)
+  end
+
+  def index_path
+    claims_school_claims_path(@school)
+  end
+end

app/controllers/claims/schools/claims_controller.rb

@@ -2,7 +2,7 @@ class Claims::Schools::ClaimsController < Claims::ApplicationController
   include Claims::BelongsToSchool
 
   before_action :has_school_accepted_grant_conditions?
-  before_action :set_claim, only: %i[show check confirmation submit edit update rejected create_revision remove destroy]
+  before_action :set_claim, only: %i[show check confirmation submit edit update create_revision remove destroy]
   before_action :authorize_claim
   before_action :get_valid_revision, only: :check
 
@@ -12,16 +12,6 @@ def index
     @pagy, @claims = pagy(@school.claims.active.order_created_at_desc)
   end
 
-  def new; end
-
-  def create
-    if claim_provider_form.save
-      redirect_to new_claims_school_claim_mentors_path(@school, claim_provider_form.claim)
-    else
-      render :new
-    end
-  end
-
   def create_revision
     revision = Claims::Claim::CreateRevision.call(claim: @claim)
     redirect_to edit_claims_school_claim_path(@school, revision)
@@ -103,7 +93,7 @@ def claim_id
   end
 
   def authorize_claim
-    authorize @claim || Claims::Claim
+    authorize @claim || Claims::Claim.new
   end
 
   def get_valid_revision

app/controllers/claims/support/schools/claims/add_claim_controller.rb

@@ -0,0 +1,48 @@
+class Claims::Support::Schools::Claims::AddClaimController < Claims::Support::ApplicationController
+  include WizardController
+  include Claims::BelongsToSchool
+
+  before_action :has_school_accepted_grant_conditions?
+  before_action :set_wizard
+  before_action :authorize_claim
+
+  helper_method :index_path
+
+  def update
+    if [email protected]_step
+      render "edit"
+    elsif @wizard.next_step.present?
+      redirect_to step_path(@wizard.next_step)
+    elsif @wizard.valid?
+      @wizard.create_claim
+      @wizard.reset_state
+      redirect_to claims_support_school_claims_path(@school), flash: {
+        heading: t(".success"),
+      }
+    else
+      redirect_to rejected_claims_support_school_claims_path(@school)
+    end
+  end
+
+  private
+
+  def set_wizard
+    state = session[state_key] ||= {}
+    current_step = params[:step]&.to_sym
+    @wizard = Claims::AddClaimWizard.new(
+      school: @school, created_by: current_user, params:, state:, current_step:,
+    )
+  end
+
+  def authorize_claim
+    authorize Claims::Claim, :create?
+  end
+
+  def step_path(step)
+    add_claim_claims_support_school_claims_path(state_key:, step:)
+  end
+
+  def index_path
+    claims_support_school_claims_path(@school)
+  end
+end

app/controllers/claims/support/schools/claims_controller.rb

@@ -1,7 +1,7 @@
 class Claims::Support::Schools::ClaimsController < Claims::Support::ApplicationController
   include Claims::BelongsToSchool
 
-  before_action :set_claim, only: %i[check draft show edit update remove destroy rejected create_revision]
+  before_action :set_claim, only: %i[check draft show edit update remove destroy create_revision]
   before_action :authorize_claim
   before_action :get_valid_revision, only: :check
 
@@ -11,8 +11,6 @@ def index
     @pagy, @claims = pagy(@school.claims.active.order_created_at_desc)
   end
 
-  def new; end
-
   def show; end
 
   def remove; end
@@ -25,14 +23,6 @@ def destroy
     }
   end
 
-  def create
-    if claim_provider_form.save
-      redirect_to new_claims_support_school_claim_mentors_path(@school, claim_provider_form.claim)
-    else
-      render :new
-    end
-  end
-
   def create_revision
     revision = Claims::Claim::CreateRevision.call(claim: @claim)
     redirect_to edit_claims_support_school_claim_path(@school, revision)
@@ -112,7 +102,7 @@ def claim_provider_form
   end
 
   def authorize_claim
-    authorize @claim || Claims::Claim
+    authorize @claim || Claims::Claim.new
   end
 
   def get_valid_revision

app/models/claims/claim.rb

@@ -49,6 +49,8 @@ class Claims::Claim < ApplicationRecord
   has_many :mentor_trainings, dependent: :destroy
   has_many :mentors, through: :mentor_trainings
 
+  accepts_nested_attributes_for :mentor_trainings
+
   validates :status, presence: true
   validates(
     :reference,

app/policies/claims/claim_policy.rb

@@ -33,7 +33,7 @@ def confirmation?
 
   # TODO: Remove record.draft? and not create drafts for existing drafts
   def draft?
-    current_claim_window? && user.support_user? && (record.internal_draft? || record.draft?)
+    current_claim_window? && user.support_user? && (record.internal_draft? || record.draft? || record.new_record?)
   end
 
   def check?

app/services/claims/claim/calculate_amount.rb

@@ -9,7 +9,7 @@ def call
     region = claim.school.region
     claims_funding_available_per_hour_pence = region.claims_funding_available_per_hour_pence
 
-    total_hours_completed = claim.mentor_trainings.sum(:hours_completed)
+    total_hours_completed = claim.mentor_trainings.filter_map(&:hours_completed).sum
 
     amount_in_pence = claims_funding_available_per_hour_pence * total_hours_completed
 

app/services/claims/claim/create_draft.rb

@@ -1,4 +1,6 @@
 class Claims::Claim::CreateDraft < ApplicationService
+  include Claims::Claim::Referencable
+
   def initialize(claim:)
     @claim = claim
   end
@@ -33,9 +35,4 @@ def updated_claim
       claim
     end
   end
-
-  def generate_reference
-    reference = SecureRandom.random_number(99_999_999) while Claims::Claim.exists?(reference:)
-    reference
-  end
 end

app/services/claims/claim/submit.rb

@@ -1,4 +1,6 @@
 class Claims::Claim::Submit < ApplicationService
+  include Claims::Claim::Referencable
+
   def initialize(claim:, user:)
     @claim = claim
     @user = user
@@ -39,9 +41,4 @@ def updated_claim
       claim
     end
   end
-
-  def generate_reference
-    reference = SecureRandom.random_number(99_999_999) while Claims::Claim.exists?(reference:)
-    reference
-  end
 end

app/services/concerns/claims/claim/referencable.rb

@@ -0,0 +1,13 @@
+module Claims::Claim::Referencable
+  extend ActiveSupport::Concern
+
+  included do
+    def generate_reference
+      loop do
+        reference = SecureRandom.random_number(99_999_999)
+
+        break reference unless Claims::Claim.exists?(reference:)
+      end
+    end
+  end
+end

app/views/claims/schools/claims/add_claim/edit.html.erb

@@ -0,0 +1,13 @@
+<% render "claims/schools/primary_navigation", school: @school, current: :claims %>
+
+<%= content_for(:before_content) do %>
+  <%= govuk_back_link(href: back_link_path) %>
+<% end %>
+
+<div class="govuk-width-container">
+  <%= render_wizard(@wizard, contextual_text: t(".caption")) %>
+
+  <p class="govuk-body">
+    <%= govuk_link_to(t(".cancel"), index_path, no_visited_state: true) %>
+  </p>
+</div>

app/views/claims/schools/claims/index.html.erb

@@ -11,7 +11,7 @@
         <p class="govuk-body"><%= sanitize t(".closing_date_disclaimer", time: l(Claims::ClaimWindow.current.ends_on.end_of_day, format: :time_on_date)) %></p>
       <% end %>
 
-      <%= govuk_link_to t(".add_claim"), new_claims_school_claim_path, class: "govuk-button" %>
+      <%= govuk_button_link_to(t(".add_claim"), new_add_claim_claims_school_claims_path) %>
     <% else %>
       <%= govuk_inset_text text: t(".add_mentor_guidance_html", link_to: govuk_link_to(t(".add_a_mentor"), claims_school_mentors_path(@school))) %>
     <% end %>

app/views/claims/support/schools/claims/add_claim/edit.html.erb

@@ -0,0 +1,13 @@
+<% render "claims/support/primary_navigation", current: :organisations %>
+
+<%= content_for(:before_content) do %>
+  <%= govuk_back_link(href: back_link_path) %>
+<% end %>
+
+<div class="govuk-width-container">
+  <%= render_wizard(@wizard, contextual_text: t(".caption", school_name: @school.name)) %>
+
+  <p class="govuk-body">
+    <%= govuk_link_to(t(".cancel"), index_path, no_visited_state: true) %>
+  </p>
+</div>

app/views/claims/support/schools/claims/index.html.erb

@@ -10,7 +10,7 @@
     <% if @school.mentors.any? %>
       <%= govuk_inset_text text: t(".guidance", start_year: Claims::ClaimWindow.current.academic_year.starts_on.year, end_year: Claims::ClaimWindow.current.academic_year.ends_on.year) %>
 
-      <%= govuk_button_link_to t(".add_claim"), new_claims_support_school_claim_path %>
+      <%= govuk_button_link_to t(".add_claim"), new_add_claim_claims_support_school_claims_path %>
     <% else %>
       <%= govuk_inset_text text: t(".add_mentor_guidance_html", link_to: govuk_link_to(t(".add_a_mentor"), claims_support_school_mentors_path(@school))) %>
     <% end %>

app/views/claims/support/schools/claims/mentors/_form.html.erb

@@ -33,7 +33,7 @@
         </p>
 
         <p class="govuk-body">
-          <%= govuk_link_to t(".change_provider"), new_claims_school_claim_path(school, id: claim_mentors_form.claim.id) %>
+          <%= govuk_link_to t(".change_provider"), new_claims_support_school_claim_path(school, id: claim_mentors_form.claim.id, claim_id: claim_mentors_form.claim.id) %>
         </p>
       <% end %>
     </div>