From 651217c819e1b660b9dad8db579ae5c6792f085e Mon Sep 17 00:00:00 2001
From: Steve Hook <steve.hook@gmail.com>
Date: Tue, 17 Oct 2023 09:30:10 +0100
Subject: [PATCH] Refactored to move logic from view helper

---
 ...ication_dashboard_course_choices_component.rb |  7 +------
 .../application_status_tag_component.rb          |  4 ++--
 .../application_review_component.rb              |  6 +-----
 .../application_summary_component.rb             |  7 +------
 .../course_choices_review_component.rb           |  7 +------
 .../previous_applications_component.html.erb     |  7 +------
 .../rejection_reasons_component.rb               |  7 +------
 .../application_card_component.html.erb          |  7 +------
 .../application_choice_header_component.html.erb |  7 +------
 .../application_status_tag_component.rb          |  4 ++--
 .../application_card_component.html.erb          |  9 +--------
 .../application_choice_component.rb              |  7 +------
 .../application_status_tag_component.rb          |  7 ++++---
 app/helpers/view_helper.rb                       |  9 ---------
 app/models/application_choice.rb                 |  8 ++++++++
 .../recruit_with_pending_conditions/new.html.erb |  1 -
 .../application_status_tag_component_spec.rb     |  8 ++++----
 .../application_status_tag_component_spec.rb     |  9 ++++++---
 .../application_status_tag_component_spec.rb     |  9 +++++++--
 spec/helpers/view_helper_spec.rb                 | 14 --------------
 spec/models/application_choice_spec.rb           | 16 ++++++++++++++++
 21 files changed, 59 insertions(+), 101 deletions(-)

diff --git a/app/components/candidate_interface/application_dashboard_course_choices_component.rb b/app/components/candidate_interface/application_dashboard_course_choices_component.rb
index 59a50d09173..9363734f04c 100644
--- a/app/components/candidate_interface/application_dashboard_course_choices_component.rb
+++ b/app/components/candidate_interface/application_dashboard_course_choices_component.rb
@@ -149,12 +149,7 @@ def status_row(application_choice)
       if @show_status
         {
           key: 'Status',
-          value: render(
-            ApplicationStatusTagComponent.new(
-              application_choice:,
-              supplementary_statuses: supplementary_statuses_for(application_choice:),
-            ),
-          ),
+          value: render(ApplicationStatusTagComponent.new(application_choice:)),
         }
       end
     end
diff --git a/app/components/candidate_interface/application_status_tag_component.rb b/app/components/candidate_interface/application_status_tag_component.rb
index 476308c861d..e984bc65735 100644
--- a/app/components/candidate_interface/application_status_tag_component.rb
+++ b/app/components/candidate_interface/application_status_tag_component.rb
@@ -2,10 +2,10 @@ module CandidateInterface
   class ApplicationStatusTagComponent < ViewComponent::Base
     delegate :status, to: :application_choice
 
-    def initialize(application_choice:, display_info_text: true, supplementary_statuses: [])
+    def initialize(application_choice:, display_info_text: true)
       @application_choice = application_choice
       @display_info_text = display_info_text
-      @supplementary_statuses = supplementary_statuses
+      @supplementary_statuses = application_choice.respond_to?(:supplementary_statuses) ? application_choice.supplementary_statuses : []
     end
 
     def text
diff --git a/app/components/candidate_interface/continuous_applications/application_review_component.rb b/app/components/candidate_interface/continuous_applications/application_review_component.rb
index 950294c9777..4b94cfa36ff 100644
--- a/app/components/candidate_interface/continuous_applications/application_review_component.rb
+++ b/app/components/candidate_interface/continuous_applications/application_review_component.rb
@@ -28,11 +28,7 @@ def status_row
         {
           key: 'Status',
           value: render(
-            ApplicationStatusTagComponent.new(
-              application_choice:,
-              display_info_text: false,
-              supplementary_statuses: supplementary_statuses_for(application_choice:),
-            ),
+            ApplicationStatusTagComponent.new(application_choice:, display_info_text: false),
           ),
         }
       end
diff --git a/app/components/candidate_interface/continuous_applications/application_summary_component.rb b/app/components/candidate_interface/continuous_applications/application_summary_component.rb
index a13969fc681..01b71a7d36a 100644
--- a/app/components/candidate_interface/continuous_applications/application_summary_component.rb
+++ b/app/components/candidate_interface/continuous_applications/application_summary_component.rb
@@ -70,12 +70,7 @@ def course_details
       def application_choice_status_row
         {
           key: 'Status',
-          value: render(
-            ContinuousApplications::ApplicationStatusTagComponent.new(
-              application_choice:,
-              supplementary_statuses: supplementary_statuses_for(application_choice:),
-            ),
-          ),
+          value: render(ContinuousApplications::ApplicationStatusTagComponent.new(application_choice:)),
         }
       end
     end
diff --git a/app/components/candidate_interface/course_choices_review_component.rb b/app/components/candidate_interface/course_choices_review_component.rb
index 63ab2c69cb3..7de57c5c913 100644
--- a/app/components/candidate_interface/course_choices_review_component.rb
+++ b/app/components/candidate_interface/course_choices_review_component.rb
@@ -270,12 +270,7 @@ def status_row(application_choice)
       if @show_status
         {
           key: 'Status',
-          value: render(
-            ApplicationStatusTagComponent.new(
-              application_choice:,
-              supplementary_statuses: supplementary_statuses_for(application_choice:),
-            ),
-          ),
+          value: render(ApplicationStatusTagComponent.new(application_choice:)),
         }
       end
     end
diff --git a/app/components/candidate_interface/previous_applications_component.html.erb b/app/components/candidate_interface/previous_applications_component.html.erb
index adc4d383661..b64937873a2 100644
--- a/app/components/candidate_interface/previous_applications_component.html.erb
+++ b/app/components/candidate_interface/previous_applications_component.html.erb
@@ -22,12 +22,7 @@
         <% end %>
       </td>
       <td class="govuk-table__cell">
-        <%=
-          render CandidateInterface::ApplicationStatusTagComponent.new(
-            application_choice: application_choice,
-            supplementary_statuses: supplementary_statuses_for(application_choice:),
-          )
-        %>
+        <%= render CandidateInterface::ApplicationStatusTagComponent.new(application_choice:) %>
       </td>
     </tr>
   <% end %>
diff --git a/app/components/candidate_interface/rejection_reasons_component.rb b/app/components/candidate_interface/rejection_reasons_component.rb
index 6285fad73a7..51220bb4b20 100644
--- a/app/components/candidate_interface/rejection_reasons_component.rb
+++ b/app/components/candidate_interface/rejection_reasons_component.rb
@@ -40,12 +40,7 @@ def course_details_row_value(application_choice)
     def status_row(application_choice)
       {
         key: 'Status',
-        value: render(
-          ApplicationStatusTagComponent.new(
-            application_choice:,
-            supplementary_statuses: supplementary_statuses_for(application_choice:),
-          ),
-        ),
+        value: render(ApplicationStatusTagComponent.new(application_choice:)),
       }
     end
 
diff --git a/app/components/provider_interface/application_card_component.html.erb b/app/components/provider_interface/application_card_component.html.erb
index 053ad4d0a6b..2c7e7276fb6 100644
--- a/app/components/provider_interface/application_card_component.html.erb
+++ b/app/components/provider_interface/application_card_component.html.erb
@@ -7,12 +7,7 @@
       </span>
     </h3>
     <span>
-      <%= render(
-        ProviderInterface::ApplicationStatusTagComponent.new(
-          application_choice: application_choice,
-          supplementary_statuses: supplementary_statuses_for(application_choice:),
-        ),
-      ) %>
+      <%= render(ProviderInterface::ApplicationStatusTagComponent.new(application_choice:)) %>
     </span>
   </header>
 
diff --git a/app/components/provider_interface/application_choice_header_component.html.erb b/app/components/provider_interface/application_choice_header_component.html.erb
index 0d0fdc29579..6e91df1135a 100644
--- a/app/components/provider_interface/application_choice_header_component.html.erb
+++ b/app/components/provider_interface/application_choice_header_component.html.erb
@@ -1,12 +1,7 @@
 <h1 class="govuk-heading-xl govuk-!-margin-bottom-6">
   <%= application_choice.application_form.full_name %>
   <span>
-    <%= render(
-      ProviderInterface::ApplicationStatusTagComponent.new(
-        application_choice: application_choice,
-        supplementary_statuses: supplementary_statuses_for(application_choice:),
-      ),
-    ) %>
+    <%= render(ProviderInterface::ApplicationStatusTagComponent.new(application_choice:)) %>
   </span>
 </h1>
 
diff --git a/app/components/provider_interface/application_status_tag_component.rb b/app/components/provider_interface/application_status_tag_component.rb
index 101131f70b0..86583f38434 100644
--- a/app/components/provider_interface/application_status_tag_component.rb
+++ b/app/components/provider_interface/application_status_tag_component.rb
@@ -2,9 +2,9 @@ module ProviderInterface
   class ApplicationStatusTagComponent < ViewComponent::Base
     delegate :status, to: :application_choice
 
-    def initialize(application_choice:, supplementary_statuses: [])
+    def initialize(application_choice:)
       @application_choice = application_choice
-      @supplementary_statuses = supplementary_statuses
+      @supplementary_statuses = application_choice.respond_to?(:supplementary_statuses) ? application_choice.supplementary_statuses : []
     end
 
     def text
diff --git a/app/components/support_interface/application_card_component.html.erb b/app/components/support_interface/application_card_component.html.erb
index bc5e2249834..0ec2f914fa5 100644
--- a/app/components/support_interface/application_card_component.html.erb
+++ b/app/components/support_interface/application_card_component.html.erb
@@ -11,14 +11,7 @@
   <ul class="app-application-card__list govuk-list govuk-list--bullet">
     <% application_choices.each do |application_choice| %>
       <li class="govuk-list__item govuk-body-s">
-        <%=
-          render(
-            SupportInterface::ApplicationStatusTagComponent.new(
-              status: application_choice.status,
-              supplementary_statuses: supplementary_statuses_for(application_choice:),
-            ),
-          )
-        %>
+        <%= render(SupportInterface::ApplicationStatusTagComponent.new(application_choice:)) %>
         <%= application_choice.current_course_option.course.name_and_code %> at <%= application_choice.current_course_option.provider.name %>
       </li>
     <% end %>
diff --git a/app/components/support_interface/application_choice_component.rb b/app/components/support_interface/application_choice_component.rb
index 7f9c39d620f..b5d51c22563 100644
--- a/app/components/support_interface/application_choice_component.rb
+++ b/app/components/support_interface/application_choice_component.rb
@@ -41,12 +41,7 @@ def application_number_row
     def status_row
       {
         key: 'Status',
-        value: render(
-          SupportInterface::ApplicationStatusTagComponent.new(
-            status: application_choice.status,
-            supplementary_statuses: supplementary_statuses_for(application_choice:),
-          ),
-        ),
+        value: render(SupportInterface::ApplicationStatusTagComponent.new(application_choice:)),
       }.merge(status_action_link)
     end
 
diff --git a/app/components/support_interface/application_status_tag_component.rb b/app/components/support_interface/application_status_tag_component.rb
index 2dfbda9f93d..a1f80c767af 100644
--- a/app/components/support_interface/application_status_tag_component.rb
+++ b/app/components/support_interface/application_status_tag_component.rb
@@ -1,8 +1,9 @@
 module SupportInterface
   class ApplicationStatusTagComponent < ViewComponent::Base
-    def initialize(status:, supplementary_statuses: [])
-      @status = status
-      @supplementary_statuses = supplementary_statuses
+    def initialize(application_choice:)
+      @status = application_choice.status
+      @supplementary_statuses =
+        application_choice.respond_to?(:supplementary_statuses) ? application_choice.supplementary_statuses : []
     end
 
     def text
diff --git a/app/helpers/view_helper.rb b/app/helpers/view_helper.rb
index 3b33984691b..25d49bad164 100644
--- a/app/helpers/view_helper.rb
+++ b/app/helpers/view_helper.rb
@@ -144,15 +144,6 @@ def application_form_path
     BackLinks.application_form_path
   end
 
-  def supplementary_statuses_for(application_choice:)
-    [].tap do |supplementary_statuses|
-      if application_choice.recruited? &&
-         RecruitedWithPendingConditions.new(application_choice:).call
-        supplementary_statuses << :ske_pending_conditions
-      end
-    end
-  end
-
 private
 
   def back_link_url
diff --git a/app/models/application_choice.rb b/app/models/application_choice.rb
index 7fa90d54acf..93de4207884 100644
--- a/app/models/application_choice.rb
+++ b/app/models/application_choice.rb
@@ -257,6 +257,14 @@ def science_gcse_needed?
     course.primary_course?
   end
 
+  def supplementary_statuses
+    [].tap do |supplementary_statuses|
+      if recruited? && RecruitedWithPendingConditions.new(application_choice: self).call
+        supplementary_statuses << :ske_pending_conditions
+      end
+    end
+  end
+
 private
 
   def set_initial_status
diff --git a/app/views/provider_interface/offer/recruit_with_pending_conditions/new.html.erb b/app/views/provider_interface/offer/recruit_with_pending_conditions/new.html.erb
index 6d9ce31fa25..c47d4358935 100644
--- a/app/views/provider_interface/offer/recruit_with_pending_conditions/new.html.erb
+++ b/app/views/provider_interface/offer/recruit_with_pending_conditions/new.html.erb
@@ -5,7 +5,6 @@
   <%= render(
     ProviderInterface::ApplicationStatusTagComponent.new(
       application_choice: @application_choice,
-      supplementary_statuses: supplementary_statuses_for(application_choice: @application_choice),
     ),
   ) %>
 </h1>
diff --git a/spec/components/candidate_interface/application_status_tag_component_spec.rb b/spec/components/candidate_interface/application_status_tag_component_spec.rb
index 8a9d2eb2252..311ace361ec 100644
--- a/spec/components/candidate_interface/application_status_tag_component_spec.rb
+++ b/spec/components/candidate_interface/application_status_tag_component_spec.rb
@@ -226,10 +226,10 @@
   end
 
   it 'renders with `ske_pending_condition` supplementary status for `recruited` applications' do
-    result = render_inline described_class.new(
-      application_choice: build_stubbed(:application_choice, status: :recruited),
-      supplementary_statuses: [:ske_pending_conditions],
-    )
+    application_choice = build_stubbed(:application_choice, status: :recruited)
+    allow(application_choice).to receive(:supplementary_statuses).and_return([:ske_pending_conditions])
+
+    result = render_inline described_class.new(application_choice:)
     expect(result.text).to include('Offer confirmed')
     expect(result.text).to include('SKE conditions pending')
   end
diff --git a/spec/components/provider_interface/application_status_tag_component_spec.rb b/spec/components/provider_interface/application_status_tag_component_spec.rb
index 27a15625382..30874add60f 100644
--- a/spec/components/provider_interface/application_status_tag_component_spec.rb
+++ b/spec/components/provider_interface/application_status_tag_component_spec.rb
@@ -8,10 +8,13 @@
   end
 
   it 'renders with `ske_pending_condition` supplementary status for `recruited` applications' do
-    result = render_inline described_class.new(
-      application_choice: build_stubbed(:application_choice, status: :recruited),
-      supplementary_statuses: [:ske_pending_conditions],
+    application_choice = build_stubbed(
+      :application_choice,
+      status: :recruited,
     )
+    allow(application_choice).to receive(:supplementary_statuses).and_return([:ske_pending_conditions])
+
+    result = render_inline described_class.new(application_choice:)
     expect(result.text).to include('Recruited')
     expect(result.text).to include('SKE conditions pending')
   end
diff --git a/spec/components/support_interface/application_status_tag_component_spec.rb b/spec/components/support_interface/application_status_tag_component_spec.rb
index 9fe0e3e8522..ac96613d773 100644
--- a/spec/components/support_interface/application_status_tag_component_spec.rb
+++ b/spec/components/support_interface/application_status_tag_component_spec.rb
@@ -3,15 +3,20 @@
 RSpec.describe SupportInterface::ApplicationStatusTagComponent do
   ApplicationStateChange.valid_states.each do |state_name|
     it "renders with a #{state_name} application choice" do
-      render_inline described_class.new(status: state_name.to_s)
+      application_choice = instance_double(ApplicationChoice, status: state_name)
+
+      render_inline described_class.new(application_choice:)
     end
   end
 
   it 'renders with `ske_pending_condition` supplementary status for `recruited` applications' do
-    result = render_inline described_class.new(
+    application_choice = instance_double(
+      ApplicationChoice,
       status: :recruited,
       supplementary_statuses: [:ske_pending_conditions],
     )
+
+    result = render_inline described_class.new(application_choice:)
     expect(result.text).to include('Recruited')
     expect(result.text).to include('SKE conditions pending')
   end
diff --git a/spec/helpers/view_helper_spec.rb b/spec/helpers/view_helper_spec.rb
index 8bd90bb2c2f..a9ad4eda091 100644
--- a/spec/helpers/view_helper_spec.rb
+++ b/spec/helpers/view_helper_spec.rb
@@ -206,18 +206,4 @@
       expect(helper.formatted_percentage(1, 0)).to eq '-'
     end
   end
-
-  describe '#supplementary_statuses_for' do
-    let(:service) { instance_double(CanRecruitWithPendingConditions, call: true) }
-
-    before { allow(RecruitedWithPendingConditions).to receive(:new).and_return(service) }
-
-    it 'returns an empty array if the status is not `recruited`' do
-      expect(helper.supplementary_statuses_for(application_choice: build(:application_choice, :offer))).to eq([])
-    end
-
-    it 'returns `ske_pending_conditions` if the status is `recruited`' do
-      expect(helper.supplementary_statuses_for(application_choice: build(:application_choice, :recruited))).to eq([:ske_pending_conditions])
-    end
-  end
 end
diff --git a/spec/models/application_choice_spec.rb b/spec/models/application_choice_spec.rb
index ff39bcb7a52..89169699271 100644
--- a/spec/models/application_choice_spec.rb
+++ b/spec/models/application_choice_spec.rb
@@ -530,4 +530,20 @@
       end
     end
   end
+
+  describe '#supplementary_statuses' do
+    let(:service) { instance_double(RecruitedWithPendingConditions, call: true) }
+
+    before { allow(RecruitedWithPendingConditions).to receive(:new).and_return(service) }
+
+    it 'returns an empty array if the status is not `recruited`' do
+      application_choice = build(:application_choice, :offer)
+      expect(application_choice.supplementary_statuses).to eq([])
+    end
+
+    it 'returns `ske_pending_conditions` if the status is `recruited`' do
+      application_choice = build(:application_choice, :recruited)
+      expect(application_choice.supplementary_statuses).to eq([:ske_pending_conditions])
+    end
+  end
 end