<%= govuk_button_link_to create_test_log_href, class: "govuk-button" do %>
- New test log
+ New <%= current_collection_year_label %> test log
<% end %>
+ <% if FeatureToggle.allow_future_form_use? %>
+ <%= govuk_button_link_to create_next_year_test_log_href, class: "govuk-button" do %>
+ New <%= next_collection_year_label %> test log
+
+
+ <% end %>
+ <% end %>
<%= govuk_button_link_to create_setup_test_log_href, class: "govuk-button" do %>
- New test log (setup only)
+ New <%= current_collection_year_label %> test log (setup only)
<% end %>
+ <% if FeatureToggle.allow_future_form_use? %>
+ <%= govuk_button_link_to create_next_year_setup_test_log_href, class: "govuk-button" do %>
+ New <%= next_collection_year_label %> test log (setup only)
+
+
+ <% end %>
+ <% end %>
<%= govuk_button_link_to create_test_bulk_upload_href(2025), class: "govuk-button govuk-button--secondary" do %>
25/26 BU test file
diff --git a/app/components/create_log_actions_component.rb b/app/components/create_log_actions_component.rb
index ae240bc91..c618c01fc 100644
--- a/app/components/create_log_actions_component.rb
+++ b/app/components/create_log_actions_component.rb
@@ -1,5 +1,6 @@
class CreateLogActionsComponent < ViewComponent::Base
include Rails.application.routes.url_helpers
+ include CollectionTimeHelper
attr_reader :bulk_upload, :user, :log_type
@@ -38,10 +39,26 @@ class CreateLogActionsComponent < ViewComponent::Base
send("create_test_#{log_type}_log_path")
end
+ def create_next_year_test_log_href
+ send("create_next_year_test_#{log_type}_log_path")
+ end
+
def create_setup_test_log_href
send("create_setup_test_#{log_type}_log_path")
end
+ def create_next_year_setup_test_log_href
+ send("create_next_year_setup_test_#{log_type}_log_path")
+ end
+
+ def current_collection_year_label
+ "#{current_collection_start_year - 2000}/#{current_collection_end_year - 2000}"
+ end
+
+ def next_collection_year_label
+ "#{next_collection_start_year - 2000}/#{next_collection_end_year - 2000}"
+ end
+
def create_test_bulk_upload_href(year)
send("create_#{year}_test_#{log_type}_bulk_upload_path")
end
diff --git a/app/controllers/test_data_controller.rb b/app/controllers/test_data_controller.rb
index d9315d68c..5298a4fc7 100644
--- a/app/controllers/test_data_controller.rb
+++ b/app/controllers/test_data_controller.rb
@@ -10,6 +10,13 @@ class TestDataController < ApplicationController
redirect_to lettings_log_path(log)
end
+ def create_next_year_test_lettings_log
+ return render_not_found unless FeatureToggle.create_test_logs_enabled?
+
+ log = FactoryBot.create(:lettings_log, :completed, assigned_to: current_user, ppostcode_full: "SW1A 1AA", manual_address_entry_selected: false, startdate: generate_different_date_within_collection_year(Time.zone.local(next_collection_start_year, 4, 1)))
+ redirect_to lettings_log_path(log)
+ end
+
def create_setup_test_lettings_log
return render_not_found unless FeatureToggle.create_test_logs_enabled?
@@ -17,6 +24,13 @@ class TestDataController < ApplicationController
redirect_to lettings_log_path(log)
end
+ def create_next_year_setup_test_lettings_log
+ return render_not_found unless FeatureToggle.create_test_logs_enabled?
+
+ log = FactoryBot.create(:lettings_log, :setup_completed, assigned_to: current_user, manual_address_entry_selected: false, startdate: generate_different_date_within_collection_year(Time.zone.local(next_collection_start_year, 4, 1)))
+ redirect_to lettings_log_path(log)
+ end
+
%w[2025 2026].each do |year|
define_method("create_#{year}_test_lettings_bulk_upload") do
return render_not_found unless FeatureToggle.create_test_logs_enabled?
@@ -47,6 +61,13 @@ class TestDataController < ApplicationController
redirect_to sales_log_path(log)
end
+ def create_next_year_test_sales_log
+ return render_not_found unless FeatureToggle.create_test_logs_enabled?
+
+ log = FactoryBot.create(:sales_log, :completed, assigned_to: current_user, manual_address_entry_selected: false, saledate: generate_different_date_within_collection_year(Time.zone.local(next_collection_start_year, 4, 1)))
+ redirect_to sales_log_path(log)
+ end
+
def create_setup_test_sales_log
return render_not_found unless FeatureToggle.create_test_logs_enabled?
@@ -54,6 +75,13 @@ class TestDataController < ApplicationController
redirect_to sales_log_path(log)
end
+ def create_next_year_setup_test_sales_log
+ return render_not_found unless FeatureToggle.create_test_logs_enabled?
+
+ log = FactoryBot.create(:sales_log, :shared_ownership_setup_complete, assigned_to: current_user, manual_address_entry_selected: false, saledate: generate_different_date_within_collection_year(Time.zone.local(next_collection_start_year, 4, 1)))
+ redirect_to sales_log_path(log)
+ end
+
%w[2025 2026].each do |year|
define_method("create_#{year}_test_sales_bulk_upload") do
return render_not_found unless FeatureToggle.create_test_logs_enabled?
diff --git a/app/services/feature_toggle.rb b/app/services/feature_toggle.rb
index 4b2c440fc..e70528d3f 100644
--- a/app/services/feature_toggle.rb
+++ b/app/services/feature_toggle.rb
@@ -28,7 +28,7 @@ class FeatureToggle
end
def self.create_test_logs_enabled?
- Rails.env.development? || Rails.env.review?
+ Rails.env.development? || Rails.env.review? || Rails.env.staging?
end
def self.sales_export_enabled?
diff --git a/config/routes.rb b/config/routes.rb
index e0abecef1..a9ea0da42 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -405,11 +405,15 @@ Rails.application.routes.draw do
if FeatureToggle.create_test_logs_enabled?
get "create-test-lettings-log", to: "test_data#create_test_lettings_log"
+ get "create-next-year-test-lettings-log", to: "test_data#create_next_year_test_lettings_log"
get "create-setup-test-lettings-log", to: "test_data#create_setup_test_lettings_log"
+ get "create-next-year-setup-test-lettings-log", to: "test_data#create_next_year_setup_test_lettings_log"
get "create-2025-test-lettings-bulk-upload", to: "test_data#create_2025_test_lettings_bulk_upload"
get "create-2026-test-lettings-bulk-upload", to: "test_data#create_2026_test_lettings_bulk_upload"
get "create-test-sales-log", to: "test_data#create_test_sales_log"
+ get "create-next-year-test-sales-log", to: "test_data#create_next_year_test_sales_log"
get "create-setup-test-sales-log", to: "test_data#create_setup_test_sales_log"
+ get "create-next-year-setup-test-sales-log", to: "test_data#create_next_year_setup_test_sales_log"
get "create-2025-test-sales-bulk-upload", to: "test_data#create_2025_test_sales_bulk_upload"
get "create-2026-test-sales-bulk-upload", to: "test_data#create_2026_test_sales_bulk_upload"
end
From 02f319396b90a2b157cd2579532b92069d9a41ac Mon Sep 17 00:00:00 2001
From: Nat Dean-Lewis <94526761+natdeanlewissoftwire@users.noreply.github.com>
Date: Mon, 23 Feb 2026 10:43:55 +0000
Subject: [PATCH 2/2] CLDC-4140: remove old gender question lettings (#3177)
* CLDC-4141: copy person questions refactor from CLDC-4142
* CLDC-4141: remove gender same as sex and replace gender identity q
* CLDC-4141: replace sex with sexrab where relevant for 2026
* CLDC-4141: update download order
* CLDC-4140: remove sex from rowparser entirely
* CLDC-4140: keep sex in factory for now
* CLDC-4140: update household characteristics test
* CLDC-4140: update log variable spec
* CLDC-4140: update csv export tests
* CLDC-4140: update validator tests
* CLDC-4140: update row-parser spec
* CLDC-4140: update csv-parser spec
* CLDC-4140: update export spec
* CLDC-4140: update log var defs spec
* CLDC-4140: update export spec
* CLDC-4140: update row parser spec
* CLDC-4140: update validator spec
* CLDC-4140: update csv parser spec
* CLDC-4143: Update gender retirement validations
rename functions as the new wording is more related to those that identify as male and any other option
* CLDC-4143: Add 2026 tests
* CLDC-4143: Update legacy json files
causes issues with some old tests
* CLDC-4143: Add error mappings for gender fields
* CLDC-4143: Add new gender age retirement soft validation
replaces the many check pages from previous years with a single one
shows if either of the previous ones would show
has agreed wording on ticket
* fixup! CLDC-4143: Update gender retirement validations
improve gender comment wording
* CLDC-4143: Update non males validation name
reference to 'soft validation' we found confusing
* fixup! CLDC-4143: Add new gender age retirement soft validation
update subsection specs
* CLDC-4140: update parsers post merge
* CLDC-4140: update tests after field renumbering
* CLDC-4140: update tests after field renumbering
* CLDC-4140: update spacing in to_2026_row
* CLDC-4140: update row parser spec field numbers
* CLDC-4140: update row parser field types
---------
Co-authored-by: Samuel Young
---
.../bulk_upload/lettings_log_to_csv.rb | 35 +--
.../lettings_log_variables.rb | 2 +-
.../subsections/household_characteristics.rb | 4 +-
app/models/form/question.rb | 8 +
app/models/lettings_log.rb | 6 +-
.../lettings/year2026/csv_parser.rb | 2 +-
.../lettings/year2026/row_parser.rb | 251 ++++++++----------
.../exports/lettings_log_export_constants.rb | 17 +-
.../exports/general_needs_log_26_27.xml | 8 -
.../lettings_log_csv_export_codes_26.csv | 6 +-
.../lettings_log_csv_export_labels_26.csv | 6 +-
...gs_log_csv_export_non_support_codes_26.csv | 6 +-
...s_log_csv_export_non_support_labels_26.csv | 6 +-
.../household_characteristics_spec.rb | 8 -
.../bulk_upload/lettings/validator_spec.rb | 4 +-
.../lettings/year2026/csv_parser_spec.rb | 8 +-
.../lettings/year2026/row_parser_spec.rb | 244 ++++++++---------
.../csv/lettings_log_csv_service_spec.rb | 3 -
.../lettings_log_export_service_spec.rb | 18 +-
19 files changed, 299 insertions(+), 343 deletions(-)
diff --git a/app/helpers/bulk_upload/lettings_log_to_csv.rb b/app/helpers/bulk_upload/lettings_log_to_csv.rb
index ec36d1911..155fb9b12 100644
--- a/app/helpers/bulk_upload/lettings_log_to_csv.rb
+++ b/app/helpers/bulk_upload/lettings_log_to_csv.rb
@@ -144,40 +144,40 @@ class BulkUpload::LettingsLogToCsv
log.tenancylength,
log.age1 || overrides[:age1],
- log.sex1,
+ log.sexrab1,
log.ethnic,
log.nationality_all_group,
log.ecstat1,
relat_number(log.relat2),
log.age2 || overrides[:age2],
- log.sex2,
+ log.sexrab2,
log.ecstat2, # 50
relat_number(log.relat3),
log.age3 || overrides[:age3],
- log.sex3,
+ log.sexrab3,
log.ecstat3,
relat_number(log.relat4),
log.age4 || overrides[:age4],
- log.sex4,
+ log.sexrab4,
log.ecstat4,
relat_number(log.relat5),
log.age5 || overrides[:age5], # 60
- log.sex5,
+ log.sexrab5,
log.ecstat5,
relat_number(log.relat6),
log.age6 || overrides[:age6],
- log.sex6,
+ log.sexrab6,
log.ecstat6,
relat_number(log.relat7),
log.age7 || overrides[:age7],
- log.sex7,
+ log.sexrab7,
log.ecstat7, # 70
relat_number(log.relat8),
log.age8 || overrides[:age8],
- log.sex8,
+ log.sexrab8,
log.ecstat8,
log.armedforces,
log.leftreg,
@@ -239,18 +239,10 @@ class BulkUpload::LettingsLogToCsv
log.supcharg,
log.hbrentshortfall,
log.tshortfall,
+ log.gender_same_as_sex1, # 130
- log.sexrab1, # 130
- log.sexrab2,
- log.sexrab3,
- log.sexrab4,
- log.sexrab5,
- log.sexrab6,
- log.sexrab7,
- log.sexrab8,
- log.gender_same_as_sex1,
log.gender_description1,
- log.gender_same_as_sex2, # 140
+ log.gender_same_as_sex2,
log.gender_description2,
log.gender_same_as_sex3,
log.gender_description3,
@@ -258,15 +250,16 @@ class BulkUpload::LettingsLogToCsv
log.gender_description4,
log.gender_same_as_sex5,
log.gender_description5,
- log.gender_same_as_sex6,
+ log.gender_same_as_sex6, # 140
+
log.gender_description6,
- log.gender_same_as_sex7, # 150
+ log.gender_same_as_sex7,
log.gender_description7,
log.gender_same_as_sex8,
log.gender_description8,
log.owning_organisation.prp? ? log.referral_register : nil,
log.referral_noms,
- log.referral_org, # 156
+ log.referral_org, # 148
]
end
diff --git a/app/models/derived_variables/lettings_log_variables.rb b/app/models/derived_variables/lettings_log_variables.rb
index 1533c6400..19a58d916 100644
--- a/app/models/derived_variables/lettings_log_variables.rb
+++ b/app/models/derived_variables/lettings_log_variables.rb
@@ -300,7 +300,7 @@ private
end
def get_refused
- return 1 if details_unknown? || age_refused? || sex_refused? || relat_refused? || ecstat_refused?
+ return 1 if details_unknown? || age_refused? || sex_refused? || sexrab_refused? || relat_refused? || ecstat_refused?
0
end
diff --git a/app/models/form/lettings/subsections/household_characteristics.rb b/app/models/form/lettings/subsections/household_characteristics.rb
index ab8e639bc..e50a2c788 100644
--- a/app/models/form/lettings/subsections/household_characteristics.rb
+++ b/app/models/form/lettings/subsections/household_characteristics.rb
@@ -21,7 +21,7 @@ class Form::Lettings::Subsections::HouseholdCharacteristics < ::Form::Subsection
Form::Lettings::Pages::LeadTenantOverRetirementValueCheck.new("age_lead_tenant_over_retirement_value_check", nil, self),
(Form::Lettings::Pages::LeadTenantSexRegisteredAtBirth.new(nil, nil, self) if form.start_year_2026_or_later?),
(Form::Lettings::Pages::LeadTenantGenderSameAsSex.new(nil, nil, self) if form.start_year_2026_or_later?),
- Form::Lettings::Pages::LeadTenantGenderIdentity.new(nil, nil, self),
+ (Form::Lettings::Pages::LeadTenantGenderIdentity.new(nil, nil, self) unless form.start_year_2026_or_later?),
(Form::Lettings::Pages::NoFemalesPregnantHouseholdLeadValueCheck.new(nil, nil, self) unless form.start_year_2026_or_later?),
(Form::Lettings::Pages::FemalesInSoftAgeRangeInPregnantHouseholdLeadValueCheck.new(nil, nil, self) unless form.start_year_2026_or_later?),
(Form::Lettings::Pages::NoHouseholdMemberLikelyToBePregnantCheck.new("no_household_member_likely_to_be_pregnant_lead_check", nil, self, person_index: 1) if form.start_year_2026_or_later?),
@@ -63,7 +63,7 @@ class Form::Lettings::Subsections::HouseholdCharacteristics < ::Form::Subsection
(Form::Lettings::Pages::PartnerUnder16ValueCheck.new("age_#{person_index}_partner_under_16_value_check", nil, self, person_index:) if form.start_year_2024_or_later? && !form.start_year_2026_or_later?),
(Form::Lettings::Pages::PersonSexRegisteredAtBirth.new(nil, nil, self, person_index:) if form.start_year_2026_or_later?),
(Form::Lettings::Pages::PersonGenderSameAsSex.new(nil, nil, self, person_index:) if form.start_year_2026_or_later?),
- Form::Lettings::Pages::PersonGenderIdentity.new(nil, nil, self, person_index:),
+ (Form::Lettings::Pages::PersonGenderIdentity.new(nil, nil, self, person_index:) unless form.start_year_2026_or_later?),
(Form::Lettings::Pages::NoFemalesPregnantHouseholdPersonValueCheck.new(nil, nil, self, person_index:) unless form.start_year_2026_or_later?),
(Form::Lettings::Pages::FemalesInSoftAgeRangeInPregnantHouseholdPersonValueCheck.new(nil, nil, self, person_index:) unless form.start_year_2026_or_later?),
(Form::Lettings::Pages::NoHouseholdMemberLikelyToBePregnantCheck.new("no_household_member_likely_to_be_pregnant_person_#{person_index}_check", nil, self, person_index:) if form.start_year_2026_or_later?),
diff --git a/app/models/form/question.rb b/app/models/form/question.rb
index 81f690837..e5bc0c9a6 100644
--- a/app/models/form/question.rb
+++ b/app/models/form/question.rb
@@ -446,6 +446,14 @@ private
sex6: %w[R],
sex7: %w[R],
sex8: %w[R],
+ sexrab1: %w[R],
+ sexrab2: %w[R],
+ sexrab3: %w[R],
+ sexrab4: %w[R],
+ sexrab5: %w[R],
+ sexrab6: %w[R],
+ sexrab7: %w[R],
+ sexrab8: %w[R],
relat2: [3],
relat3: [3],
relat4: [3],
diff --git a/app/models/lettings_log.rb b/app/models/lettings_log.rb
index 7f1586f88..c3b72fbdd 100644
--- a/app/models/lettings_log.rb
+++ b/app/models/lettings_log.rb
@@ -687,7 +687,7 @@ class LettingsLog < Log
end
def has_any_person_details?(person_index)
- ["sex#{person_index}", "relat#{person_index}", "ecstat#{person_index}"].any? { |field| public_send(field).present? } || public_send("age#{person_index}_known") == 1
+ ["sex#{person_index}", "sexrab#{person_index}", "relat#{person_index}", "ecstat#{person_index}"].any? { |field| public_send(field).present? } || public_send("age#{person_index}_known") == 1
end
def details_not_known_for_person?(person_index)
@@ -911,6 +911,10 @@ private
[sex1, sex2, sex3, sex4, sex5, sex6, sex7, sex8].any?("R")
end
+ def sexrab_refused?
+ [sexrab1, sexrab2, sexrab3, sexrab4, sexrab5, sexrab6, sexrab7, sexrab8].any?("R")
+ end
+
def relat_refused?
[relat2, relat3, relat4, relat5, relat6, relat7, relat8].any?("R")
end
diff --git a/app/services/bulk_upload/lettings/year2026/csv_parser.rb b/app/services/bulk_upload/lettings/year2026/csv_parser.rb
index e8e91a6ca..643990c8b 100644
--- a/app/services/bulk_upload/lettings/year2026/csv_parser.rb
+++ b/app/services/bulk_upload/lettings/year2026/csv_parser.rb
@@ -4,7 +4,7 @@ class BulkUpload::Lettings::Year2026::CsvParser
include CollectionTimeHelper
# TODO: CLDC-4162: Update when 2026 format is known
- FIELDS = 156
+ FIELDS = 148
FORM_YEAR = 2026
attr_reader :path
diff --git a/app/services/bulk_upload/lettings/year2026/row_parser.rb b/app/services/bulk_upload/lettings/year2026/row_parser.rb
index 5930f75fd..b73bf792a 100644
--- a/app/services/bulk_upload/lettings/year2026/row_parser.rb
+++ b/app/services/bulk_upload/lettings/year2026/row_parser.rb
@@ -47,37 +47,37 @@ class BulkUpload::Lettings::Year2026::RowParser
field_40: "If 'Other', what is the type of tenancy?",
field_41: "What is the length of the fixed-term tenancy to the nearest year?",
field_42: "What is the lead tenant’s age?",
- field_43: "Which of these best describes the lead tenant’s gender identity?",
+ field_43: "Lead tenant's sex, as registered at birth",
field_44: "Which of these best describes the lead tenant’s ethnic background?",
field_45: "What is the lead tenant’s nationality?",
field_46: "Which of these best describes the lead tenant’s working situation?",
field_47: "Is person 2 the partner of the lead tenant?",
field_48: "What is person 2’s age?",
- field_49: "Which of these best describes person 2’s gender identity?",
+ field_49: "Person 2's sex, as registered at birth",
field_50: "Which of these best describes person 2’s working situation?",
field_51: "Is person 3 the partner of the lead tenant?",
field_52: "What is person 3’s age?",
- field_53: "Which of these best describes person 3’s gender identity?",
+ field_53: "Person 3's sex, as registered at birth",
field_54: "Which of these best describes person 3’s working situation?",
field_55: "Is person 4 the partner of the lead tenant?",
field_56: "What is person 4’s age?",
- field_57: "Which of these best describes person 4’s gender identity?",
+ field_57: "Person 4's sex, as registered at birth",
field_58: "Which of these best describes person 4’s working situation?",
field_59: "Is person 5 the partner of the lead tenant?",
field_60: "What is person 5’s age?",
- field_61: "Which of these best describes person 5’s gender identity?",
+ field_61: "Person 5's sex, as registered at birth",
field_62: "Which of these best describes person 5’s working situation?",
field_63: "Is person 6 the partner of the lead tenant?",
field_64: "What is person 6’s age?",
- field_65: "Which of these best describes person 6’s gender identity?",
+ field_65: "Person 6's sex, as registered at birth",
field_66: "Which of these best describes person 6’s working situation?",
field_67: "Is person 7 the partner of the lead tenant?",
field_68: "What is person 7’s age?",
- field_69: "Which of these best describes person 7’s gender identity?",
+ field_69: "Person 7's sex, as registered at birth",
field_70: "Which of these best describes person 7’s working situation?",
field_71: "Is person 8 the partner of the lead tenant?",
field_72: "What is person 8’s age?",
- field_73: "Which of these best describes person 8’s gender identity?",
+ field_73: "Person 8's sex, as registered at birth",
field_74: "Which of these best describes person 8’s working situation?",
field_75: "Does anybody in the household have links to the UK armed forces?",
field_76: "Is this person still serving in the UK armed forces?",
@@ -135,34 +135,26 @@ class BulkUpload::Lettings::Year2026::RowParser
field_128: "After the household has received any housing-related benefits, will they still need to pay for rent and charges?",
field_129: "What do you expect the outstanding amount to be?",
- field_130: "Lead tenant's sex, as registered at birth",
- field_131: "Person 2's sex, as registered at birth",
- field_132: "Person 3's sex, as registered at birth",
- field_133: "Person 4's sex, as registered at birth",
- field_134: "Person 5's sex, as registered at birth",
- field_135: "Person 6's sex, as registered at birth",
- field_136: "Person 7's sex, as registered at birth",
- field_137: "Person 8's sex, as registered at birth",
- field_138: "Is the gender the lead tenant identifies with the same as their sex registered at birth?",
- field_139: "If 'No', enter the lead tenant's gender identity",
- field_140: "Is the gender person 2 identifies with the same as their sex registered at birth?",
- field_141: "If 'No', enter person 2's gender identity",
- field_142: "Is the gender person 3 identifies with the same as their sex registered at birth?",
- field_143: "If 'No', enter person 3's gender identity",
- field_144: "Is the gender person 4 identifies with the same as their sex registered at birth?",
- field_145: "If 'No', enter person 4's gender identity",
- field_146: "Is the gender person 5 identifies with the same as their sex registered at birth?",
- field_147: "If 'No', enter person 5's gender identity",
- field_148: "Is the gender person 6 identifies with the same as their sex registered at birth?",
- field_149: "If 'No', enter person 6's gender identity",
- field_150: "Is the gender person 7 identifies with the same as their sex registered at birth?",
- field_151: "If 'No', enter person 7's gender identity",
- field_152: "Is the gender person 8 identifies with the same as their sex registered at birth?",
- field_153: "If 'No', enter person 8's gender identity",
-
- field_154: "What was the source of referral for this letting? - PRP properties part 1",
- field_155: "What was the source of referral for this letting? - PRP properties part 2",
- field_156: "What was the source of referral for this letting? - PRP properties part 3",
+ field_130: "Is the gender the lead tenant identifies with the same as their sex registered at birth?",
+ field_131: "If 'No', enter the lead tenant's gender identity",
+ field_132: "Is the gender person 2 identifies with the same as their sex registered at birth?",
+ field_133: "If 'No', enter person 2's gender identity",
+ field_134: "Is the gender person 3 identifies with the same as their sex registered at birth?",
+ field_135: "If 'No', enter person 3's gender identity",
+ field_136: "Is the gender person 4 identifies with the same as their sex registered at birth?",
+ field_137: "If 'No', enter person 4's gender identity",
+ field_138: "Is the gender person 5 identifies with the same as their sex registered at birth?",
+ field_139: "If 'No', enter person 5's gender identity",
+ field_140: "Is the gender person 6 identifies with the same as their sex registered at birth?",
+ field_141: "If 'No', enter person 6's gender identity",
+ field_142: "Is the gender person 7 identifies with the same as their sex registered at birth?",
+ field_143: "If 'No', enter person 7's gender identity",
+ field_144: "Is the gender person 8 identifies with the same as their sex registered at birth?",
+ field_145: "If 'No', enter person 8's gender identity",
+
+ field_146: "What was the source of referral for this letting? - PRP properties part 1",
+ field_147: "What was the source of referral for this letting? - PRP properties part 2",
+ field_148: "What was the source of referral for this letting? - PRP properties part 3",
}.freeze
RENT_TYPE_BU_MAPPING = {
@@ -312,13 +304,13 @@ class BulkUpload::Lettings::Year2026::RowParser
attribute :field_128, :integer
attribute :field_129, :decimal
- attribute :field_130, :string
+ attribute :field_130, :integer
attribute :field_131, :string
- attribute :field_132, :string
+ attribute :field_132, :integer
attribute :field_133, :string
- attribute :field_134, :string
+ attribute :field_134, :integer
attribute :field_135, :string
- attribute :field_136, :string
+ attribute :field_136, :integer
attribute :field_137, :string
attribute :field_138, :integer
attribute :field_139, :string
@@ -328,18 +320,10 @@ class BulkUpload::Lettings::Year2026::RowParser
attribute :field_143, :string
attribute :field_144, :integer
attribute :field_145, :string
+
attribute :field_146, :integer
- attribute :field_147, :string
+ attribute :field_147, :integer
attribute :field_148, :integer
- attribute :field_149, :string
- attribute :field_150, :integer
- attribute :field_151, :string
- attribute :field_152, :integer
- attribute :field_153, :string
-
- attribute :field_154, :integer
- attribute :field_155, :integer
- attribute :field_156, :integer
validate :validate_valid_radio_option, on: :before_log
@@ -597,8 +581,7 @@ class BulkUpload::Lettings::Year2026::RowParser
!supported_housing? ? "field_23" : nil, # postcode # TODO: CLDC-4119: add postcode to hash for supported housing
!supported_housing? ? "field_24" : nil, # postcode # TODO: CLDC-4119: add postcode to hash for supported housing
"field_42", # age1
- "field_43", # sex1
- "field_130", # sexrab1
+ "field_43", # sexrab1
"field_46", # ecstat1
)
if [field_124, field_125, field_126, field_127].all?(&:present?)
@@ -748,7 +731,6 @@ private
"startdate",
"age1",
"sexrab1",
- "sex1",
"ecstat1",
"owning_organisation",
"tcharge",
@@ -1030,8 +1012,7 @@ private
errors.add(:field_24, error_message) unless supported_housing? # postcode_full # TODO: CLDC-4119: add postcode to error fields for supported housing
errors.add(:field_25, error_message) unless supported_housing? # la # TODO: CLDC-4119: add LA to error fields for supported housing
errors.add(:field_42, error_message) # age1
- errors.add(:field_130, error_message) # sexrab1
- errors.add(:field_43, error_message) # sex1
+ errors.add(:field_43, error_message) # sexrab1
errors.add(:field_46, error_message) # ecstat1
errors.add(:field_122, error_message) unless general_needs? # household_charge
errors.add(:field_124, error_message) # brent
@@ -1051,31 +1032,31 @@ private
def field_referral_register_prp_valid?
if owning_organisation&.prp?
- [5, 6, 7, 8, 9].include?(field_154)
+ [5, 6, 7, 8, 9].include?(field_146)
else
- field_154.blank?
+ field_146.blank?
end
end
def field_referral_noms_valid?
- case field_154
+ case field_146
when 6
- [1, 2, 3, 4].include?(field_155)
+ [1, 2, 3, 4].include?(field_147)
when 7
- [5, 6, 7, 8].include?(field_155)
+ [5, 6, 7, 8].include?(field_147)
else
- field_155.blank?
+ field_147.blank?
end
end
def field_referral_org_valid?
- case field_155
+ case field_147
when 1
- [1, 2, 3, 4, 5, 6, 7, 8, 9, 10].include?(field_156)
+ [1, 2, 3, 4, 5, 6, 7, 8, 9, 10].include?(field_148)
when 7
- [11, 12, 13, 14, 15, 16, 17, 18, 19, 20].include?(field_156)
+ [11, 12, 13, 14, 15, 16, 17, 18, 19, 20].include?(field_148)
else
- field_156.blank?
+ field_148.blank?
end
end
@@ -1087,7 +1068,7 @@ private
return if renewal?
return if referral_fields_valid?
- %i[field_116 field_154 field_155 field_156].each do |field|
+ %i[field_116 field_146 field_147 field_148].each do |field|
errors.add(field, I18n.t("#{ERROR_BASE_KEY}.referral.invalid_option"))
end
end
@@ -1140,14 +1121,14 @@ private
age8_known: %i[field_72],
age8: %i[field_72],
- sex1: %i[field_43],
- sex2: %i[field_49],
- sex3: %i[field_53],
- sex4: %i[field_57],
- sex5: %i[field_61],
- sex6: %i[field_65],
- sex7: %i[field_69],
- sex8: %i[field_73],
+ sexrab1: %i[field_43],
+ sexrab2: %i[field_49],
+ sexrab3: %i[field_53],
+ sexrab4: %i[field_57],
+ sexrab5: %i[field_61],
+ sexrab6: %i[field_65],
+ sexrab7: %i[field_69],
+ sexrab8: %i[field_73],
ethnic_group: %i[field_44],
ethnic: %i[field_44],
@@ -1204,9 +1185,9 @@ private
accessible_register: %i[field_115],
letting_allocation: %i[field_112 field_113 field_114 field_115],
- referral_register: %i[field_116 field_154],
- referral_noms: %i[field_155],
- referral_org: %i[field_156],
+ referral_register: %i[field_116 field_146],
+ referral_noms: %i[field_147],
+ referral_org: %i[field_148],
net_income_known: %i[field_117],
incfreq: %i[field_118],
@@ -1255,30 +1236,22 @@ private
county: [:field_22],
uprn_selection: [:field_19],
- sexrab1: %i[field_130],
- sexrab2: %i[field_131],
- sexrab3: %i[field_132],
- sexrab4: %i[field_133],
- sexrab5: %i[field_134],
- sexrab6: %i[field_135],
- sexrab7: %i[field_136],
- sexrab8: %i[field_137],
- gender_same_as_sex1: %i[field_138],
- gender_same_as_sex2: %i[field_140],
- gender_same_as_sex3: %i[field_142],
- gender_same_as_sex4: %i[field_144],
- gender_same_as_sex5: %i[field_146],
- gender_same_as_sex6: %i[field_148],
- gender_same_as_sex7: %i[field_150],
- gender_same_as_sex8: %i[field_152],
- gender_description1: %i[field_139],
- gender_description2: %i[field_141],
- gender_description3: %i[field_143],
- gender_description4: %i[field_145],
- gender_description5: %i[field_147],
- gender_description6: %i[field_149],
- gender_description7: %i[field_151],
- gender_description8: %i[field_153],
+ gender_same_as_sex1: %i[field_130],
+ gender_same_as_sex2: %i[field_132],
+ gender_same_as_sex3: %i[field_134],
+ gender_same_as_sex4: %i[field_136],
+ gender_same_as_sex5: %i[field_138],
+ gender_same_as_sex6: %i[field_140],
+ gender_same_as_sex7: %i[field_142],
+ gender_same_as_sex8: %i[field_144],
+ gender_description1: %i[field_131],
+ gender_description2: %i[field_133],
+ gender_description3: %i[field_135],
+ gender_description4: %i[field_137],
+ gender_description5: %i[field_139],
+ gender_description6: %i[field_141],
+ gender_description7: %i[field_143],
+ gender_description8: %i[field_145],
}.compact
end
@@ -1340,14 +1313,14 @@ private
attributes["age8_known"] = age8_known?
attributes["age8"] = field_72 if attributes["age8_known"]&.zero? && field_72&.match(/\A\d{1,3}\z|\AR\z/)
- attributes["sex1"] = field_43
- attributes["sex2"] = field_49
- attributes["sex3"] = field_53
- attributes["sex4"] = field_57
- attributes["sex5"] = field_61
- attributes["sex6"] = field_65
- attributes["sex7"] = field_69
- attributes["sex8"] = field_73
+ attributes["sexrab1"] = field_43
+ attributes["sexrab2"] = field_49
+ attributes["sexrab3"] = field_53
+ attributes["sexrab4"] = field_57
+ attributes["sexrab5"] = field_61
+ attributes["sexrab6"] = field_65
+ attributes["sexrab7"] = field_69
+ attributes["sexrab8"] = field_73
attributes["ethnic_group"] = ethnic_group_from_ethnic
attributes["ethnic"] = field_44
@@ -1486,30 +1459,22 @@ private
attributes["postcode_full_input"] = postcode_full
attributes["select_best_address_match"] = true if field_18.blank?
- attributes["sexrab1"] = field_130
- attributes["sexrab2"] = field_131
- attributes["sexrab3"] = field_132
- attributes["sexrab4"] = field_133
- attributes["sexrab5"] = field_134
- attributes["sexrab6"] = field_135
- attributes["sexrab7"] = field_136
- attributes["sexrab8"] = field_137
- attributes["gender_same_as_sex1"] = field_138
- attributes["gender_description1"] = field_139
- attributes["gender_same_as_sex2"] = field_140
- attributes["gender_description2"] = field_141
- attributes["gender_same_as_sex3"] = field_142
- attributes["gender_description3"] = field_143
- attributes["gender_same_as_sex4"] = field_144
- attributes["gender_description4"] = field_145
- attributes["gender_same_as_sex5"] = field_146
- attributes["gender_description5"] = field_147
- attributes["gender_same_as_sex6"] = field_148
- attributes["gender_description6"] = field_149
- attributes["gender_same_as_sex7"] = field_150
- attributes["gender_description7"] = field_151
- attributes["gender_same_as_sex8"] = field_152
- attributes["gender_description8"] = field_153
+ attributes["gender_same_as_sex1"] = field_130
+ attributes["gender_description1"] = field_131
+ attributes["gender_same_as_sex2"] = field_132
+ attributes["gender_description2"] = field_133
+ attributes["gender_same_as_sex3"] = field_134
+ attributes["gender_description3"] = field_135
+ attributes["gender_same_as_sex4"] = field_136
+ attributes["gender_description4"] = field_137
+ attributes["gender_same_as_sex5"] = field_138
+ attributes["gender_description5"] = field_139
+ attributes["gender_same_as_sex6"] = field_140
+ attributes["gender_description6"] = field_141
+ attributes["gender_same_as_sex7"] = field_142
+ attributes["gender_description7"] = field_143
+ attributes["gender_same_as_sex8"] = field_144
+ attributes["gender_description8"] = field_145
attributes
end
@@ -1617,31 +1582,31 @@ private
end
def person_2_present?
- field_47.present? || field_48.present? || field_49.present? || field_131.present? || field_140.present? || field_141.present?
+ field_47.present? || field_48.present? || field_49.present? || field_132.present? || field_133.present?
end
def person_3_present?
- field_51.present? || field_52.present? || field_53.present? || field_132.present? || field_142.present? || field_143.present?
+ field_51.present? || field_52.present? || field_53.present? || field_134.present? || field_135.present?
end
def person_4_present?
- field_55.present? || field_56.present? || field_57.present? || field_133.present? || field_144.present? || field_145.present?
+ field_55.present? || field_56.present? || field_57.present? || field_136.present? || field_137.present?
end
def person_5_present?
- field_59.present? || field_60.present? || field_61.present? || field_134.present? || field_146.present? || field_147.present?
+ field_59.present? || field_60.present? || field_61.present? || field_138.present? || field_139.present?
end
def person_6_present?
- field_63.present? || field_64.present? || field_65.present? || field_135.present? || field_148.present? || field_149.present?
+ field_63.present? || field_64.present? || field_65.present? || field_140.present? || field_141.present?
end
def person_7_present?
- field_67.present? || field_68.present? || field_69.present? || field_136.present? || field_150.present? || field_151.present?
+ field_67.present? || field_68.present? || field_69.present? || field_142.present? || field_143.present?
end
def person_8_present?
- field_71.present? || field_72.present? || field_73.present? || field_137.present? || field_152.present? || field_153.present?
+ field_71.present? || field_72.present? || field_73.present? || field_144.present? || field_145.present?
end
def leftreg
@@ -1847,7 +1812,7 @@ private
if owning_organisation.la?
field_116
else
- field_154
+ field_146
end
end
@@ -1856,7 +1821,7 @@ private
return unless referral_fields_valid?
if owning_organisation.prp?
- field_155
+ field_147
end
end
@@ -1865,7 +1830,7 @@ private
return unless referral_fields_valid?
if owning_organisation.prp?
- field_156
+ field_148
end
end
end
diff --git a/app/services/exports/lettings_log_export_constants.rb b/app/services/exports/lettings_log_export_constants.rb
index 99f73d143..f4d426a35 100644
--- a/app/services/exports/lettings_log_export_constants.rb
+++ b/app/services/exports/lettings_log_export_constants.rb
@@ -140,7 +140,6 @@ module Exports::LettingsLogExportConstants
(1..8).each do |index|
ALL_YEAR_EXPORT_FIELDS << "age#{index}"
ALL_YEAR_EXPORT_FIELDS << "ecstat#{index}"
- ALL_YEAR_EXPORT_FIELDS << "sex#{index}"
end
(2..8).each do |index|
ALL_YEAR_EXPORT_FIELDS << "relat#{index}"
@@ -159,6 +158,9 @@ module Exports::LettingsLogExportConstants
"offered",
"referral",
]
+ (1..8).each do |index|
+ YEAR_2021_EXPORT_FIELDS << "sex#{index}"
+ end
YEAR_2022_EXPORT_FIELDS = Set[
"builtype",
@@ -167,6 +169,9 @@ module Exports::LettingsLogExportConstants
"offered",
"referral",
]
+ (1..8).each do |index|
+ YEAR_2022_EXPORT_FIELDS << "sex#{index}"
+ end
YEAR_2023_EXPORT_FIELDS = Set[
"builtype",
@@ -175,6 +180,9 @@ module Exports::LettingsLogExportConstants
"offered",
"referral",
]
+ (1..8).each do |index|
+ YEAR_2023_EXPORT_FIELDS << "sex#{index}"
+ end
YEAR_2024_EXPORT_FIELDS = Set[
"builtype",
@@ -196,6 +204,9 @@ module Exports::LettingsLogExportConstants
"carehome_charges_value_check",
"referral",
]
+ (1..8).each do |index|
+ YEAR_2024_EXPORT_FIELDS << "sex#{index}"
+ end
YEAR_2025_EXPORT_FIELDS = Set[
"builtype",
@@ -215,6 +226,9 @@ module Exports::LettingsLogExportConstants
"supcharg_value_check",
"referral",
]
+ (1..8).each do |index|
+ YEAR_2025_EXPORT_FIELDS << "sex#{index}"
+ end
YEAR_2026_EXPORT_FIELDS = Set[
"accessible_register",
@@ -235,7 +249,6 @@ module Exports::LettingsLogExportConstants
"referral_noms",
"referral_org",
]
-
(1..8).each do |index|
YEAR_2026_EXPORT_FIELDS << "sexrab#{index}"
YEAR_2026_EXPORT_FIELDS << "gender_same_as_sex#{index}"
diff --git a/spec/fixtures/exports/general_needs_log_26_27.xml b/spec/fixtures/exports/general_needs_log_26_27.xml
index d92f74f10..eecae061d 100644
--- a/spec/fixtures/exports/general_needs_log_26_27.xml
+++ b/spec/fixtures/exports/general_needs_log_26_27.xml
@@ -5,7 +5,6 @@
BZ737
35
F
- F
1
2
@@ -14,43 +13,36 @@
2
32
M
- M
2
Non-binary
6
32 ", "-9 ")
@@ -180,7 +180,7 @@ RSpec.describe Exports::LettingsLogExportService do
end
context "and one lettings log is available for export" do
- let!(:lettings_log) { FactoryBot.create(:lettings_log, :completed, assigned_to: user, age1: 35, sex1: "F", age2: 32, sex2: "M", uprn_known: 1, uprn: "100023336956", propcode: "123", postcode_full: "SE2 6RT", ppostcode_full: "SE2 6RT", tenancycode: "BZ737", startdate: Time.zone.local(2023, 4, 2, 10, 36, 49), voiddate: Time.zone.local(2021, 11, 3), mrcdate: Time.zone.local(2022, 5, 5, 10, 36, 49), tenancylength: 5, underoccupation_benefitcap: 4) }
+ let!(:lettings_log) { FactoryBot.create(:lettings_log, :completed, assigned_to: user, age1: 35, sex1: "F", sexrab1: nil, age2: 32, sex2: "M", sexrab2: nil, uprn_known: 1, uprn: "100023336956", propcode: "123", postcode_full: "SE2 6RT", ppostcode_full: "SE2 6RT", tenancycode: "BZ737", startdate: Time.zone.local(2023, 4, 2, 10, 36, 49), voiddate: Time.zone.local(2021, 11, 3), mrcdate: Time.zone.local(2022, 5, 5, 10, 36, 49), tenancylength: 5, underoccupation_benefitcap: 4) }
let(:expected_zip_filename) { "core_2023_2024_apr_mar_f0001_inc0001.zip" }
let(:expected_data_filename) { "core_2023_2024_apr_mar_f0001_inc0001_pt001.xml" }
let(:xml_export_file) { File.open("spec/fixtures/exports/general_needs_log_23_24.xml", "r:UTF-8") }
@@ -400,7 +400,7 @@ RSpec.describe Exports::LettingsLogExportService do
end
context "and one lettings log with duplicate reference is available for export" do
- let!(:lettings_log) { FactoryBot.create(:lettings_log, :completed, assigned_to: user, age1: 35, sex1: "F", age2: 32, sex2: "M", propcode: "123", ppostcode_full: "SE2 6RT", postcode_full: "NW1 5TY", town_or_city: "London", tenancycode: "BZ737", startdate: Time.zone.local(2022, 2, 2, 10, 36, 49), voiddate: Time.zone.local(2019, 11, 3), mrcdate: Time.zone.local(2020, 5, 5, 10, 36, 49), tenancylength: 5, underoccupation_benefitcap: 4, duplicate_set_id: 123) }
+ let!(:lettings_log) { FactoryBot.create(:lettings_log, :completed, assigned_to: user, age1: 35, sex1: "F", sexrab1: nil, age2: 32, sex2: "M", sexrab2: nil, propcode: "123", ppostcode_full: "SE2 6RT", postcode_full: "NW1 5TY", town_or_city: "London", tenancycode: "BZ737", startdate: Time.zone.local(2022, 2, 2, 10, 36, 49), voiddate: Time.zone.local(2019, 11, 3), mrcdate: Time.zone.local(2020, 5, 5, 10, 36, 49), tenancylength: 5, underoccupation_benefitcap: 4, duplicate_set_id: 123) }
def replace_duplicate_set_id(export_file)
export_file.sub!("123 ")
@@ -433,7 +433,7 @@ RSpec.describe Exports::LettingsLogExportService do
end
context "and one lettings log is available for export" do
- let!(:lettings_log) { FactoryBot.create(:lettings_log, :completed, assigned_to: user, age1: 35, sex1: "F", age2: 32, sex2: "M", ppostcode_full: "A1 1AA", nationality_all_group: 13, propcode: "123", postcode_full: "SE2 6RT", tenancycode: "BZ737", startdate: Time.zone.local(2024, 4, 2, 10, 36, 49), voiddate: Time.zone.local(2021, 11, 3), mrcdate: Time.zone.local(2022, 5, 5, 10, 36, 49), tenancylength: 5, underoccupation_benefitcap: 4, creation_method: 2, bulk_upload_id: 1, address_line1_as_entered: "address line 1 as entered", address_line2_as_entered: "address line 2 as entered", town_or_city_as_entered: "town or city as entered", county_as_entered: "county as entered", postcode_full_as_entered: "AB1 2CD", la_as_entered: "la as entered", manual_address_entry_selected: false, uprn: "1", uprn_known: 1) }
+ let!(:lettings_log) { FactoryBot.create(:lettings_log, :completed, assigned_to: user, age1: 35, sex1: "F", sexrab1: nil, age2: 32, sex2: "M", sexrab2: nil, ppostcode_full: "A1 1AA", nationality_all_group: 13, propcode: "123", postcode_full: "SE2 6RT", tenancycode: "BZ737", startdate: Time.zone.local(2024, 4, 2, 10, 36, 49), voiddate: Time.zone.local(2021, 11, 3), mrcdate: Time.zone.local(2022, 5, 5, 10, 36, 49), tenancylength: 5, underoccupation_benefitcap: 4, creation_method: 2, bulk_upload_id: 1, address_line1_as_entered: "address line 1 as entered", address_line2_as_entered: "address line 2 as entered", town_or_city_as_entered: "town or city as entered", county_as_entered: "county as entered", postcode_full_as_entered: "AB1 2CD", la_as_entered: "la as entered", manual_address_entry_selected: false, uprn: "1", uprn_known: 1) }
let(:expected_zip_filename) { "core_2024_2025_apr_mar_f0001_inc0001.zip" }
let(:expected_data_filename) { "core_2024_2025_apr_mar_f0001_inc0001_pt001.xml" }
let(:xml_export_file) { File.open("spec/fixtures/exports/general_needs_log_24_25.xml", "r:UTF-8") }
@@ -465,7 +465,7 @@ RSpec.describe Exports::LettingsLogExportService do
end
context "and one lettings log is available for export" do
- let!(:lettings_log) { FactoryBot.create(:lettings_log, :completed, startdate: Time.zone.local(2025, 4, 3), assigned_to: user, age1: 35, sex1: "F", age2: 32, sex2: "M", ppostcode_full: "A1 1AA", nationality_all_group: 13, propcode: "123", postcode_full: "SE2 6RT", tenancycode: "BZ737", voiddate: Time.zone.local(2021, 11, 3), mrcdate: Time.zone.local(2022, 5, 5, 10, 36, 49), tenancylength: 5, underoccupation_benefitcap: 4, creation_method: 2, bulk_upload_id: 1, address_line1_as_entered: "address line 1 as entered", address_line2_as_entered: "address line 2 as entered", town_or_city_as_entered: "town or city as entered", county_as_entered: "county as entered", postcode_full_as_entered: "AB1 2CD", la_as_entered: "la as entered", manual_address_entry_selected: false, uprn: "1", uprn_known: 1) }
+ let!(:lettings_log) { FactoryBot.create(:lettings_log, :completed, startdate: Time.zone.local(2025, 4, 3), assigned_to: user, age1: 35, sex1: "F", sexrab1: nil, age2: 32, sex2: "M", sexrab2: nil, ppostcode_full: "A1 1AA", nationality_all_group: 13, propcode: "123", postcode_full: "SE2 6RT", tenancycode: "BZ737", voiddate: Time.zone.local(2021, 11, 3), mrcdate: Time.zone.local(2022, 5, 5, 10, 36, 49), tenancylength: 5, underoccupation_benefitcap: 4, creation_method: 2, bulk_upload_id: 1, address_line1_as_entered: "address line 1 as entered", address_line2_as_entered: "address line 2 as entered", town_or_city_as_entered: "town or city as entered", county_as_entered: "county as entered", postcode_full_as_entered: "AB1 2CD", la_as_entered: "la as entered", manual_address_entry_selected: false, uprn: "1", uprn_known: 1) }
let(:expected_zip_filename) { "core_2025_2026_apr_mar_f0001_inc0001.zip" }
let(:expected_data_filename) { "core_2025_2026_apr_mar_f0001_inc0001_pt001.xml" }
let(:xml_export_file) { File.open("spec/fixtures/exports/general_needs_log_25_26.xml", "r:UTF-8") }
@@ -505,10 +505,10 @@ RSpec.describe Exports::LettingsLogExportService do
assigned_to: user,
age1: 35,
sexrab1: "F",
- sex1: "F",
+ sex1: nil,
age2: 32,
sexrab2: "M",
- sex2: "M",
+ sex2: nil,
ppostcode_full: "A1 1AA",
nationality_all_group: 13,
propcode: "123",
@@ -643,7 +643,7 @@ RSpec.describe Exports::LettingsLogExportService do
let(:scheme) { FactoryBot.create(:scheme, :export, owning_organisation: organisation) }
let(:location) { FactoryBot.create(:location, :export, scheme:, startdate: Time.zone.local(2021, 4, 1), old_id: "1a") }
- let(:lettings_log) { FactoryBot.create(:lettings_log, :completed, :export, :sh, scheme:, location:, assigned_to: user, updated_by: other_user, owning_organisation: organisation, age1: 35, sex1: "F", age2: 32, sex2: "M", startdate: Time.zone.local(2022, 2, 2, 10, 36, 49), voiddate: Time.zone.local(2019, 11, 3), mrcdate: Time.zone.local(2020, 5, 5, 10, 36, 49), underoccupation_benefitcap: 4, sheltered: 1) }
+ let(:lettings_log) { FactoryBot.create(:lettings_log, :completed, :export, :sh, scheme:, location:, assigned_to: user, updated_by: other_user, owning_organisation: organisation, age1: 35, sex1: "F", sexrab1: nil, age2: 32, sex2: "M", sexrab2: nil, startdate: Time.zone.local(2022, 2, 2, 10, 36, 49), voiddate: Time.zone.local(2019, 11, 3), mrcdate: Time.zone.local(2020, 5, 5, 10, 36, 49), underoccupation_benefitcap: 4, sheltered: 1) }
before do
lettings_log.postcode_full = nil