CLDC-1902 update completed text (#1283)

* Add tests to cover updated header

* Refactor formhandler

app/models/form_handler.rb

@@ -3,6 +3,19 @@ class FormHandler
   include CollectionTimeHelper
   attr_reader :forms
 
+  SALES_SECTIONS = [
+    Form::Sales::Sections::PropertyInformation,
+    Form::Sales::Sections::Household,
+    Form::Sales::Sections::Finances,
+    Form::Sales::Sections::SaleInformation,
+  ].freeze
+
+  LETTINGS_SECTIONS = [
+    Form::Lettings::Sections::TenancyAndProperty,
+    Form::Lettings::Sections::Household,
+    Form::Lettings::Sections::RentAndCharges,
+  ].freeze
+
   def initialize
     @forms = get_all_forms
   end
@@ -20,18 +33,11 @@ class FormHandler
   end
 
   def sales_forms
-    sales_sections = [
+    {
-      Form::Sales::Sections::PropertyInformation,
+      "current_sales" => Form.new(nil, current_collection_start_year, SALES_SECTIONS, "sales"),
-      Form::Sales::Sections::Household,
+      "previous_sales" => Form.new(nil, current_collection_start_year - 1, SALES_SECTIONS, "sales"),
-      Form::Sales::Sections::Finances,
+      "next_sales" => Form.new(nil, current_collection_start_year + 1, SALES_SECTIONS, "sales"),
-      Form::Sales::Sections::SaleInformation,
+    }
-    ]
-    current_form = Form.new(nil, current_collection_start_year, sales_sections, "sales")
-    previous_form = Form.new(nil, current_collection_start_year - 1, sales_sections, "sales")
-    next_form = Form.new(nil, current_collection_start_year + 1, sales_sections, "sales")
-    { "current_sales" => current_form,
-      "previous_sales" => previous_form,
-      "next_sales" => next_form }
   end
 
   def lettings_forms
@@ -45,17 +51,11 @@ class FormHandler
       end
     end
 
-    lettings_sections = [
-      Form::Lettings::Sections::TenancyAndProperty,
-      Form::Lettings::Sections::Household,
-      Form::Lettings::Sections::RentAndCharges,
-    ]
-
     if forms["previous_lettings"].blank? && current_collection_start_year >= 2022
-      forms["previous_lettings"] = Form.new(nil, current_collection_start_year - 1, lettings_sections, "lettings")
+      forms["previous_lettings"] = Form.new(nil, current_collection_start_year - 1, LETTINGS_SECTIONS, "lettings")
     end
-    forms["current_lettings"] = Form.new(nil, current_collection_start_year, lettings_sections, "lettings") if forms["current_lettings"].blank?
+    forms["current_lettings"] = Form.new(nil, current_collection_start_year, LETTINGS_SECTIONS, "lettings") if forms["current_lettings"].blank?
-    forms["next_lettings"] = Form.new(nil, current_collection_start_year + 1, lettings_sections, "lettings") if forms["next_lettings"].blank?
+    forms["next_lettings"] = Form.new(nil, current_collection_start_year + 1, LETTINGS_SECTIONS, "lettings") if forms["next_lettings"].blank?
 
     forms
   end

spec/helpers/tasklist_helper_spec.rb

@@ -1,10 +1,12 @@
 require "rails_helper"
 
 RSpec.describe TasklistHelper do
+  describe "with lettings" do
     let(:empty_lettings_log) { FactoryBot.create(:lettings_log) }
     let(:lettings_log) { FactoryBot.create(:lettings_log, :in_progress, needstype: 1) }
     let(:fake_2021_2022_form) { Form.new("spec/fixtures/forms/2021_2022.json") }
 
+    context "with 2021 2022 form" do
       before do
         allow(FormHandler.instance).to receive(:current_lettings_form).and_return(fake_2021_2022_form)
       end
@@ -80,4 +82,73 @@ RSpec.describe TasklistHelper do
           end
         end
       end
+    end
+  end
+
+  describe "#review_log_text" do
+    around do |example|
+      Timecop.freeze(now) do
+        Singleton.__init__(FormHandler)
+        example.run
+      end
+      Singleton.__init__(FormHandler)
+    end
+
+    context "with lettings log" do
+      context "when collection_period_open? == true" do
+        context "with 2023 deadline" do
+          let(:now) { Time.utc(2022, 6, 1) }
+          let(:lettings_log) { create(:lettings_log, :completed) }
+
+          it "returns relevant text" do
+            expect(review_log_text(lettings_log)).to eq(
+              "You can #{govuk_link_to 'review and make changes to this log', review_lettings_log_path(lettings_log)} until 1 July 2023.".html_safe,
+            )
+          end
+        end
+
+        context "with 2024 deadline" do
+          let(:now) { Time.utc(2023, 6, 20) }
+          let(:lettings_log) { create(:lettings_log, :completed, national: 18, waityear: 2) }
+
+          it "returns relevant text" do
+            expect(review_log_text(lettings_log)).to eq(
+              "You can #{govuk_link_to 'review and make changes to this log', review_lettings_log_path(lettings_log)} until 1 July 2024.".html_safe,
+            )
+          end
+        end
+      end
+
+      context "when collection_period_open? == false" do
+        let(:now) { Time.utc(2023, 7, 8) }
+        let(:lettings_log) { create(:lettings_log, :completed, startdate: Time.utc(2023, 2, 8)) }
+
+        it "returns relevant text" do
+          expect(review_log_text(lettings_log)).to eq("This log is from the 2022/2023 collection window, which is now closed.")
+        end
+      end
+    end
+
+    context "with sales log" do
+      context "when collection_period_open? == true" do
+        let(:now) { Time.utc(2022, 6, 1) }
+        let(:sales_log) { create(:sales_log, :completed) }
+
+        it "returns relevant text" do
+          expect(review_log_text(sales_log)).to eq(
+            "You can #{govuk_link_to 'review and make changes to this log', review_lettings_log_path(sales_log)} until 1 July 2023.".html_safe,
+          )
+        end
+      end
+
+      context "when collection_period_open? == false" do
+        let(:now) { Time.utc(2023, 7, 8) }
+        let(:sales_log) { create(:sales_log, :completed, saledate: Time.utc(2023, 2, 8)) }
+
+        it "returns relevant text" do
+          expect(review_log_text(sales_log)).to eq("This log is from the 2022/2023 collection window, which is now closed.")
+        end
+      end
+    end
+  end
 end