make new pages only visible for new collection year, rename filesamend tests

app/models/form/sales/subsections/household_situation.rb

@@ -12,8 +12,16 @@ class Form::Sales::Subsections::HouseholdSituation < ::Form::Subsection
       Form::Sales::Pages::LastAccommodation.new(nil, nil, self),
       Form::Sales::Pages::LastAccommodationLa.new(nil, nil, self),
       Form::Sales::Pages::BuyersOrganisations.new(nil, nil, self),
-      Form::Sales::Pages::Buyer2LivingIn.new(nil, nil, self),
+      buyer_2_situation_pages,
-      Form::Sales::Pages::Buyer2PreviousHousingSituation.new(nil, nil, self),
+    ].flatten.compact
-    ]
+  end
+
+  def buyer_2_situation_pages
+    if form.start_date.year >= 2023
+      [
+        Form::Sales::Pages::Buyer2LivingIn.new(nil, nil, self),
+        Form::Sales::Pages::Buyer2PreviousHousingSituation.new(nil, nil, self),
+      ]
+    end
   end
 end

db/migrate/20230224083552_add_columns_to_sales_log.rb

@@ -1,6 +1,8 @@
 class AddColumnsToSalesLog < ActiveRecord::Migration[7.0]
   def change
-    add_column :sales_logs, :buy2living, :integer
+    change_table :sales_logs, bulk: true do |t|
-    add_column :sales_logs, :prevtenbuy2, :integer
+      t.column :buy2living, :integer
+      t.column :prevtenbuy2, :integer
+    end
   end
 end

spec/models/form/sales/pages/buyer2_live_in_property_spec.rb

@@ -30,12 +30,12 @@ RSpec.describe Form::Sales::Pages::Buyer2LiveInProperty, type: :model do
   it "has correct depends_on" do
     expect(page.depends_on).to eq([
       {
-        "jointpur" => 1,
+        "joint_purchase?" => true,
         "privacynotice" => 1,
       },
       {
-        "jointpur" => 1,
+        "joint_purchase?" => true,
-        "noint" => 1,
+        "buyer_not_interviewed?" => true,
       },
     ])
   end

spec/models/form/sales/subsections/household_situation_spec.rb

@@ -1,27 +1,44 @@
 require "rails_helper"
 
 RSpec.describe Form::Sales::Subsections::HouseholdSituation, type: :model do
-  subject(:household_characteristics) { described_class.new(subsection_id, subsection_definition, section) }
+  subject(:household_characteristics) { described_class.new(nil, nil, section) }
 
-  let(:subsection_id) { nil }
+  let(:start_date) { Time.utc(2023, 4, 1) }
-  let(:subsection_definition) { nil }
+  let(:form) { instance_double(Form, start_date:) }
-  let(:section) { instance_double(Form::Sales::Sections::Household) }
+  let(:section) { instance_double(Form::Sales::Sections::Household, form:) }
 
   it "has correct section" do
     expect(household_characteristics.section).to eq(section)
   end
 
-  it "has correct pages" do
+  context "when the log belongs to the 22/23 collection" do
-    expect(household_characteristics.pages.map(&:id)).to eq(
+    let(:start_date) { Time.utc(2022, 4, 1) }
-      %w[
+
-        buyer1_previous_tenure
+    it "has correct pages" do
-        last_accommodation
+      expect(household_characteristics.pages.map(&:id)).to eq(
-        last_accommodation_la
+        %w[
-        buyers_organisations
+          buyer1_previous_tenure
-        buyer_2_living_in
+          last_accommodation
-        buyer_2_previous_housing_situation
+          last_accommodation_la
-      ],
+          buyers_organisations
-    )
+        ],
+      )
+    end
+  end
+
+  context "when the log belongs to the 23/24 collection" do
+    it "has correct pages" do
+      expect(household_characteristics.pages.map(&:id)).to eq(
+        %w[
+          buyer1_previous_tenure
+          last_accommodation
+          last_accommodation_la
+          buyers_organisations
+          buyer_2_living_in
+          buyer_2_previous_housing_situation
+        ],
+      )
+    end
   end
 
   it "has the correct id" do