Update collection year end dates for 2022 onwards (#1453)

This fixes a mistake I made in https://github.com/communitiesuk/submit-social-housing-lettings-and-sales-data/pull/1312 where I set the dates to July instead of June.

app/models/form.rb

@@ -7,9 +7,9 @@ class Form
     if sales_or_start_year_after_2022?(type, start_year)
       @start_date = Time.zone.local(start_year, 4, 1)
       @end_date = if start_year && start_year.to_i > 2022
-                    Time.zone.local(start_year + 1, 7, 9)
+                    Time.zone.local(start_year + 1, 6, 9)
                   else
-                    Time.zone.local(start_year + 1, 7, 7)
+                    Time.zone.local(start_year + 1, 6, 7)
                   end
       @setup_sections = type == "sales" ? [Form::Sales::Sections::Setup.new(nil, nil, self)] : [Form::Lettings::Sections::Setup.new(nil, nil, self)]
       @form_sections = sections_in_form.map { |sec| sec.new(nil, nil, self) }

config/forms/2022_2023.json

@@ -1,7 +1,7 @@
 {
   "form_type": "lettings",
   "start_date": "2022-04-01T00:00:00.000+01:00",
-  "end_date": "2023-07-09T00:00:00.000+01:00",
+  "end_date": "2023-06-09T00:00:00.000+01:00",
   "unresolved_log_redirect_page_id": "tenancy_start_date",
   "sections": {
     "tenancy_and_property": {

spec/helpers/tasklist_helper_spec.rb

@@ -85,7 +85,7 @@ RSpec.describe TasklistHelper do
 
         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_sales_log_path(id: sales_log, sales_log: true)} until 7 July 2023.".html_safe,
+            "You can #{govuk_link_to 'review and make changes to this log', review_sales_log_path(id: sales_log, sales_log: true)} until 7 June 2023.".html_safe,
           )
         end
       end
@@ -121,7 +121,7 @@ RSpec.describe TasklistHelper do
 
           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 9 July 2024.".html_safe,
+              "You can #{govuk_link_to 'review and make changes to this log', review_lettings_log_path(lettings_log)} until 9 June 2024.".html_safe,
             )
           end
         end

spec/models/form_spec.rb

@@ -252,7 +252,7 @@ RSpec.describe Form, type: :model do
       expect(form.questions.count).to eq(17)
       expect(form.questions.first.id).to eq("owning_organisation_id")
       expect(form.start_date).to eq(Time.zone.parse("2022-04-01"))
-      expect(form.end_date).to eq(Time.zone.parse("2023-07-07"))
+      expect(form.end_date).to eq(Time.zone.parse("2023-06-07"))
       expect(form.unresolved_log_redirect_page_id).to eq(nil)
     end