CLDC-3126: Move privacy notice question

app/models/form/lettings/subsections/household_characteristics.rb

@@ -8,7 +8,7 @@ class Form::Lettings::Subsections::HouseholdCharacteristics < ::Form::Subsection
 
   def pages
     @pages ||= [
-      Form::Lettings::Pages::Declaration.new(nil, nil, self),
+      (Form::Lettings::Pages::Declaration.new(nil, nil, self) unless form.start_year_after_2024?),
       Form::Lettings::Pages::HouseholdMembers.new(nil, nil, self),
       Form::Lettings::Pages::NoFemalesPregnantHouseholdLeadHhmembValueCheck.new(nil, nil, self),
       Form::Lettings::Pages::FemalesInSoftAgeRangeInPregnantHouseholdLeadHhmembValueCheck.new(nil, nil, self),

app/models/form/lettings/subsections/setup.rb

@@ -19,6 +19,7 @@ class Form::Lettings::Subsections::Setup < ::Form::Subsection
       Form::Lettings::Pages::RentType.new(nil, nil, self),
       Form::Lettings::Pages::TenantCode.new(nil, nil, self),
       Form::Lettings::Pages::PropertyReference.new(nil, nil, self),
+      (Form::Lettings::Pages::Declaration.new(nil, nil, self) if form.start_year_after_2024?),
     ].compact
   end
 

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

@@ -9,7 +9,7 @@ class Form::Sales::Subsections::HouseholdCharacteristics < ::Form::Subsection
   def pages
     @pages ||= [
       (Form::Sales::Pages::BuyerInterview.new(nil, nil, self) unless form.start_year_after_2024?),
-      Form::Sales::Pages::PrivacyNotice.new(nil, nil, self),
+      (Form::Sales::Pages::PrivacyNotice.new(nil, nil, self) unless form.start_year_after_2024?),
       Form::Sales::Pages::Age1.new(nil, nil, self),
       Form::Sales::Pages::RetirementValueCheck.new("age_1_retirement_value_check", nil, self, person_index: 1),
       Form::Sales::Pages::OldPersonsSharedOwnershipValueCheck.new("age_1_old_persons_shared_ownership_value_check", nil, self),

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

@@ -21,6 +21,7 @@ class Form::Sales::Subsections::Setup < ::Form::Subsection
       Form::Sales::Pages::JointPurchase.new(nil, nil, self),
       Form::Sales::Pages::NumberJointBuyers.new(nil, nil, self),
       (Form::Sales::Pages::BuyerInterview.new(nil, nil, self) if form.start_year_after_2024?),
+      (Form::Sales::Pages::PrivacyNotice.new(nil, nil, self) if form.start_year_after_2024?),
     ].flatten.compact
   end
 end

app/models/form_handler.rb

@@ -52,9 +52,8 @@ class FormHandler
   def ordered_sales_questions_for_all_years
     sales_forms = forms.filter { |name, _form| name.end_with? "sales" }.values
     ordered_questions = sales_forms.pop.questions.uniq(&:id)
-    question_ids = ordered_questions.map(&:id)
     all_questions_from_previous_forms = sales_forms.flat_map(&:questions)
-    deprecated_questions_by_preceding_question_id(question_ids, all_questions_from_previous_forms).each do |preceding_question_id, deprecated_question|
+    deprecated_questions_by_preceding_question_id(ordered_questions, all_questions_from_previous_forms).each do |preceding_question_id, deprecated_question|
       index_of_preceding_question = ordered_questions.index { |q| q.id == preceding_question_id }
       ordered_questions.insert(index_of_preceding_question + 1, deprecated_question)
     end
@@ -64,21 +63,26 @@ class FormHandler
   def ordered_lettings_questions_for_all_years
     lettings_forms = forms.filter { |name, _form| name.end_with? "lettings" }.values
     ordered_questions = lettings_forms.pop.questions.uniq(&:id)
-    question_ids = ordered_questions.map(&:id)
     all_questions_from_previous_forms = lettings_forms.flat_map(&:questions)
-    deprecated_questions_by_preceding_question_id(question_ids, all_questions_from_previous_forms).each do |preceding_question_id, deprecated_question|
+    deprecated_questions_by_preceding_question_id(ordered_questions, all_questions_from_previous_forms).each do |preceding_question_id, deprecated_question|
       index_of_preceding_question = ordered_questions.index { |q| q.id == preceding_question_id }
       ordered_questions.insert(index_of_preceding_question + 1, deprecated_question)
     end
     ordered_questions
   end
 
-  def deprecated_questions_by_preceding_question_id(current_form_question_ids, all_questions_from_previous_forms)
+  def deprecated_questions_by_preceding_question_id(current_form_questions, all_questions_from_previous_forms)
+    current_form_question_ids = current_form_questions.map(&:id)
     deprecated_questions = {}
     all_questions_from_previous_forms.each_cons(2) do |preceding_question, question|
       next if current_form_question_ids.include?(question.id) || deprecated_questions.values.map(&:id).include?(question.id)
 
-      deprecated_questions[preceding_question.id] = question
+      if question.subsection.id == preceding_question.subsection.id
+        deprecated_questions[preceding_question.id] = question
+      else
+        last_in_preceding_subsection = current_form_questions.rindex { |q| q.subsection.id == preceding_question.subsection.id }
+        deprecated_questions[current_form_questions[last_in_preceding_subsection].id] = question
+      end
     end
     deprecated_questions
   end

app/services/bulk_upload/sales/year2024/row_parser.rb

@@ -468,7 +468,6 @@ class BulkUpload::Sales::Year2024::RowParser
   validate :validate_address_fields, on: :after_log
   validate :validate_if_log_already_exists, on: :after_log, if: -> { FeatureToggle.bulk_upload_duplicate_log_check_enabled? }
 
-  validate :validate_data_protection_answered, on: :after_log
   validate :validate_buyers_organisations, on: :after_log
 
   def self.question_for_field(field)
@@ -565,12 +564,6 @@ class BulkUpload::Sales::Year2024::RowParser
 
 private
 
-  def validate_data_protection_answered
-    unless field_18 == 1
-      errors.add(:field_18, I18n.t("validations.not_answered", question: QUESTIONS[:field_18].downcase), category: :setup)
-    end
-  end
-
   def validate_buyers_organisations
     organisations_fields = %i[field_66 field_67 field_68 field_69]
     if organisations_fields.all? { |field| attributes[field.to_s].blank? }

spec/fixtures/files/lettings_log_csv_export_codes.csv

@@ -1,2 +1,2 @@
-id,status,duplicate_set_id,created_by,is_dpo,created_at,updated_by,updated_at,creation_method,old_id,old_form_id,collection_start_year,owning_organisation_name,managing_organisation_name,needstype,lettype,renewal,startdate,renttype,renttype_detail,irproduct,irproduct_other,lar,tenancycode,propcode,postcode_known,uprn_known,uprn,uprn_confirmed,address_line1,address_line2,town_or_city,county,postcode_full,is_la_inferred,la_label,la,first_time_property_let_as_social_housing,unitletas,rsnvac,newprop,offered,unittype_gn,builtype,wchair,beds,voiddate,vacdays,void_date_value_check,majorrepairs,mrcdate,major_repairs_date_value_check,joint,startertenancy,tenancy,tenancyother,tenancylength,sheltered,declaration,hhmemb,pregnancy_value_check,refused,hhtype,totchild,totelder,totadult,age1,retirement_value_check,sex1,ethnic_group,ethnic,national,nationality_all,ecstat1,details_known_2,relat2,age2,sex2,ecstat2,details_known_3,relat3,age3,sex3,ecstat3,details_known_4,relat4,age4,sex4,ecstat4,details_known_5,relat5,age5,sex5,ecstat5,details_known_6,relat6,age6,sex6,ecstat6,details_known_7,relat7,age7,sex7,ecstat7,details_known_8,relat8,age8,sex8,ecstat8,armedforces,leftreg,reservist,preg_occ,housingneeds,housingneeds_type,housingneeds_a,housingneeds_b,housingneeds_c,housingneeds_f,housingneeds_g,housingneeds_h,housingneeds_other,illness,illness_type_4,illness_type_5,illness_type_2,illness_type_6,illness_type_7,illness_type_3,illness_type_9,illness_type_8,illness_type_1,illness_type_10,layear,waityear,reason,reasonother,prevten,new_old,homeless,ppcodenk,ppostcode_full,previous_la_known,is_previous_la_inferred,prevloc_label,prevloc,reasonpref,rp_homeless,rp_insan_unsat,rp_medwel,rp_hardship,rp_dontknow,cbl,cap,chr,letting_allocation_none,referral,referral_value_check,net_income_known,incref,earnings,incfreq,net_income_value_check,hb,has_benefits,benefits,household_charge,nocharge,period,is_carehome,chcharge,wchchrg,carehome_charges_value_check,brent,wrent,rent_value_check,scharge,wscharge,pscharge,wpschrge,supcharg,wsupchrg,tcharge,wtcharge,scharge_value_check,pscharge_value_check,supcharg_value_check,hbrentshortfall,tshortfall_known,tshortfall,wtshortfall,scheme_code,scheme_service_name,scheme_sensitive,SCHTYPE,scheme_registered_under_care_act,scheme_owning_organisation_name,scheme_primary_client_group,scheme_has_other_client_group,scheme_secondary_client_group,scheme_support_type,scheme_intended_stay,scheme_created_at,location_code,location_postcode,location_name,location_units,location_type_of_unit,location_mobility_type,location_local_authority,location_startdate
-,completed,,s.port@jeemayle.com,false,2023-11-26T00:00:00+00:00,,2023-11-26T00:00:00+00:00,1,,,2023,DLUHC,DLUHC,1,7,0,2023-11-26,2,2,1,,2,HIJKLMN,ABCDEFG,1,0,,,fake address,,London,,NW9 5LL,false,Barnet,E09000003,0,2,6,2,2,7,1,1,3,2023-11-24,,,1,2023-11-25,,3,1,4,,2,,1,4,,1,4,0,0,2,35,,F,0,2,13,,0,0,P,32,M,6,1,R,-9,R,10,0,R,-9,R,10,,,,,,,,,,,,,,,,,,,,,1,4,1,2,1,0,1,0,0,0,0,0,0,1,0,0,1,0,0,0,0,0,0,0,2,7,4,,6,2,1,0,TN23 6LZ,1,false,Ashford,E07000105,1,0,1,0,0,0,0,0,1,,2,,0,0,268,1,,6,1,1,,0,2,,,,,200.0,100.0,,50.0,25.0,40.0,20.0,35.0,17.5,325.0,162.5,,,,1,0,12.0,6.0,,,,,,,,,,,,,,,,,,,,
+id,status,duplicate_set_id,created_by,is_dpo,created_at,updated_by,updated_at,creation_method,old_id,old_form_id,collection_start_year,owning_organisation_name,managing_organisation_name,needstype,lettype,renewal,startdate,renttype,renttype_detail,irproduct,irproduct_other,lar,tenancycode,propcode,declaration,postcode_known,uprn_known,uprn,uprn_confirmed,address_line1,address_line2,town_or_city,county,postcode_full,is_la_inferred,la_label,la,first_time_property_let_as_social_housing,unitletas,rsnvac,newprop,offered,unittype_gn,builtype,wchair,beds,voiddate,vacdays,void_date_value_check,majorrepairs,mrcdate,major_repairs_date_value_check,joint,startertenancy,tenancy,tenancyother,tenancylength,sheltered,hhmemb,pregnancy_value_check,refused,hhtype,totchild,totelder,totadult,age1,retirement_value_check,sex1,ethnic_group,ethnic,national,nationality_all,ecstat1,details_known_2,relat2,age2,sex2,ecstat2,details_known_3,relat3,age3,sex3,ecstat3,details_known_4,relat4,age4,sex4,ecstat4,details_known_5,relat5,age5,sex5,ecstat5,details_known_6,relat6,age6,sex6,ecstat6,details_known_7,relat7,age7,sex7,ecstat7,details_known_8,relat8,age8,sex8,ecstat8,armedforces,leftreg,reservist,preg_occ,housingneeds,housingneeds_type,housingneeds_a,housingneeds_b,housingneeds_c,housingneeds_f,housingneeds_g,housingneeds_h,housingneeds_other,illness,illness_type_4,illness_type_5,illness_type_2,illness_type_6,illness_type_7,illness_type_3,illness_type_9,illness_type_8,illness_type_1,illness_type_10,layear,waityear,reason,reasonother,prevten,new_old,homeless,ppcodenk,ppostcode_full,previous_la_known,is_previous_la_inferred,prevloc_label,prevloc,reasonpref,rp_homeless,rp_insan_unsat,rp_medwel,rp_hardship,rp_dontknow,cbl,cap,chr,letting_allocation_none,referral,referral_value_check,net_income_known,incref,earnings,incfreq,net_income_value_check,hb,has_benefits,benefits,household_charge,nocharge,period,is_carehome,chcharge,wchchrg,carehome_charges_value_check,brent,wrent,rent_value_check,scharge,wscharge,pscharge,wpschrge,supcharg,wsupchrg,tcharge,wtcharge,scharge_value_check,pscharge_value_check,supcharg_value_check,hbrentshortfall,tshortfall_known,tshortfall,wtshortfall,scheme_code,scheme_service_name,scheme_sensitive,SCHTYPE,scheme_registered_under_care_act,scheme_owning_organisation_name,scheme_primary_client_group,scheme_has_other_client_group,scheme_secondary_client_group,scheme_support_type,scheme_intended_stay,scheme_created_at,location_code,location_postcode,location_name,location_units,location_type_of_unit,location_mobility_type,location_local_authority,location_startdate
+,completed,,s.port@jeemayle.com,false,2023-11-26T00:00:00+00:00,,2023-11-26T00:00:00+00:00,1,,,2023,DLUHC,DLUHC,1,7,0,2023-11-26,2,2,1,,2,HIJKLMN,ABCDEFG,1,1,0,,,fake address,,London,,NW9 5LL,false,Barnet,E09000003,0,2,6,2,2,7,1,1,3,2023-11-24,,,1,2023-11-25,,3,1,4,,2,,4,,1,4,0,0,2,35,,F,0,2,13,,0,0,P,32,M,6,1,R,-9,R,10,0,R,-9,R,10,,,,,,,,,,,,,,,,,,,,,1,4,1,2,1,0,1,0,0,0,0,0,0,1,0,0,1,0,0,0,0,0,0,0,2,7,4,,6,2,1,0,TN23 6LZ,1,false,Ashford,E07000105,1,0,1,0,0,0,0,0,1,,2,,0,0,268,1,,6,1,1,,0,2,,,,,200.0,100.0,,50.0,25.0,40.0,20.0,35.0,17.5,325.0,162.5,,,,1,0,12.0,6.0,,,,,,,,,,,,,,,,,,,,

spec/fixtures/files/lettings_log_csv_export_labels.csv

@@ -1,2 +1,2 @@
-id,status,duplicate_set_id,created_by,is_dpo,created_at,updated_by,updated_at,creation_method,old_id,old_form_id,collection_start_year,owning_organisation_name,managing_organisation_name,needstype,lettype,renewal,startdate,renttype,renttype_detail,irproduct,irproduct_other,lar,tenancycode,propcode,postcode_known,uprn_known,uprn,uprn_confirmed,address_line1,address_line2,town_or_city,county,postcode_full,is_la_inferred,la_label,la,first_time_property_let_as_social_housing,unitletas,rsnvac,newprop,offered,unittype_gn,builtype,wchair,beds,voiddate,vacdays,void_date_value_check,majorrepairs,mrcdate,major_repairs_date_value_check,joint,startertenancy,tenancy,tenancyother,tenancylength,sheltered,declaration,hhmemb,pregnancy_value_check,refused,hhtype,totchild,totelder,totadult,age1,retirement_value_check,sex1,ethnic_group,ethnic,national,nationality_all,ecstat1,details_known_2,relat2,age2,sex2,ecstat2,details_known_3,relat3,age3,sex3,ecstat3,details_known_4,relat4,age4,sex4,ecstat4,details_known_5,relat5,age5,sex5,ecstat5,details_known_6,relat6,age6,sex6,ecstat6,details_known_7,relat7,age7,sex7,ecstat7,details_known_8,relat8,age8,sex8,ecstat8,armedforces,leftreg,reservist,preg_occ,housingneeds,housingneeds_type,housingneeds_a,housingneeds_b,housingneeds_c,housingneeds_f,housingneeds_g,housingneeds_h,housingneeds_other,illness,illness_type_4,illness_type_5,illness_type_2,illness_type_6,illness_type_7,illness_type_3,illness_type_9,illness_type_8,illness_type_1,illness_type_10,layear,waityear,reason,reasonother,prevten,new_old,homeless,ppcodenk,ppostcode_full,previous_la_known,is_previous_la_inferred,prevloc_label,prevloc,reasonpref,rp_homeless,rp_insan_unsat,rp_medwel,rp_hardship,rp_dontknow,cbl,cap,chr,letting_allocation_none,referral,referral_value_check,net_income_known,incref,earnings,incfreq,net_income_value_check,hb,has_benefits,benefits,household_charge,nocharge,period,is_carehome,chcharge,wchchrg,carehome_charges_value_check,brent,wrent,rent_value_check,scharge,wscharge,pscharge,wpschrge,supcharg,wsupchrg,tcharge,wtcharge,scharge_value_check,pscharge_value_check,supcharg_value_check,hbrentshortfall,tshortfall_known,tshortfall,wtshortfall,scheme_code,scheme_service_name,scheme_sensitive,SCHTYPE,scheme_registered_under_care_act,scheme_owning_organisation_name,scheme_primary_client_group,scheme_has_other_client_group,scheme_secondary_client_group,scheme_support_type,scheme_intended_stay,scheme_created_at,location_code,location_postcode,location_name,location_units,location_type_of_unit,location_mobility_type,location_local_authority,location_startdate
-,completed,,s.port@jeemayle.com,false,2023-11-26T00:00:00+00:00,,2023-11-26T00:00:00+00:00,single log,,,2023,DLUHC,DLUHC,General needs,Affordable rent general needs local authority,No,2023-11-26,Affordable Rent,Affordable Rent,Rent to Buy,,No,HIJKLMN,ABCDEFG,Yes,No,,,fake address,,London,,NW9 5LL,No,Barnet,E09000003,No,Affordable rent basis,Tenant abandoned property,No,2,House,Purpose built,Yes,3,2023-11-24,,,Yes,2023-11-25,,Don’t know,Yes,Assured Shorthold Tenancy (AST) – Fixed term,,2,,Yes,4,,Yes,4,0,0,2,35,,Female,White,Irish,Tenant prefers not to say,,Other,Yes,Partner,32,Male,Not seeking work,No,Prefers not to say,Not known,Prefers not to say,Prefers not to say,Yes,Person prefers not to say,Not known,Person prefers not to say,Person prefers not to say,,,,,,,,,,,,,,,,,,,,,Yes – the person is a current or former regular,No – they left up to and including 5 years ago,Yes,No,Yes,Fully wheelchair accessible housing,Yes,No,No,No,No,No,No,Yes,No,No,Yes,No,No,No,No,No,No,No,Less than 1 year,1 year but under 2 years,Loss of tied accommodation,,Other supported housing,2,No,Yes,TN23 6LZ,Yes,No,Ashford,E07000105,Yes,,Yes,,,,No,No,Yes,,Tenant applied directly (no referral or nomination),,Yes,No,268,Weekly,,Universal Credit housing element,Yes,All,,No,Every 2 weeks,,,,,200.0,100.0,,50.0,25.0,40.0,20.0,35.0,17.5,325.0,162.5,,,,Yes,Yes,12.0,6.0,,,,,,,,,,,,,,,,,,,,
+id,status,duplicate_set_id,created_by,is_dpo,created_at,updated_by,updated_at,creation_method,old_id,old_form_id,collection_start_year,owning_organisation_name,managing_organisation_name,needstype,lettype,renewal,startdate,renttype,renttype_detail,irproduct,irproduct_other,lar,tenancycode,propcode,declaration,postcode_known,uprn_known,uprn,uprn_confirmed,address_line1,address_line2,town_or_city,county,postcode_full,is_la_inferred,la_label,la,first_time_property_let_as_social_housing,unitletas,rsnvac,newprop,offered,unittype_gn,builtype,wchair,beds,voiddate,vacdays,void_date_value_check,majorrepairs,mrcdate,major_repairs_date_value_check,joint,startertenancy,tenancy,tenancyother,tenancylength,sheltered,hhmemb,pregnancy_value_check,refused,hhtype,totchild,totelder,totadult,age1,retirement_value_check,sex1,ethnic_group,ethnic,national,nationality_all,ecstat1,details_known_2,relat2,age2,sex2,ecstat2,details_known_3,relat3,age3,sex3,ecstat3,details_known_4,relat4,age4,sex4,ecstat4,details_known_5,relat5,age5,sex5,ecstat5,details_known_6,relat6,age6,sex6,ecstat6,details_known_7,relat7,age7,sex7,ecstat7,details_known_8,relat8,age8,sex8,ecstat8,armedforces,leftreg,reservist,preg_occ,housingneeds,housingneeds_type,housingneeds_a,housingneeds_b,housingneeds_c,housingneeds_f,housingneeds_g,housingneeds_h,housingneeds_other,illness,illness_type_4,illness_type_5,illness_type_2,illness_type_6,illness_type_7,illness_type_3,illness_type_9,illness_type_8,illness_type_1,illness_type_10,layear,waityear,reason,reasonother,prevten,new_old,homeless,ppcodenk,ppostcode_full,previous_la_known,is_previous_la_inferred,prevloc_label,prevloc,reasonpref,rp_homeless,rp_insan_unsat,rp_medwel,rp_hardship,rp_dontknow,cbl,cap,chr,letting_allocation_none,referral,referral_value_check,net_income_known,incref,earnings,incfreq,net_income_value_check,hb,has_benefits,benefits,household_charge,nocharge,period,is_carehome,chcharge,wchchrg,carehome_charges_value_check,brent,wrent,rent_value_check,scharge,wscharge,pscharge,wpschrge,supcharg,wsupchrg,tcharge,wtcharge,scharge_value_check,pscharge_value_check,supcharg_value_check,hbrentshortfall,tshortfall_known,tshortfall,wtshortfall,scheme_code,scheme_service_name,scheme_sensitive,SCHTYPE,scheme_registered_under_care_act,scheme_owning_organisation_name,scheme_primary_client_group,scheme_has_other_client_group,scheme_secondary_client_group,scheme_support_type,scheme_intended_stay,scheme_created_at,location_code,location_postcode,location_name,location_units,location_type_of_unit,location_mobility_type,location_local_authority,location_startdate
+,completed,,s.port@jeemayle.com,false,2023-11-26T00:00:00+00:00,,2023-11-26T00:00:00+00:00,single log,,,2023,DLUHC,DLUHC,General needs,Affordable rent general needs local authority,No,2023-11-26,Affordable Rent,Affordable Rent,Rent to Buy,,No,HIJKLMN,ABCDEFG,Yes,Yes,No,,,fake address,,London,,NW9 5LL,No,Barnet,E09000003,No,Affordable rent basis,Tenant abandoned property,No,2,House,Purpose built,Yes,3,2023-11-24,,,Yes,2023-11-25,,Don’t know,Yes,Assured Shorthold Tenancy (AST) – Fixed term,,2,,4,,Yes,4,0,0,2,35,,Female,White,Irish,Tenant prefers not to say,,Other,Yes,Partner,32,Male,Not seeking work,No,Prefers not to say,Not known,Prefers not to say,Prefers not to say,Yes,Person prefers not to say,Not known,Person prefers not to say,Person prefers not to say,,,,,,,,,,,,,,,,,,,,,Yes – the person is a current or former regular,No – they left up to and including 5 years ago,Yes,No,Yes,Fully wheelchair accessible housing,Yes,No,No,No,No,No,No,Yes,No,No,Yes,No,No,No,No,No,No,No,Less than 1 year,1 year but under 2 years,Loss of tied accommodation,,Other supported housing,2,No,Yes,TN23 6LZ,Yes,No,Ashford,E07000105,Yes,,Yes,,,,No,No,Yes,,Tenant applied directly (no referral or nomination),,Yes,No,268,Weekly,,Universal Credit housing element,Yes,All,,No,Every 2 weeks,,,,,200.0,100.0,,50.0,25.0,40.0,20.0,35.0,17.5,325.0,162.5,,,,Yes,Yes,12.0,6.0,,,,,,,,,,,,,,,,,,,,

spec/fixtures/files/lettings_log_csv_export_non_support_codes.csv

@@ -1,2 +1,2 @@
-id,status,duplicate_set_id,created_by,is_dpo,created_at,updated_by,updated_at,creation_method,collection_start_year,owning_organisation_name,managing_organisation_name,needstype,lettype,renewal,startdate,renttype,renttype_detail,irproduct,irproduct_other,lar,tenancycode,propcode,uprn_known,uprn,address_line1,address_line2,town_or_city,county,postcode_full,la_label,unitletas,rsnvac,newprop,offered,unittype_gn,builtype,wchair,beds,voiddate,vacdays,void_date_value_check,majorrepairs,mrcdate,major_repairs_date_value_check,joint,startertenancy,tenancy,tenancyother,tenancylength,sheltered,declaration,hhmemb,refused,age1,sex1,ethnic_group,ethnic,national,nationality_all,ecstat1,relat2,age2,sex2,ecstat2,relat3,age3,sex3,ecstat3,relat4,age4,sex4,ecstat4,relat5,age5,sex5,ecstat5,relat6,age6,sex6,ecstat6,relat7,age7,sex7,ecstat7,relat8,age8,sex8,ecstat8,armedforces,leftreg,reservist,preg_occ,housingneeds,housingneeds_type,housingneeds_a,housingneeds_b,housingneeds_c,housingneeds_f,housingneeds_g,housingneeds_h,housingneeds_other,illness,illness_type_4,illness_type_5,illness_type_2,illness_type_6,illness_type_7,illness_type_3,illness_type_9,illness_type_8,illness_type_1,illness_type_10,layear,waityear,reason,reasonother,prevten,homeless,ppcodenk,ppostcode_full,prevloc_label,reasonpref,rp_homeless,rp_insan_unsat,rp_medwel,rp_hardship,rp_dontknow,cbl,cap,chr,letting_allocation_none,referral,referral_value_check,incref,earnings,incfreq,hb,has_benefits,benefits,household_charge,nocharge,period,is_carehome,chcharge,wchchrg,carehome_charges_value_check,brent,scharge,pscharge,supcharg,tcharge,scharge_value_check,pscharge_value_check,supcharg_value_check,hbrentshortfall,tshortfall,scheme_code,scheme_service_name,scheme_sensitive,SCHTYPE,scheme_registered_under_care_act,scheme_owning_organisation_name,scheme_primary_client_group,scheme_has_other_client_group,scheme_secondary_client_group,scheme_support_type,scheme_intended_stay,scheme_created_at,location_code,location_postcode,location_name,location_units,location_type_of_unit,location_mobility_type,location_local_authority,location_startdate
-,completed,,choreographer@owtluk.com,false,2023-11-26T00:00:00+00:00,,2023-11-26T00:00:00+00:00,1,2023,DLUHC,DLUHC,1,7,0,2023-11-26,2,2,1,,2,HIJKLMN,ABCDEFG,0,,fake address,,London,,NW9 5LL,Barnet,2,6,2,2,7,1,1,3,2023-11-24,1,,1,2023-11-25,,3,1,4,,2,,1,4,1,35,F,0,2,13,,0,P,32,M,6,R,-9,R,10,R,-9,R,10,,,,,,,,,,,,,,,,,1,4,1,2,1,0,1,0,0,0,0,0,0,1,0,0,1,0,0,0,0,0,0,0,2,7,4,,6,1,0,TN23 6LZ,Ashford,1,0,1,0,0,0,0,0,1,,2,,0,268,1,6,1,1,,0,2,,,,,200.0,50.0,40.0,35.0,325.0,,,,1,12.0,,,,,,,,,,,,,,,,,,,,
+id,status,duplicate_set_id,created_by,is_dpo,created_at,updated_by,updated_at,creation_method,collection_start_year,owning_organisation_name,managing_organisation_name,needstype,lettype,renewal,startdate,renttype,renttype_detail,irproduct,irproduct_other,lar,tenancycode,propcode,declaration,uprn_known,uprn,address_line1,address_line2,town_or_city,county,postcode_full,la_label,unitletas,rsnvac,newprop,offered,unittype_gn,builtype,wchair,beds,voiddate,vacdays,void_date_value_check,majorrepairs,mrcdate,major_repairs_date_value_check,joint,startertenancy,tenancy,tenancyother,tenancylength,sheltered,hhmemb,refused,age1,sex1,ethnic_group,ethnic,national,nationality_all,ecstat1,relat2,age2,sex2,ecstat2,relat3,age3,sex3,ecstat3,relat4,age4,sex4,ecstat4,relat5,age5,sex5,ecstat5,relat6,age6,sex6,ecstat6,relat7,age7,sex7,ecstat7,relat8,age8,sex8,ecstat8,armedforces,leftreg,reservist,preg_occ,housingneeds,housingneeds_type,housingneeds_a,housingneeds_b,housingneeds_c,housingneeds_f,housingneeds_g,housingneeds_h,housingneeds_other,illness,illness_type_4,illness_type_5,illness_type_2,illness_type_6,illness_type_7,illness_type_3,illness_type_9,illness_type_8,illness_type_1,illness_type_10,layear,waityear,reason,reasonother,prevten,homeless,ppcodenk,ppostcode_full,prevloc_label,reasonpref,rp_homeless,rp_insan_unsat,rp_medwel,rp_hardship,rp_dontknow,cbl,cap,chr,letting_allocation_none,referral,referral_value_check,incref,earnings,incfreq,hb,has_benefits,benefits,household_charge,nocharge,period,is_carehome,chcharge,wchchrg,carehome_charges_value_check,brent,scharge,pscharge,supcharg,tcharge,scharge_value_check,pscharge_value_check,supcharg_value_check,hbrentshortfall,tshortfall,scheme_code,scheme_service_name,scheme_sensitive,SCHTYPE,scheme_registered_under_care_act,scheme_owning_organisation_name,scheme_primary_client_group,scheme_has_other_client_group,scheme_secondary_client_group,scheme_support_type,scheme_intended_stay,scheme_created_at,location_code,location_postcode,location_name,location_units,location_type_of_unit,location_mobility_type,location_local_authority,location_startdate
+,completed,,choreographer@owtluk.com,false,2023-11-26T00:00:00+00:00,,2023-11-26T00:00:00+00:00,1,2023,DLUHC,DLUHC,1,7,0,2023-11-26,2,2,1,,2,HIJKLMN,ABCDEFG,1,0,,fake address,,London,,NW9 5LL,Barnet,2,6,2,2,7,1,1,3,2023-11-24,1,,1,2023-11-25,,3,1,4,,2,,4,1,35,F,0,2,13,,0,P,32,M,6,R,-9,R,10,R,-9,R,10,,,,,,,,,,,,,,,,,1,4,1,2,1,0,1,0,0,0,0,0,0,1,0,0,1,0,0,0,0,0,0,0,2,7,4,,6,1,0,TN23 6LZ,Ashford,1,0,1,0,0,0,0,0,1,,2,,0,268,1,6,1,1,,0,2,,,,,200.0,50.0,40.0,35.0,325.0,,,,1,12.0,,,,,,,,,,,,,,,,,,,,

spec/fixtures/files/lettings_log_csv_export_non_support_labels.csv

@@ -1,2 +1,2 @@
-id,status,duplicate_set_id,created_by,is_dpo,created_at,updated_by,updated_at,creation_method,collection_start_year,owning_organisation_name,managing_organisation_name,needstype,lettype,renewal,startdate,renttype,renttype_detail,irproduct,irproduct_other,lar,tenancycode,propcode,uprn_known,uprn,address_line1,address_line2,town_or_city,county,postcode_full,la_label,unitletas,rsnvac,newprop,offered,unittype_gn,builtype,wchair,beds,voiddate,vacdays,void_date_value_check,majorrepairs,mrcdate,major_repairs_date_value_check,joint,startertenancy,tenancy,tenancyother,tenancylength,sheltered,declaration,hhmemb,refused,age1,sex1,ethnic_group,ethnic,national,nationality_all,ecstat1,relat2,age2,sex2,ecstat2,relat3,age3,sex3,ecstat3,relat4,age4,sex4,ecstat4,relat5,age5,sex5,ecstat5,relat6,age6,sex6,ecstat6,relat7,age7,sex7,ecstat7,relat8,age8,sex8,ecstat8,armedforces,leftreg,reservist,preg_occ,housingneeds,housingneeds_type,housingneeds_a,housingneeds_b,housingneeds_c,housingneeds_f,housingneeds_g,housingneeds_h,housingneeds_other,illness,illness_type_4,illness_type_5,illness_type_2,illness_type_6,illness_type_7,illness_type_3,illness_type_9,illness_type_8,illness_type_1,illness_type_10,layear,waityear,reason,reasonother,prevten,homeless,ppcodenk,ppostcode_full,prevloc_label,reasonpref,rp_homeless,rp_insan_unsat,rp_medwel,rp_hardship,rp_dontknow,cbl,cap,chr,letting_allocation_none,referral,referral_value_check,incref,earnings,incfreq,hb,has_benefits,benefits,household_charge,nocharge,period,is_carehome,chcharge,wchchrg,carehome_charges_value_check,brent,scharge,pscharge,supcharg,tcharge,scharge_value_check,pscharge_value_check,supcharg_value_check,hbrentshortfall,tshortfall,scheme_code,scheme_service_name,scheme_sensitive,SCHTYPE,scheme_registered_under_care_act,scheme_owning_organisation_name,scheme_primary_client_group,scheme_has_other_client_group,scheme_secondary_client_group,scheme_support_type,scheme_intended_stay,scheme_created_at,location_code,location_postcode,location_name,location_units,location_type_of_unit,location_mobility_type,location_local_authority,location_startdate
-,completed,,choreographer@owtluk.com,false,2023-11-26T00:00:00+00:00,,2023-11-26T00:00:00+00:00,single log,2023,DLUHC,DLUHC,General needs,Affordable rent general needs local authority,No,2023-11-26,Affordable Rent,Affordable Rent,Rent to Buy,,No,HIJKLMN,ABCDEFG,No,,fake address,,London,,NW9 5LL,Barnet,Affordable rent basis,Tenant abandoned property,No,2,House,Purpose built,Yes,3,2023-11-24,1,,Yes,2023-11-25,,Don’t know,Yes,Assured Shorthold Tenancy (AST) – Fixed term,,2,,Yes,4,Yes,35,Female,White,Irish,Tenant prefers not to say,,Other,Partner,32,Male,Not seeking work,Prefers not to say,Not known,Prefers not to say,Prefers not to say,Person prefers not to say,Not known,Person prefers not to say,Person prefers not to say,,,,,,,,,,,,,,,,,Yes – the person is a current or former regular,No – they left up to and including 5 years ago,Yes,No,Yes,Fully wheelchair accessible housing,Yes,No,No,No,No,No,No,Yes,No,No,Yes,No,No,No,No,No,No,No,Less than 1 year,1 year but under 2 years,Loss of tied accommodation,,Other supported housing,No,Yes,TN23 6LZ,Ashford,Yes,,Yes,,,,No,No,Yes,,Tenant applied directly (no referral or nomination),,No,268,Weekly,Universal Credit housing element,Yes,All,,No,Every 2 weeks,,,,,200.0,50.0,40.0,35.0,325.0,,,,Yes,12.0,,,,,,,,,,,,,,,,,,,,
+id,status,duplicate_set_id,created_by,is_dpo,created_at,updated_by,updated_at,creation_method,collection_start_year,owning_organisation_name,managing_organisation_name,needstype,lettype,renewal,startdate,renttype,renttype_detail,irproduct,irproduct_other,lar,tenancycode,propcode,declaration,uprn_known,uprn,address_line1,address_line2,town_or_city,county,postcode_full,la_label,unitletas,rsnvac,newprop,offered,unittype_gn,builtype,wchair,beds,voiddate,vacdays,void_date_value_check,majorrepairs,mrcdate,major_repairs_date_value_check,joint,startertenancy,tenancy,tenancyother,tenancylength,sheltered,hhmemb,refused,age1,sex1,ethnic_group,ethnic,national,nationality_all,ecstat1,relat2,age2,sex2,ecstat2,relat3,age3,sex3,ecstat3,relat4,age4,sex4,ecstat4,relat5,age5,sex5,ecstat5,relat6,age6,sex6,ecstat6,relat7,age7,sex7,ecstat7,relat8,age8,sex8,ecstat8,armedforces,leftreg,reservist,preg_occ,housingneeds,housingneeds_type,housingneeds_a,housingneeds_b,housingneeds_c,housingneeds_f,housingneeds_g,housingneeds_h,housingneeds_other,illness,illness_type_4,illness_type_5,illness_type_2,illness_type_6,illness_type_7,illness_type_3,illness_type_9,illness_type_8,illness_type_1,illness_type_10,layear,waityear,reason,reasonother,prevten,homeless,ppcodenk,ppostcode_full,prevloc_label,reasonpref,rp_homeless,rp_insan_unsat,rp_medwel,rp_hardship,rp_dontknow,cbl,cap,chr,letting_allocation_none,referral,referral_value_check,incref,earnings,incfreq,hb,has_benefits,benefits,household_charge,nocharge,period,is_carehome,chcharge,wchchrg,carehome_charges_value_check,brent,scharge,pscharge,supcharg,tcharge,scharge_value_check,pscharge_value_check,supcharg_value_check,hbrentshortfall,tshortfall,scheme_code,scheme_service_name,scheme_sensitive,SCHTYPE,scheme_registered_under_care_act,scheme_owning_organisation_name,scheme_primary_client_group,scheme_has_other_client_group,scheme_secondary_client_group,scheme_support_type,scheme_intended_stay,scheme_created_at,location_code,location_postcode,location_name,location_units,location_type_of_unit,location_mobility_type,location_local_authority,location_startdate
+,completed,,choreographer@owtluk.com,false,2023-11-26T00:00:00+00:00,,2023-11-26T00:00:00+00:00,single log,2023,DLUHC,DLUHC,General needs,Affordable rent general needs local authority,No,2023-11-26,Affordable Rent,Affordable Rent,Rent to Buy,,No,HIJKLMN,ABCDEFG,Yes,No,,fake address,,London,,NW9 5LL,Barnet,Affordable rent basis,Tenant abandoned property,No,2,House,Purpose built,Yes,3,2023-11-24,1,,Yes,2023-11-25,,Don’t know,Yes,Assured Shorthold Tenancy (AST) – Fixed term,,2,,4,Yes,35,Female,White,Irish,Tenant prefers not to say,,Other,Partner,32,Male,Not seeking work,Prefers not to say,Not known,Prefers not to say,Prefers not to say,Person prefers not to say,Not known,Person prefers not to say,Person prefers not to say,,,,,,,,,,,,,,,,,Yes – the person is a current or former regular,No – they left up to and including 5 years ago,Yes,No,Yes,Fully wheelchair accessible housing,Yes,No,No,No,No,No,No,Yes,No,No,Yes,No,No,No,No,No,No,No,Less than 1 year,1 year but under 2 years,Loss of tied accommodation,,Other supported housing,No,Yes,TN23 6LZ,Ashford,Yes,,Yes,,,,No,No,Yes,,Tenant applied directly (no referral or nomination),,No,268,Weekly,Universal Credit housing element,Yes,All,,No,Every 2 weeks,,,,,200.0,50.0,40.0,35.0,325.0,,,,Yes,12.0,,,,,,,,,,,,,,,,,,,,

spec/fixtures/files/sales_logs_csv_export_codes.csv

@@ -1,2 +1,2 @@
-id,status,duplicate_set_id,created_at,updated_at,old_form_id,collection_start_year,creation_method,is_dpo,owning_organisation_name,managing_organisation_name,created_by,day,month,year,purchid,ownershipsch,type,othtype,companybuy,buylivein,jointpur,jointmore,noint,uprn,uprn_confirmed,address_line1,address_line2,town_or_city,county,pcode1,pcode2,la_known,la,la_label,beds,proptype,builtype,pcodenk,wchair,privacynotice,age1,sex1,ethnic_group,ethnic,national,nationality_all,ecstat1,buy1livein,relat2,age2,sex2,ethnic_group2,ethnicbuy2,nationalbuy2,nationality_all_buyer2,ecstat2,buy2livein,hholdcount,relat3,age3,sex3,ecstat3,relat4,age4,sex4,ecstat4,relat5,age5,sex5,ecstat5,relat6,age6,sex6,ecstat6,prevten,ppcodenk,ppostc1,ppostc2,previous_la_known,prevloc,prevloc_label,pregyrha,pregother,pregla,pregghb,pregblank,buy2living,prevtenbuy2,hhregres,hhregresstill,armedforcesspouse,disabled,wheel,income1nk,income1,inc1mort,income2nk,income2,inc2mort,hb,savingsnk,savings,prevown,prevshared,proplen,staircase,stairbought,stairowned,staircasesale,resale,exday,exmonth,exyear,hoday,homonth,hoyear,lanomagr,soctenant,frombeds,fromprop,socprevten,value,equity,mortgageused,mortgage,mortgagelender,mortgagelenderother,mortlen,extrabor,deposit,cashdis,mrent,has_mscharge,mscharge,discount,grant
-,completed,,2023-12-08T00:00:00+00:00,2023-12-08T00:00:00+00:00,,2023,1,false,DLUHC,DLUHC,billyboy@eyeklaud.com,8,12,2023,,2,8,,,,1,1,2,,,Address line 1,,Town or city,,SW1A,1AA,1,E09000003,Barnet,2,1,1,0,1,1,30,X,17,17,18,,1,1,P,35,X,17,,13,,1,1,3,C,14,X,9,X,-9,X,3,R,-9,R,10,,,,,1,1,,,0,,,1,1,1,1,,3,,1,4,5,1,1,0,10000,1,0,10000,1,4,1,,1,2,10,,,,,,,,,,,,,,,,,110000.0,,1,20000.0,5,,10,1,80000.0,,,1,100.0,,10000.0
+id,status,duplicate_set_id,created_at,updated_at,old_form_id,collection_start_year,creation_method,is_dpo,owning_organisation_name,managing_organisation_name,created_by,day,month,year,purchid,ownershipsch,type,othtype,companybuy,buylivein,jointpur,jointmore,noint,privacynotice,uprn,uprn_confirmed,address_line1,address_line2,town_or_city,county,pcode1,pcode2,la_known,la,la_label,beds,proptype,builtype,pcodenk,wchair,age1,sex1,ethnic_group,ethnic,national,nationality_all,ecstat1,buy1livein,relat2,age2,sex2,ethnic_group2,ethnicbuy2,nationalbuy2,nationality_all_buyer2,ecstat2,buy2livein,hholdcount,relat3,age3,sex3,ecstat3,relat4,age4,sex4,ecstat4,relat5,age5,sex5,ecstat5,relat6,age6,sex6,ecstat6,prevten,ppcodenk,ppostc1,ppostc2,previous_la_known,prevloc,prevloc_label,pregyrha,pregother,pregla,pregghb,pregblank,buy2living,prevtenbuy2,hhregres,hhregresstill,armedforcesspouse,disabled,wheel,income1nk,income1,inc1mort,income2nk,income2,inc2mort,hb,savingsnk,savings,prevown,prevshared,proplen,staircase,stairbought,stairowned,staircasesale,resale,exday,exmonth,exyear,hoday,homonth,hoyear,lanomagr,soctenant,frombeds,fromprop,socprevten,value,equity,mortgageused,mortgage,mortgagelender,mortgagelenderother,mortlen,extrabor,deposit,cashdis,mrent,has_mscharge,mscharge,discount,grant
+,completed,,2023-12-08T00:00:00+00:00,2023-12-08T00:00:00+00:00,,2023,1,false,DLUHC,DLUHC,billyboy@eyeklaud.com,8,12,2023,,2,8,,,,1,1,2,1,,,Address line 1,,Town or city,,SW1A,1AA,1,E09000003,Barnet,2,1,1,0,1,30,X,17,17,18,,1,1,P,35,X,17,,13,,1,1,3,C,14,X,9,X,-9,X,3,R,-9,R,10,,,,,1,1,,,0,,,1,1,1,1,,3,,1,4,5,1,1,0,10000,1,0,10000,1,4,1,,1,2,10,,,,,,,,,,,,,,,,,110000.0,,1,20000.0,5,,10,1,80000.0,,,1,100.0,,10000.0

spec/fixtures/files/sales_logs_csv_export_labels.csv

@@ -1,2 +1,2 @@
-id,status,duplicate_set_id,created_at,updated_at,old_form_id,collection_start_year,creation_method,is_dpo,owning_organisation_name,managing_organisation_name,created_by,day,month,year,purchid,ownershipsch,type,othtype,companybuy,buylivein,jointpur,jointmore,noint,uprn,uprn_confirmed,address_line1,address_line2,town_or_city,county,pcode1,pcode2,la_known,la,la_label,beds,proptype,builtype,pcodenk,wchair,privacynotice,age1,sex1,ethnic_group,ethnic,national,nationality_all,ecstat1,buy1livein,relat2,age2,sex2,ethnic_group2,ethnicbuy2,nationalbuy2,nationality_all_buyer2,ecstat2,buy2livein,hholdcount,relat3,age3,sex3,ecstat3,relat4,age4,sex4,ecstat4,relat5,age5,sex5,ecstat5,relat6,age6,sex6,ecstat6,prevten,ppcodenk,ppostc1,ppostc2,previous_la_known,prevloc,prevloc_label,pregyrha,pregother,pregla,pregghb,pregblank,buy2living,prevtenbuy2,hhregres,hhregresstill,armedforcesspouse,disabled,wheel,income1nk,income1,inc1mort,income2nk,income2,inc2mort,hb,savingsnk,savings,prevown,prevshared,proplen,staircase,stairbought,stairowned,staircasesale,resale,exday,exmonth,exyear,hoday,homonth,hoyear,lanomagr,soctenant,frombeds,fromprop,socprevten,value,equity,mortgageused,mortgage,mortgagelender,mortgagelenderother,mortlen,extrabor,deposit,cashdis,mrent,has_mscharge,mscharge,discount,grant
-,completed,,2023-12-08T00:00:00+00:00,2023-12-08T00:00:00+00:00,,2023,single log,false,DLUHC,DLUHC,billyboy@eyeklaud.com,8,12,2023,,Yes - a discounted ownership scheme,Right to Acquire (RTA),,,,Yes,Yes,Yes,,,Address line 1,,Town or city,,SW1A,1AA,1,E09000003,Barnet,2,Flat or maisonette,Purpose built,0,Yes,1,30,Non-binary,Buyer 1 prefers not to say,17,United Kingdom,,Full-time - 30 hours or more,Yes,Partner,35,Non-binary,Buyer 2 prefers not to say,,Buyer prefers not to say,,Full-time - 30 hours or more,Yes,3,Child,14,Non-binary,Child under 16,Other,Not known,Non-binary,"In government training into work, such as New Deal",Prefers not to say,Not known,Prefers not to say,Prefers not to say,,,,,Local authority tenant,No,,,No,,,1,1,1,1,,Don't know,,Yes,Yes,No,Yes,Yes,Yes,10000,Yes,Yes,10000,Yes,"Don’t know ",No,,Yes,No,10,,,,,,,,,,,,,,,,,110000.0,,Yes,20000.0,Cambridge Building Society,,10,Yes,80000.0,,,Yes,100.0,,10000.0
+id,status,duplicate_set_id,created_at,updated_at,old_form_id,collection_start_year,creation_method,is_dpo,owning_organisation_name,managing_organisation_name,created_by,day,month,year,purchid,ownershipsch,type,othtype,companybuy,buylivein,jointpur,jointmore,noint,privacynotice,uprn,uprn_confirmed,address_line1,address_line2,town_or_city,county,pcode1,pcode2,la_known,la,la_label,beds,proptype,builtype,pcodenk,wchair,age1,sex1,ethnic_group,ethnic,national,nationality_all,ecstat1,buy1livein,relat2,age2,sex2,ethnic_group2,ethnicbuy2,nationalbuy2,nationality_all_buyer2,ecstat2,buy2livein,hholdcount,relat3,age3,sex3,ecstat3,relat4,age4,sex4,ecstat4,relat5,age5,sex5,ecstat5,relat6,age6,sex6,ecstat6,prevten,ppcodenk,ppostc1,ppostc2,previous_la_known,prevloc,prevloc_label,pregyrha,pregother,pregla,pregghb,pregblank,buy2living,prevtenbuy2,hhregres,hhregresstill,armedforcesspouse,disabled,wheel,income1nk,income1,inc1mort,income2nk,income2,inc2mort,hb,savingsnk,savings,prevown,prevshared,proplen,staircase,stairbought,stairowned,staircasesale,resale,exday,exmonth,exyear,hoday,homonth,hoyear,lanomagr,soctenant,frombeds,fromprop,socprevten,value,equity,mortgageused,mortgage,mortgagelender,mortgagelenderother,mortlen,extrabor,deposit,cashdis,mrent,has_mscharge,mscharge,discount,grant
+,completed,,2023-12-08T00:00:00+00:00,2023-12-08T00:00:00+00:00,,2023,single log,false,DLUHC,DLUHC,billyboy@eyeklaud.com,8,12,2023,,Yes - a discounted ownership scheme,Right to Acquire (RTA),,,,Yes,Yes,Yes,1,,,Address line 1,,Town or city,,SW1A,1AA,1,E09000003,Barnet,2,Flat or maisonette,Purpose built,0,Yes,30,Non-binary,Buyer 1 prefers not to say,17,United Kingdom,,Full-time - 30 hours or more,Yes,Partner,35,Non-binary,Buyer 2 prefers not to say,,Buyer prefers not to say,,Full-time - 30 hours or more,Yes,3,Child,14,Non-binary,Child under 16,Other,Not known,Non-binary,"In government training into work, such as New Deal",Prefers not to say,Not known,Prefers not to say,Prefers not to say,,,,,Local authority tenant,No,,,No,,,1,1,1,1,,Don't know,,Yes,Yes,No,Yes,Yes,Yes,10000,Yes,Yes,10000,Yes,"Don’t know ",No,,Yes,No,10,,,,,,,,,,,,,,,,,110000.0,,Yes,20000.0,Cambridge Building Society,,10,Yes,80000.0,,,Yes,100.0,,10000.0

spec/models/form/lettings/subsections/household_characteristics_spec.rb

@@ -6,144 +6,295 @@ RSpec.describe Form::Lettings::Subsections::HouseholdCharacteristics, type: :mod
   let(:subsection_id) { nil }
   let(:subsection_definition) { nil }
   let(:section) { instance_double(Form::Lettings::Sections::Household) }
+  let(:form) { instance_double(Form) }
+
+  before do
+    allow(section).to receive(:form).and_return(form)
+  end
 
   it "has correct section" do
     expect(household_characteristics.section).to eq(section)
   end
 
-  it "has correct pages" do
-    expect(household_characteristics.pages.map(&:id)).to eq(
-      %w[
-        declaration
-        household_members
-        no_females_pregnant_household_lead_hhmemb_value_check
-        females_in_soft_age_range_in_pregnant_household_lead_hhmemb_value_check
-        lead_tenant_age
-        no_females_pregnant_household_lead_age_value_check
-        females_in_soft_age_range_in_pregnant_household_lead_age_value_check
-        age_lead_tenant_under_retirement_value_check
-        age_lead_tenant_over_retirement_value_check
-        lead_tenant_gender_identity
-        no_females_pregnant_household_lead_value_check
-        females_in_soft_age_range_in_pregnant_household_lead_value_check
-        gender_lead_tenant_over_retirement_value_check
-        lead_tenant_ethnic_group
-        lead_tenant_ethnic_background_arab
-        lead_tenant_ethnic_background_asian
-        lead_tenant_ethnic_background_black
-        lead_tenant_ethnic_background_mixed
-        lead_tenant_ethnic_background_white
-        lead_tenant_nationality
-        lead_tenant_working_situation
-        working_situation_lead_tenant_under_retirement_value_check
-        working_situation_lead_tenant_over_retirement_value_check
-        person_2_known
-        person_2_relationship_to_lead
-        person_2_age_child
-        person_2_age_non_child
-        no_females_pregnant_household_person_2_age_value_check
-        females_in_soft_age_range_in_pregnant_household_person_2_age_value_check
-        age_2_under_retirement_value_check
-        age_2_over_retirement_value_check
-        person_2_gender_identity
-        no_females_pregnant_household_person_2_value_check
-        females_in_soft_age_range_in_pregnant_household_person_2_value_check
-        gender_2_over_retirement_value_check
-        person_2_working_situation
-        working_situation_2_under_retirement_value_check
-        working_situation_2_over_retirement_value_check
-        person_3_known
-        person_3_relationship_to_lead
-        person_3_age_child
-        person_3_age_non_child
-        no_females_pregnant_household_person_3_age_value_check
-        females_in_soft_age_range_in_pregnant_household_person_3_age_value_check
-        age_3_under_retirement_value_check
-        age_3_over_retirement_value_check
-        person_3_gender_identity
-        no_females_pregnant_household_person_3_value_check
-        females_in_soft_age_range_in_pregnant_household_person_3_value_check
-        gender_3_over_retirement_value_check
-        person_3_working_situation
-        working_situation_3_under_retirement_value_check
-        working_situation_3_over_retirement_value_check
-        person_4_known
-        person_4_relationship_to_lead
-        person_4_age_child
-        person_4_age_non_child
-        no_females_pregnant_household_person_4_age_value_check
-        females_in_soft_age_range_in_pregnant_household_person_4_age_value_check
-        age_4_under_retirement_value_check
-        age_4_over_retirement_value_check
-        person_4_gender_identity
-        no_females_pregnant_household_person_4_value_check
-        females_in_soft_age_range_in_pregnant_household_person_4_value_check
-        gender_4_over_retirement_value_check
-        person_4_working_situation
-        working_situation_4_under_retirement_value_check
-        working_situation_4_over_retirement_value_check
-        person_5_known
-        person_5_relationship_to_lead
-        person_5_age_child
-        person_5_age_non_child
-        no_females_pregnant_household_person_5_age_value_check
-        females_in_soft_age_range_in_pregnant_household_person_5_age_value_check
-        age_5_under_retirement_value_check
-        age_5_over_retirement_value_check
-        person_5_gender_identity
-        no_females_pregnant_household_person_5_value_check
-        females_in_soft_age_range_in_pregnant_household_person_5_value_check
-        gender_5_over_retirement_value_check
-        person_5_working_situation
-        working_situation_5_under_retirement_value_check
-        working_situation_5_over_retirement_value_check
-        person_6_known
-        person_6_relationship_to_lead
-        person_6_age_child
-        person_6_age_non_child
-        no_females_pregnant_household_person_6_age_value_check
-        females_in_soft_age_range_in_pregnant_household_person_6_age_value_check
-        age_6_under_retirement_value_check
-        age_6_over_retirement_value_check
-        person_6_gender_identity
-        no_females_pregnant_household_person_6_value_check
-        females_in_soft_age_range_in_pregnant_household_person_6_value_check
-        gender_6_over_retirement_value_check
-        person_6_working_situation
-        working_situation_6_under_retirement_value_check
-        working_situation_6_over_retirement_value_check
-        person_7_known
-        person_7_relationship_to_lead
-        person_7_age_child
-        person_7_age_non_child
-        no_females_pregnant_household_person_7_age_value_check
-        females_in_soft_age_range_in_pregnant_household_person_7_age_value_check
-        age_7_under_retirement_value_check
-        age_7_over_retirement_value_check
-        person_7_gender_identity
-        no_females_pregnant_household_person_7_value_check
-        females_in_soft_age_range_in_pregnant_household_person_7_value_check
-        gender_7_over_retirement_value_check
-        person_7_working_situation
-        working_situation_7_under_retirement_value_check
-        working_situation_7_over_retirement_value_check
-        person_8_known
-        person_8_relationship_to_lead
-        person_8_age_child
-        person_8_age_non_child
-        no_females_pregnant_household_person_8_age_value_check
-        females_in_soft_age_range_in_pregnant_household_person_8_age_value_check
-        age_8_under_retirement_value_check
-        age_8_over_retirement_value_check
-        person_8_gender_identity
-        no_females_pregnant_household_person_8_value_check
-        females_in_soft_age_range_in_pregnant_household_person_8_value_check
-        gender_8_over_retirement_value_check
-        person_8_working_situation
-        working_situation_8_under_retirement_value_check
-        working_situation_8_over_retirement_value_check
-      ],
-    )
+  context "with start year before 2024" do
+    before do
+      allow(form).to receive(:start_year_after_2024?).and_return(false)
+    end
+
+    it "has correct pages" do
+      expect(household_characteristics.pages.map(&:id)).to eq(
+        %w[
+          declaration
+          household_members
+          no_females_pregnant_household_lead_hhmemb_value_check
+          females_in_soft_age_range_in_pregnant_household_lead_hhmemb_value_check
+          lead_tenant_age
+          no_females_pregnant_household_lead_age_value_check
+          females_in_soft_age_range_in_pregnant_household_lead_age_value_check
+          age_lead_tenant_under_retirement_value_check
+          age_lead_tenant_over_retirement_value_check
+          lead_tenant_gender_identity
+          no_females_pregnant_household_lead_value_check
+          females_in_soft_age_range_in_pregnant_household_lead_value_check
+          gender_lead_tenant_over_retirement_value_check
+          lead_tenant_ethnic_group
+          lead_tenant_ethnic_background_arab
+          lead_tenant_ethnic_background_asian
+          lead_tenant_ethnic_background_black
+          lead_tenant_ethnic_background_mixed
+          lead_tenant_ethnic_background_white
+          lead_tenant_nationality
+          lead_tenant_working_situation
+          working_situation_lead_tenant_under_retirement_value_check
+          working_situation_lead_tenant_over_retirement_value_check
+          person_2_known
+          person_2_relationship_to_lead
+          person_2_age_child
+          person_2_age_non_child
+          no_females_pregnant_household_person_2_age_value_check
+          females_in_soft_age_range_in_pregnant_household_person_2_age_value_check
+          age_2_under_retirement_value_check
+          age_2_over_retirement_value_check
+          person_2_gender_identity
+          no_females_pregnant_household_person_2_value_check
+          females_in_soft_age_range_in_pregnant_household_person_2_value_check
+          gender_2_over_retirement_value_check
+          person_2_working_situation
+          working_situation_2_under_retirement_value_check
+          working_situation_2_over_retirement_value_check
+          person_3_known
+          person_3_relationship_to_lead
+          person_3_age_child
+          person_3_age_non_child
+          no_females_pregnant_household_person_3_age_value_check
+          females_in_soft_age_range_in_pregnant_household_person_3_age_value_check
+          age_3_under_retirement_value_check
+          age_3_over_retirement_value_check
+          person_3_gender_identity
+          no_females_pregnant_household_person_3_value_check
+          females_in_soft_age_range_in_pregnant_household_person_3_value_check
+          gender_3_over_retirement_value_check
+          person_3_working_situation
+          working_situation_3_under_retirement_value_check
+          working_situation_3_over_retirement_value_check
+          person_4_known
+          person_4_relationship_to_lead
+          person_4_age_child
+          person_4_age_non_child
+          no_females_pregnant_household_person_4_age_value_check
+          females_in_soft_age_range_in_pregnant_household_person_4_age_value_check
+          age_4_under_retirement_value_check
+          age_4_over_retirement_value_check
+          person_4_gender_identity
+          no_females_pregnant_household_person_4_value_check
+          females_in_soft_age_range_in_pregnant_household_person_4_value_check
+          gender_4_over_retirement_value_check
+          person_4_working_situation
+          working_situation_4_under_retirement_value_check
+          working_situation_4_over_retirement_value_check
+          person_5_known
+          person_5_relationship_to_lead
+          person_5_age_child
+          person_5_age_non_child
+          no_females_pregnant_household_person_5_age_value_check
+          females_in_soft_age_range_in_pregnant_household_person_5_age_value_check
+          age_5_under_retirement_value_check
+          age_5_over_retirement_value_check
+          person_5_gender_identity
+          no_females_pregnant_household_person_5_value_check
+          females_in_soft_age_range_in_pregnant_household_person_5_value_check
+          gender_5_over_retirement_value_check
+          person_5_working_situation
+          working_situation_5_under_retirement_value_check
+          working_situation_5_over_retirement_value_check
+          person_6_known
+          person_6_relationship_to_lead
+          person_6_age_child
+          person_6_age_non_child
+          no_females_pregnant_household_person_6_age_value_check
+          females_in_soft_age_range_in_pregnant_household_person_6_age_value_check
+          age_6_under_retirement_value_check
+          age_6_over_retirement_value_check
+          person_6_gender_identity
+          no_females_pregnant_household_person_6_value_check
+          females_in_soft_age_range_in_pregnant_household_person_6_value_check
+          gender_6_over_retirement_value_check
+          person_6_working_situation
+          working_situation_6_under_retirement_value_check
+          working_situation_6_over_retirement_value_check
+          person_7_known
+          person_7_relationship_to_lead
+          person_7_age_child
+          person_7_age_non_child
+          no_females_pregnant_household_person_7_age_value_check
+          females_in_soft_age_range_in_pregnant_household_person_7_age_value_check
+          age_7_under_retirement_value_check
+          age_7_over_retirement_value_check
+          person_7_gender_identity
+          no_females_pregnant_household_person_7_value_check
+          females_in_soft_age_range_in_pregnant_household_person_7_value_check
+          gender_7_over_retirement_value_check
+          person_7_working_situation
+          working_situation_7_under_retirement_value_check
+          working_situation_7_over_retirement_value_check
+          person_8_known
+          person_8_relationship_to_lead
+          person_8_age_child
+          person_8_age_non_child
+          no_females_pregnant_household_person_8_age_value_check
+          females_in_soft_age_range_in_pregnant_household_person_8_age_value_check
+          age_8_under_retirement_value_check
+          age_8_over_retirement_value_check
+          person_8_gender_identity
+          no_females_pregnant_household_person_8_value_check
+          females_in_soft_age_range_in_pregnant_household_person_8_value_check
+          gender_8_over_retirement_value_check
+          person_8_working_situation
+          working_situation_8_under_retirement_value_check
+          working_situation_8_over_retirement_value_check
+        ],
+      )
+    end
+  end
+
+  context "with start year >= 2024" do
+    before do
+      allow(form).to receive(:start_year_after_2024?).and_return(true)
+    end
+
+    it "has correct pages" do
+      expect(household_characteristics.pages.map(&:id)).to eq(
+        %w[
+          household_members
+          no_females_pregnant_household_lead_hhmemb_value_check
+          females_in_soft_age_range_in_pregnant_household_lead_hhmemb_value_check
+          lead_tenant_age
+          no_females_pregnant_household_lead_age_value_check
+          females_in_soft_age_range_in_pregnant_household_lead_age_value_check
+          age_lead_tenant_under_retirement_value_check
+          age_lead_tenant_over_retirement_value_check
+          lead_tenant_gender_identity
+          no_females_pregnant_household_lead_value_check
+          females_in_soft_age_range_in_pregnant_household_lead_value_check
+          gender_lead_tenant_over_retirement_value_check
+          lead_tenant_ethnic_group
+          lead_tenant_ethnic_background_arab
+          lead_tenant_ethnic_background_asian
+          lead_tenant_ethnic_background_black
+          lead_tenant_ethnic_background_mixed
+          lead_tenant_ethnic_background_white
+          lead_tenant_nationality
+          lead_tenant_working_situation
+          working_situation_lead_tenant_under_retirement_value_check
+          working_situation_lead_tenant_over_retirement_value_check
+          person_2_known
+          person_2_relationship_to_lead
+          person_2_age_child
+          person_2_age_non_child
+          no_females_pregnant_household_person_2_age_value_check
+          females_in_soft_age_range_in_pregnant_household_person_2_age_value_check
+          age_2_under_retirement_value_check
+          age_2_over_retirement_value_check
+          person_2_gender_identity
+          no_females_pregnant_household_person_2_value_check
+          females_in_soft_age_range_in_pregnant_household_person_2_value_check
+          gender_2_over_retirement_value_check
+          person_2_working_situation
+          working_situation_2_under_retirement_value_check
+          working_situation_2_over_retirement_value_check
+          person_3_known
+          person_3_relationship_to_lead
+          person_3_age_child
+          person_3_age_non_child
+          no_females_pregnant_household_person_3_age_value_check
+          females_in_soft_age_range_in_pregnant_household_person_3_age_value_check
+          age_3_under_retirement_value_check
+          age_3_over_retirement_value_check
+          person_3_gender_identity
+          no_females_pregnant_household_person_3_value_check
+          females_in_soft_age_range_in_pregnant_household_person_3_value_check
+          gender_3_over_retirement_value_check
+          person_3_working_situation
+          working_situation_3_under_retirement_value_check
+          working_situation_3_over_retirement_value_check
+          person_4_known
+          person_4_relationship_to_lead
+          person_4_age_child
+          person_4_age_non_child
+          no_females_pregnant_household_person_4_age_value_check
+          females_in_soft_age_range_in_pregnant_household_person_4_age_value_check
+          age_4_under_retirement_value_check
+          age_4_over_retirement_value_check
+          person_4_gender_identity
+          no_females_pregnant_household_person_4_value_check
+          females_in_soft_age_range_in_pregnant_household_person_4_value_check
+          gender_4_over_retirement_value_check
+          person_4_working_situation
+          working_situation_4_under_retirement_value_check
+          working_situation_4_over_retirement_value_check
+          person_5_known
+          person_5_relationship_to_lead
+          person_5_age_child
+          person_5_age_non_child
+          no_females_pregnant_household_person_5_age_value_check
+          females_in_soft_age_range_in_pregnant_household_person_5_age_value_check
+          age_5_under_retirement_value_check
+          age_5_over_retirement_value_check
+          person_5_gender_identity
+          no_females_pregnant_household_person_5_value_check
+          females_in_soft_age_range_in_pregnant_household_person_5_value_check
+          gender_5_over_retirement_value_check
+          person_5_working_situation
+          working_situation_5_under_retirement_value_check
+          working_situation_5_over_retirement_value_check
+          person_6_known
+          person_6_relationship_to_lead
+          person_6_age_child
+          person_6_age_non_child
+          no_females_pregnant_household_person_6_age_value_check
+          females_in_soft_age_range_in_pregnant_household_person_6_age_value_check
+          age_6_under_retirement_value_check
+          age_6_over_retirement_value_check
+          person_6_gender_identity
+          no_females_pregnant_household_person_6_value_check
+          females_in_soft_age_range_in_pregnant_household_person_6_value_check
+          gender_6_over_retirement_value_check
+          person_6_working_situation
+          working_situation_6_under_retirement_value_check
+          working_situation_6_over_retirement_value_check
+          person_7_known
+          person_7_relationship_to_lead
+          person_7_age_child
+          person_7_age_non_child
+          no_females_pregnant_household_person_7_age_value_check
+          females_in_soft_age_range_in_pregnant_household_person_7_age_value_check
+          age_7_under_retirement_value_check
+          age_7_over_retirement_value_check
+          person_7_gender_identity
+          no_females_pregnant_household_person_7_value_check
+          females_in_soft_age_range_in_pregnant_household_person_7_value_check
+          gender_7_over_retirement_value_check
+          person_7_working_situation
+          working_situation_7_under_retirement_value_check
+          working_situation_7_over_retirement_value_check
+          person_8_known
+          person_8_relationship_to_lead
+          person_8_age_child
+          person_8_age_non_child
+          no_females_pregnant_household_person_8_age_value_check
+          females_in_soft_age_range_in_pregnant_household_person_8_age_value_check
+          age_8_under_retirement_value_check
+          age_8_over_retirement_value_check
+          person_8_gender_identity
+          no_females_pregnant_household_person_8_value_check
+          females_in_soft_age_range_in_pregnant_household_person_8_value_check
+          gender_8_over_retirement_value_check
+          person_8_working_situation
+          working_situation_8_under_retirement_value_check
+          working_situation_8_over_retirement_value_check
+        ],
+      )
+    end
   end
 
   it "has the correct id" do

spec/models/form/lettings/subsections/setup_spec.rb

@@ -6,38 +6,45 @@ RSpec.describe Form::Lettings::Subsections::Setup, type: :model do
   let(:subsection_id) { nil }
   let(:subsection_definition) { nil }
   let(:section) { instance_double(Form::Lettings::Sections::Setup) }
+  let(:form) { instance_double(Form) }
+
+  before do
+    allow(section).to receive(:form).and_return(form)
+  end
 
   it "has correct section" do
     expect(setup.section).to eq(section)
   end
 
-  it "has correct pages" do
-    expect(setup.pages.map(&:id)).to eq(
-      %w[
-        stock_owner
-        managing_organisation
-        created_by
-        needs_type
-        scheme
-        location
-        renewal
-        tenancy_start_date
-        rent_type
-        tenant_code
-        property_reference
-      ],
-    )
-  end
+  context "with start year before 2024" do
+    before do
+      allow(form).to receive(:start_year_after_2024?).and_return(false)
+    end
 
-  it "has the correct id" do
-    expect(setup.id).to eq("setup")
+    it "has correct pages" do
+      expect(setup.pages.map(&:id)).to eq(
+        %w[
+          stock_owner
+          managing_organisation
+          created_by
+          needs_type
+          scheme
+          location
+          renewal
+          tenancy_start_date
+          rent_type
+          tenant_code
+          property_reference
+        ],
+      )
+    end
   end
 
-  it "has the correct label" do
-    expect(setup.label).to eq("Set up this lettings log")
-  end
+  context "with start year >= 2024" do
+    before do
+      allow(form).to receive(:start_year_after_2024?).and_return(true)
+    end
 
-  context "when not production" do
     it "has correct pages" do
       expect(setup.pages.map(&:id)).to eq(
         %w[
@@ -52,8 +59,17 @@ RSpec.describe Form::Lettings::Subsections::Setup, type: :model do
           rent_type
           tenant_code
           property_reference
+          declaration
         ],
       )
     end
   end
+
+  it "has the correct id" do
+    expect(setup.id).to eq("setup")
+  end
+
+  it "has the correct label" do
+    expect(setup.label).to eq("Set up this lettings log")
+  end
 end

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

@@ -6,6 +6,12 @@ RSpec.describe Form::Sales::Pages::PrivacyNotice, type: :model do
   let(:page_id) { nil }
   let(:page_definition) { nil }
   let(:subsection) { instance_double(Form::Subsection) }
+  let(:form) { instance_double(Form) }
+
+  before do
+    allow(subsection).to receive(:form).and_return(form)
+    allow(form).to receive(:start_year_after_2024?)
+  end
 
   it "has correct subsection" do
     expect(page.subsection).to eq(subsection)

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

@@ -240,7 +240,6 @@ RSpec.describe Form::Sales::Subsections::HouseholdCharacteristics, type: :model
     it "has correct pages" do
       expect(household_characteristics.pages.map(&:id)).to eq(
         %w[
-          privacy_notice
           buyer_1_age
           age_1_retirement_value_check
           age_1_old_persons_shared_ownership_value_check

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

@@ -68,6 +68,7 @@ RSpec.describe Form::Sales::Subsections::Setup, type: :model do
           joint_purchase
           number_joint_buyers
           buyer_interview
+          privacy_notice
         ],
       )
     end