There are 7 or 8 rows of content in the templates. These rows are called the ‘headers’. They contain the CORE form questions and guidance about which questions are required and how to format your answers.
+ <%= govuk_link_to "Download the lettings bulk upload template (2024 to 2025)", @form.template_path %>
+ There are 8 rows of content in the templates. These rows are called the ‘headers’. They contain the CORE form questions and guidance about which questions are required and how to format your answers.
There are 7 or 8 rows of content in the templates. These rows are called the ‘headers’. They contain the CORE form questions and guidance about which questions are required and how to format your answers.
+ <%= govuk_link_to "Download the sales bulk upload template (2024 to 2025)", @form.template_path %>: In this template, the questions are in the same order as the 2024/25 paper form and web form.
+ There are 8 rows of content in the templates. These rows are called the ‘headers’. They contain the CORE form questions and guidance about which questions are required and how to format your answers.
For each collection year, we publish a bulk upload template and specification.
- The bulk upload templates contain 7 or 8 rows of ‘headers’ with information about how to fill in the template, including:
+ <% if @form.year == 2023 %>
+ The bulk upload templates contain 7 or 8 rows of ‘headers’ with information about how to fill in the template, including:
+ <% else %>
+ The bulk upload templates contain 8 rows of ‘headers’ with information about how to fill in the template, including:
+ <% end %>
- the CORE form questions and their field numbers
@@ -39,23 +43,28 @@
You can paste your data below the headers or copy the headers and insert them above the data in your file. The bulk upload fields start at column B. Leave column A blank.
Make sure that each column of data aligns with the corresponding question in the headers. We recommend ordering your data to match the headers, but you can also reorder the headers to match your data. When processing the file, we check what each column of data represents based on the headers above.
- For 2023/24 uploads, there are 2 templates to choose from, a new template and a legacy template. They outline suggested ways of ordering your data.
- You must include the headers in your file when you upload, unless your data matches the exact order of the legacy template. If you choose to remove the headers, you must also remove the blank column A.
+ <% if @form.year == 2023 %>
+ For 2023/24 uploads, there are 2 templates to choose from, a new template and a legacy template. They outline suggested ways of ordering your data.
+ You must include the headers in your file when you upload, unless your data matches the exact order of the legacy template. If you choose to remove the headers, you must also remove the blank column A.
- New template: In this template, the questions are in the same order as the 2023/24 paper form and web form. Use this template if your organisation is new to bulk upload or if your housing management system matches the new column ordering.
- <%= govuk_link_to "Download the lettings bulk upload template (2023 to 2024) – New question ordering", @form.lettings_template_path %>
- <%= govuk_link_to "Download the sales bulk upload template (2023 to 2024) – New question ordering", @form.sales_template_path %>
+ New template: In this template, the questions are in the same order as the 2023/24 paper form and web form. Use this template if your organisation is new to bulk upload or if your housing management system matches the new column ordering.
+ <%= govuk_link_to "Download the lettings bulk upload template (2023 to 2024) – New question ordering", @form.lettings_template_path %>
+ <%= govuk_link_to "Download the sales bulk upload template (2023 to 2024) – New question ordering", @form.sales_template_path %>
- Legacy template: In this template, the questions are in the same order as the 2022/23 template, with new questions added on to the end. Use this template if you have not updated your system to match the new template yet.
- <%= govuk_link_to "Download the lettings bulk upload template (2023 to 2024) - Legacy version", @form.lettings_legacy_template_path %>
- <%= govuk_link_to "Download the sales bulk upload template (2023 to 2024) – Legacy version", @form.sales_legacy_template_path %>
+ Legacy template: In this template, the questions are in the same order as the 2022/23 template, with new questions added on to the end. Use this template if you have not updated your system to match the new template yet.
+ <%= govuk_link_to "Download the lettings bulk upload template (2023 to 2024) - Legacy version", @form.lettings_legacy_template_path %>
+ <%= govuk_link_to "Download the sales bulk upload template (2023 to 2024) – Legacy version", @form.sales_legacy_template_path %>
+ <% else %>
+ <%= govuk_link_to "Download the lettings bulk upload template (2024 to 2025)", @form.lettings_template_path %>
+ <%= govuk_link_to "Download the sales bulk upload template (2024 to 2025)", @form.sales_template_path %>
+ <% end %>
<% end %>
<%= accordion.with_section(heading_text: "Using the bulk upload specification") do %>
The bulk upload specification contains the same information as the template headers, as well as more details about the accepted responses for each question. For multiple-choice questions, we use number or letter codes to represent each option, and the specification shows what answer each code represents.
There is a separate specification for lettings and sales:
- <%= govuk_link_to "Download the lettings bulk upload specification (2023 to 2024)", @form.lettings_specification_path, target: "_blank" %>
- <%= govuk_link_to "Download the sales bulk upload specification (2023 to 2024)", @form.sales_specification_path, target: "_blank" %>
+ <%= govuk_link_to "Download the lettings bulk upload specification (#{@form.year} to #{@form.year + 1})", @form.lettings_specification_path, target: "_blank" %>
+ <%= govuk_link_to "Download the sales bulk upload specification (#{@form.year} to #{@form.year + 1})", @form.sales_specification_path, target: "_blank" %>
If your upload fails because there are errors in the data, you can use the specification to help correct the errors. Having your file, the error report, and the specification open at the same time will make it easy to cross-reference field numbers and check accepted responses.
<% end %>
diff --git a/spec/requests/bulk_upload_lettings_logs_controller_spec.rb b/spec/requests/bulk_upload_lettings_logs_controller_spec.rb
index f901cdb7e..afc5577c3 100644
--- a/spec/requests/bulk_upload_lettings_logs_controller_spec.rb
+++ b/spec/requests/bulk_upload_lettings_logs_controller_spec.rb
@@ -49,7 +49,7 @@ RSpec.describe BulkUploadLettingsLogsController, type: :request do
it "shows guidance page with correct title" do
Timecop.freeze(2022, 1, 1) do
- get "/lettings-logs/bulk-upload-logs/guidance", params: {}
+ get "/lettings-logs/bulk-upload-logs/guidance?form%5Byear%5D=2022", params: {}
expect(response.body).to include("How to upload logs in bulk")
end
@@ -59,7 +59,7 @@ RSpec.describe BulkUploadLettingsLogsController, type: :request do
context "when in crossover period" do
it "shows guidance page with correct title" do
Timecop.freeze(2023, 6, 1) do
- get "/lettings-logs/bulk-upload-logs/guidance", params: {}
+ get "/lettings-logs/bulk-upload-logs/guidance?form%5Byear%5D=2023", params: {}
expect(response.body).to include("How to upload logs in bulk")
end
diff --git a/spec/requests/bulk_upload_sales_logs_controller_spec.rb b/spec/requests/bulk_upload_sales_logs_controller_spec.rb
index 3220ff885..c603ec821 100644
--- a/spec/requests/bulk_upload_sales_logs_controller_spec.rb
+++ b/spec/requests/bulk_upload_sales_logs_controller_spec.rb
@@ -49,7 +49,7 @@ RSpec.describe BulkUploadSalesLogsController, type: :request do
it "shows guidance page with correct title" do
Timecop.freeze(2022, 1, 1) do
- get "/sales-logs/bulk-upload-logs/guidance", params: {}
+ get "/sales-logs/bulk-upload-logs/guidance?form%5Byear%5D=2022", params: {}
expect(response.body).to include("How to upload logs in bulk")
end
@@ -59,7 +59,7 @@ RSpec.describe BulkUploadSalesLogsController, type: :request do
context "when in crossover period" do
it "shows guidance page with correct title" do
Timecop.freeze(2023, 6, 1) do
- get "/sales-logs/bulk-upload-logs/guidance", params: {}
+ get "/sales-logs/bulk-upload-logs/guidance?form%5Byear%5D=2023", params: {}
expect(response.body).to include("How to upload logs in bulk")
end
From a3fb5313c0299d5fb92fce195885435338f5c429 Mon Sep 17 00:00:00 2001
From: kosiakkatrina <54268893+kosiakkatrina@users.noreply.github.com>
Date: Wed, 7 Feb 2024 12:36:19 +0000
Subject: [PATCH 06/13] CLDC-3175 Add max stairbought validation (#2204)
* Add max stairbought validation
* refactor tests
---
.../sales/sale_information_validations.rb | 19 +++++
config/locales/en.yml | 2 +
.../sale_information_validations_spec.rb | 69 +++++++++++++++++++
3 files changed, 90 insertions(+)
diff --git a/app/models/validations/sales/sale_information_validations.rb b/app/models/validations/sales/sale_information_validations.rb
index 54d49b7e0..17fbc95b4 100644
--- a/app/models/validations/sales/sale_information_validations.rb
+++ b/app/models/validations/sales/sale_information_validations.rb
@@ -64,4 +64,23 @@ module Validations::Sales::SaleInformationValidations
record.errors.add :grant, I18n.t("validations.sale_information.grant.out_of_range")
end
end
+
+ def validate_stairbought(record)
+ return unless record.stairbought && record.type
+ return unless record.saledate && record.form.start_year_after_2024?
+
+ max_stairbought = case record.type
+ when 30, 16, 28, 31, 32
+ 90
+ when 2, 18
+ 75
+ when 24
+ 50
+ end
+
+ if max_stairbought && record.stairbought > max_stairbought
+ record.errors.add :stairbought, I18n.t("validations.sale_information.stairbought.over_max", max_stairbought:, type: record.form.get_question("type", record).answer_label(record))
+ record.errors.add :type, I18n.t("validations.sale_information.stairbought.over_max", max_stairbought:, type: record.form.get_question("type", record).answer_label(record))
+ end
+ end
end
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 7fc5f9d57..c7d8c9da2 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -617,6 +617,8 @@ en:
higher_than_expected: "Basic monthly rent must be between £0.00 and £9,999.00"
grant:
out_of_range: "Loan, grants or subsidies must be between £9,000 and £16,000"
+ stairbought:
+ over_max: "The percentage bought in this staircasing transaction cannot be higher than %{max_stairbought}% for %{type} sales."
merge_request:
organisation_part_of_another_merge: "This organisation is part of another merge - select a different one"
organisation_not_selected: "Select an organisation from the search list"
diff --git a/spec/models/validations/sales/sale_information_validations_spec.rb b/spec/models/validations/sales/sale_information_validations_spec.rb
index c890afed1..25474e55b 100644
--- a/spec/models/validations/sales/sale_information_validations_spec.rb
+++ b/spec/models/validations/sales/sale_information_validations_spec.rb
@@ -539,4 +539,73 @@ RSpec.describe Validations::Sales::SaleInformationValidations do
end
end
end
+
+ describe "#validate_stairbought" do
+ let(:now) { Time.zone.local(2024, 4, 4) }
+
+ before do
+ Timecop.freeze(now)
+ Singleton.__init__(FormHandler)
+ end
+
+ after do
+ Timecop.return
+ Singleton.__init__(FormHandler)
+ end
+
+ [
+ ["Shared Ownership (new model lease)", 30, 90],
+ ["Home Ownership for people with Long-Term Disabilities (HOLD)", 16, 90],
+ ["Rent to Buy — Shared Ownership", 28, 90],
+ ["Right to Shared Ownership (RtSO)", 31, 90],
+ ["London Living Rent — Shared Ownership", 32, 90],
+ ["Shared Ownership (old model lease)", 2, 75],
+ ["Social HomeBuy — shared ownership purchase", 18, 75],
+ ["Older Persons Shared Ownership", 24, 50],
+ ].each do |label, type, max|
+ context "when ownership type is #{label}" do
+ let(:record) { build(:sales_log, ownershipsch: 1, type:, saledate: now) }
+
+ it "does not add an error if stairbought is under #{max}%" do
+ record.stairbought = max - 1
+ sale_information_validator.validate_stairbought(record)
+
+ expect(record.errors).to be_empty
+ end
+
+ it "does not add an error if stairbought is #{max}%" do
+ record.stairbought = max
+ sale_information_validator.validate_stairbought(record)
+
+ expect(record.errors).to be_empty
+ end
+
+ it "does not add an error if stairbought is not given" do
+ record.stairbought = nil
+ sale_information_validator.validate_stairbought(record)
+
+ expect(record.errors).to be_empty
+ end
+
+ it "adds an error if stairbought is over #{max}%" do
+ record.stairbought = max + 2
+ sale_information_validator.validate_stairbought(record)
+
+ expect(record.errors[:stairbought]).to include("The percentage bought in this staircasing transaction cannot be higher than #{max}% for #{label} sales.")
+ expect(record.errors[:type]).to include("The percentage bought in this staircasing transaction cannot be higher than #{max}% for #{label} sales.")
+ end
+ end
+ end
+
+ context "when the collection year is before 2024" do
+ let(:record) { build(:sales_log, ownershipsch: 1, type: 24, saledate: now, stairbought: 90) }
+ let(:now) { Time.zone.local(2023, 4, 4) }
+
+ it "does not add an error" do
+ sale_information_validator.validate_stairbought(record)
+
+ expect(record.errors).to be_empty
+ end
+ end
+ end
end
From 7a9291dac957e0c8b42a28d9d1b2a16d89cdf270 Mon Sep 17 00:00:00 2001
From: kosiakkatrina <54268893+kosiakkatrina@users.noreply.github.com>
Date: Wed, 7 Feb 2024 14:05:30 +0000
Subject: [PATCH 07/13] CLDC-3172 Update routing for staircase transactions
(#2203)
* Update routing for LaNominations
* Update routing for buyer previous
* Extract a method
* lint
---
app/models/form/sales/pages/buyer_previous.rb | 6 ++
app/models/form/sales/pages/la_nominations.rb | 6 ++
app/models/sales_log.rb | 4 ++
.../form/sales/pages/buyer_previous_spec.rb | 57 +++++++++++++++++++
.../form/sales/pages/la_nominations_spec.rb | 53 +++++++++++++++++
5 files changed, 126 insertions(+)
diff --git a/app/models/form/sales/pages/buyer_previous.rb b/app/models/form/sales/pages/buyer_previous.rb
index f37c6a847..ed28cea00 100644
--- a/app/models/form/sales/pages/buyer_previous.rb
+++ b/app/models/form/sales/pages/buyer_previous.rb
@@ -10,4 +10,10 @@ class Form::Sales::Pages::BuyerPrevious < ::Form::Page
Form::Sales::Questions::BuyerPrevious.new(nil, nil, self, joint_purchase: @joint_purchase),
]
end
+
+ def routed_to?(log, _current_user)
+ return false if log.is_staircase? && log.form.start_year_after_2024?
+
+ super
+ end
end
diff --git a/app/models/form/sales/pages/la_nominations.rb b/app/models/form/sales/pages/la_nominations.rb
index e756e3071..0ac2cde75 100644
--- a/app/models/form/sales/pages/la_nominations.rb
+++ b/app/models/form/sales/pages/la_nominations.rb
@@ -9,4 +9,10 @@ class Form::Sales::Pages::LaNominations < ::Form::Page
Form::Sales::Questions::LaNominations.new(nil, nil, self),
]
end
+
+ def routed_to?(log, _current_user)
+ return false if log.staircase == 1 && log.form.start_year_after_2024?
+
+ super
+ end
end
diff --git a/app/models/sales_log.rb b/app/models/sales_log.rb
index 3f47dea80..c0202c1df 100644
--- a/app/models/sales_log.rb
+++ b/app/models/sales_log.rb
@@ -477,4 +477,8 @@ class SalesLog < Log
def nationality2_uk_or_prefers_not_to_say?
nationality_all_buyer2_group&.zero? || nationality_all_buyer2_group == 826
end
+
+ def is_staircase?
+ staircase == 1
+ end
end
diff --git a/spec/models/form/sales/pages/buyer_previous_spec.rb b/spec/models/form/sales/pages/buyer_previous_spec.rb
index e6dda073e..4d7df21a6 100644
--- a/spec/models/form/sales/pages/buyer_previous_spec.rb
+++ b/spec/models/form/sales/pages/buyer_previous_spec.rb
@@ -3,11 +3,21 @@ require "rails_helper"
RSpec.describe Form::Sales::Pages::BuyerPrevious, type: :model do
subject(:page) { described_class.new(page_id, page_definition, subsection, joint_purchase:) }
+ let(:log) { create(:sales_log, :completed) }
+
let(:page_id) { "example" }
let(:page_definition) { nil }
let(:subsection) { instance_double(Form::Subsection) }
+ let(:form) { instance_double(Form) }
let(:joint_purchase) { false }
+ before do
+ allow(subsection).to receive(:depends_on).and_return(nil)
+ allow(subsection).to receive(:enabled?).and_return(true)
+ allow(subsection).to receive(:form).and_return(form)
+ allow(form).to receive(:depends_on_met).and_return(true)
+ end
+
it "has correct subsection" do
expect(page.subsection).to eq(subsection)
end
@@ -41,4 +51,51 @@ RSpec.describe Form::Sales::Pages::BuyerPrevious, type: :model do
expect(page.depends_on).to eq([{ "joint_purchase?" => false }])
end
end
+
+ context "with 23/24 log" do
+ before do
+ Timecop.freeze(Time.zone.local(2023, 4, 2))
+ Singleton.__init__(FormHandler)
+ end
+
+ after do
+ Timecop.return
+ end
+
+ it "has correct routed to" do
+ log.staircase = 1
+ expect(page.routed_to?(log, nil)).to eq(true)
+ end
+ end
+
+ context "with 24/25 log" do
+ before do
+ Timecop.freeze(Time.zone.local(2024, 4, 2))
+ Singleton.__init__(FormHandler)
+ end
+
+ after do
+ Timecop.return
+ end
+
+ it "has correct routed to when staircase is yes" do
+ log.staircase = 1
+ expect(page.routed_to?(log, nil)).to eq(false)
+ end
+
+ it "has correct routed to when staircase is nil" do
+ log.staircase = nil
+ expect(page.routed_to?(log, nil)).to eq(true)
+ end
+
+ it "has correct routed to when staircase is no" do
+ log.staircase = 2
+ expect(page.routed_to?(log, nil)).to eq(true)
+ end
+
+ it "has correct routed to when staircase is don't know" do
+ log.staircase = 3
+ expect(page.routed_to?(log, nil)).to eq(true)
+ end
+ end
end
diff --git a/spec/models/form/sales/pages/la_nominations_spec.rb b/spec/models/form/sales/pages/la_nominations_spec.rb
index b7b40c2dd..ab41d7f94 100644
--- a/spec/models/form/sales/pages/la_nominations_spec.rb
+++ b/spec/models/form/sales/pages/la_nominations_spec.rb
@@ -3,10 +3,16 @@ require "rails_helper"
RSpec.describe Form::Sales::Pages::LaNominations, type: :model do
subject(:page) { described_class.new(page_id, page_definition, subsection) }
+ let(:log) { create(:sales_log, :completed) }
+
let(:page_id) { nil }
let(:page_definition) { nil }
let(:subsection) { instance_double(Form::Subsection) }
+ before do
+ allow(subsection).to receive(:depends_on).and_return(nil)
+ end
+
it "has correct subsection" do
expect(page.subsection).to eq(subsection)
end
@@ -26,4 +32,51 @@ RSpec.describe Form::Sales::Pages::LaNominations, type: :model do
it "has the correct description" do
expect(page.description).to be_nil
end
+
+ context "with 23/24 log" do
+ before do
+ Timecop.freeze(Time.zone.local(2023, 4, 2))
+ Singleton.__init__(FormHandler)
+ end
+
+ after do
+ Timecop.return
+ end
+
+ it "has correct routed to" do
+ log.staircase = 1
+ expect(page.routed_to?(log, nil)).to eq(true)
+ end
+ end
+
+ context "with 24/25 log" do
+ before do
+ Timecop.freeze(Time.zone.local(2024, 4, 2))
+ Singleton.__init__(FormHandler)
+ end
+
+ after do
+ Timecop.return
+ end
+
+ it "has correct routed to when staircase is yes" do
+ log.staircase = 1
+ expect(page.routed_to?(log, nil)).to eq(false)
+ end
+
+ it "has correct routed to when staircase is nil" do
+ log.staircase = nil
+ expect(page.routed_to?(log, nil)).to eq(true)
+ end
+
+ it "has correct routed to when staircase is no" do
+ log.staircase = 2
+ expect(page.routed_to?(log, nil)).to eq(true)
+ end
+
+ it "has correct routed to when staircase is don't know" do
+ log.staircase = 3
+ expect(page.routed_to?(log, nil)).to eq(true)
+ end
+ end
end
From 9fdb4cee93a2d67f29485afcf172e09cbf71bb36 Mon Sep 17 00:00:00 2001
From: Rachael Booth
Date: Wed, 7 Feb 2024 14:56:24 +0000
Subject: [PATCH 08/13] CLDC-3169: Infer soctenant from prevten / prevtenbuy2
(#2200)
* CLDC-3169: Infer soctentant from prevten
* Avoid default soctenant value
* Explicitly ensure soctenant nil for non shared ownership in bulk upload
* Fix linting
---
.../derived_variables/sales_log_variables.rb | 14 +++++
app/models/form/sales/pages/buyer_previous.rb | 2 +-
.../form/sales/questions/buyer_previous.rb | 4 ++
app/models/sales_log.rb | 4 ++
.../bulk_upload/sales/year2024/row_parser.rb | 13 ++++-
.../form/sales/pages/buyer_previous_spec.rb | 4 +-
.../sales/questions/buyer_previous_spec.rb | 31 +++++++++--
.../sales/year2024/row_parser_spec.rb | 52 +++++++++++++++++--
8 files changed, 112 insertions(+), 12 deletions(-)
diff --git a/app/models/derived_variables/sales_log_variables.rb b/app/models/derived_variables/sales_log_variables.rb
index 12d860492..f662ab3df 100644
--- a/app/models/derived_variables/sales_log_variables.rb
+++ b/app/models/derived_variables/sales_log_variables.rb
@@ -24,6 +24,10 @@ module DerivedVariables::SalesLogVariables
self.hhmemb = number_of_household_members
self.hhtype = household_type
+ if saledate && form.start_year_after_2024?
+ self.soctenant = soctenant_from_prevten_values
+ end
+
self.uprn_known = 0 if address_answered_without_uprn?
if uprn_known&.zero?
@@ -157,4 +161,14 @@ private
def address_answered_without_uprn?
[address_line1, town_or_city].all?(&:present?) && uprn.nil? && form.start_date.year >= 2023
end
+
+ def soctenant_from_prevten_values
+ return unless prevten && shared_ownership_scheme?
+
+ prevten_was_social_housing? ? 1 : 2
+ end
+
+ def prevten_was_social_housing?
+ [1, 2].include?(prevten) || [1, 2].include?(prevtenbuy2)
+ end
end
diff --git a/app/models/form/sales/pages/buyer_previous.rb b/app/models/form/sales/pages/buyer_previous.rb
index ed28cea00..3a4618d8f 100644
--- a/app/models/form/sales/pages/buyer_previous.rb
+++ b/app/models/form/sales/pages/buyer_previous.rb
@@ -2,7 +2,7 @@ class Form::Sales::Pages::BuyerPrevious < ::Form::Page
def initialize(id, hsh, subsection, joint_purchase:)
super(id, hsh, subsection)
@joint_purchase = joint_purchase
- @depends_on = [{ "joint_purchase?" => joint_purchase }]
+ @depends_on = [{ "joint_purchase?" => joint_purchase, "soctenant_is_inferred?" => false }]
end
def questions
diff --git a/app/models/form/sales/questions/buyer_previous.rb b/app/models/form/sales/questions/buyer_previous.rb
index aaea81cfc..cc16ce107 100644
--- a/app/models/form/sales/questions/buyer_previous.rb
+++ b/app/models/form/sales/questions/buyer_previous.rb
@@ -21,4 +21,8 @@ class Form::Sales::Questions::BuyerPrevious < ::Form::Question
"2" => { "value" => "No" },
}
end
+
+ def derived?
+ form.start_year_after_2024?
+ end
end
diff --git a/app/models/sales_log.rb b/app/models/sales_log.rb
index c0202c1df..3e15c832d 100644
--- a/app/models/sales_log.rb
+++ b/app/models/sales_log.rb
@@ -470,6 +470,10 @@ class SalesLog < Log
form.start_date.year >= 2023 && uprn.present? ? "uprn" : nil].compact
end
+ def soctenant_is_inferred?
+ form.start_year_after_2024?
+ end
+
def duplicates
SalesLog.where.not(duplicate_set_id: nil).where(duplicate_set_id:).where.not(id:)
end
diff --git a/app/services/bulk_upload/sales/year2024/row_parser.rb b/app/services/bulk_upload/sales/year2024/row_parser.rb
index 037fb8eef..28e7ef100 100644
--- a/app/services/bulk_upload/sales/year2024/row_parser.rb
+++ b/app/services/bulk_upload/sales/year2024/row_parser.rb
@@ -717,7 +717,6 @@ private
lanomagr: %i[field_97],
frombeds: %i[field_98],
fromprop: %i[field_99],
- soctenant: %i[field_98 field_99 field_100],
value: %i[field_101 field_114 field_125],
equity: %i[field_102],
mortgage: %i[field_104 field_118 field_127],
@@ -927,7 +926,7 @@ private
attributes["stairbought"] = field_87
attributes["stairowned"] = field_88
attributes["socprevten"] = field_100
- attributes["soctenant"] = [attributes["socprevten"], attributes["frombeds"], attributes["fromprop"]].any?(&:present?) ? 1 : 0
+ attributes["soctenant"] = infer_soctenant_from_prevten_and_prevtenbuy2
attributes["mortgageused"] = mortgageused
attributes["uprn"] = field_22
@@ -1123,6 +1122,16 @@ private
0 if field_62 == 1
end
+ def infer_soctenant_from_prevten_and_prevtenbuy2
+ return unless shared_ownership?
+
+ if [1, 2].include?(field_61) || [1, 2].include?(field_71.to_i)
+ 1
+ else
+ 2
+ end
+ end
+
def block_log_creation!
self.block_log_creation = true
end
diff --git a/spec/models/form/sales/pages/buyer_previous_spec.rb b/spec/models/form/sales/pages/buyer_previous_spec.rb
index 4d7df21a6..188fac7a4 100644
--- a/spec/models/form/sales/pages/buyer_previous_spec.rb
+++ b/spec/models/form/sales/pages/buyer_previous_spec.rb
@@ -42,13 +42,13 @@ RSpec.describe Form::Sales::Pages::BuyerPrevious, type: :model do
let(:joint_purchase) { true }
it "has the correct depends on" do
- expect(page.depends_on).to eq([{ "joint_purchase?" => true }])
+ expect(page.depends_on).to eq([{ "joint_purchase?" => true, "soctenant_is_inferred?" => false }])
end
end
context "when sales is not a joint purchase" do
it "has the correct depends on" do
- expect(page.depends_on).to eq([{ "joint_purchase?" => false }])
+ expect(page.depends_on).to eq([{ "joint_purchase?" => false, "soctenant_is_inferred?" => false }])
end
end
diff --git a/spec/models/form/sales/questions/buyer_previous_spec.rb b/spec/models/form/sales/questions/buyer_previous_spec.rb
index 06aaca38f..e52a514d3 100644
--- a/spec/models/form/sales/questions/buyer_previous_spec.rb
+++ b/spec/models/form/sales/questions/buyer_previous_spec.rb
@@ -6,8 +6,15 @@ RSpec.describe Form::Sales::Questions::BuyerPrevious, type: :model do
let(:question_id) { nil }
let(:question_definition) { nil }
let(:page) { instance_double(Form::Page) }
+ let(:subsection) { instance_double(Form::Subsection) }
+ let(:form) { instance_double(Form) }
let(:joint_purchase) { true }
+ before do
+ allow(page).to receive(:subsection).and_return(subsection)
+ allow(subsection).to receive(:form).and_return(form)
+ end
+
it "has correct page" do
expect(question.page).to eq(page)
end
@@ -42,10 +49,6 @@ RSpec.describe Form::Sales::Questions::BuyerPrevious, type: :model do
expect(question.type).to eq("radio")
end
- it "is not marked as derived" do
- expect(question.derived?).to be false
- end
-
it "has the correct displayed_answer_options" do
expect(question.displayed_answer_options(nil)).to eq({
"1" => { "value" => "Yes" },
@@ -68,4 +71,24 @@ RSpec.describe Form::Sales::Questions::BuyerPrevious, type: :model do
it "has the correct hint" do
expect(question.hint_text).to eq(nil)
end
+
+ context "when form year is before 2024" do
+ before do
+ allow(form).to receive(:start_year_after_2024?).and_return(false)
+ end
+
+ it "is not marked as derived" do
+ expect(question.derived?).to be false
+ end
+ end
+
+ context "when form year is >= 2024" do
+ before do
+ allow(form).to receive(:start_year_after_2024?).and_return(true)
+ end
+
+ it "is marked as derived" do
+ expect(question.derived?).to be true
+ end
+ end
end
diff --git a/spec/services/bulk_upload/sales/year2024/row_parser_spec.rb b/spec/services/bulk_upload/sales/year2024/row_parser_spec.rb
index 473967791..93e6fdca1 100644
--- a/spec/services/bulk_upload/sales/year2024/row_parser_spec.rb
+++ b/spec/services/bulk_upload/sales/year2024/row_parser_spec.rb
@@ -1264,10 +1264,56 @@ RSpec.describe BulkUpload::Sales::Year2024::RowParser do
end
describe "#soctenant" do
- let(:attributes) { setup_section_params.merge({ field_99: "1" }) }
+ context "when discounted ownership" do
+ let(:attributes) { valid_attributes.merge({ field_8: "2" }) }
- it "is correctly set" do
- expect(parser.log.soctenant).to be(1)
+ it "is set to nil" do
+ expect(parser.log.soctenant).to be_nil
+ end
+ end
+
+ context "when outright sale" do
+ let(:attributes) { valid_attributes.merge({ field_8: "3" }) }
+
+ it "is set to nil" do
+ expect(parser.log.soctenant).to be_nil
+ end
+ end
+
+ context "when shared ownership" do
+ context "when prevten is a social housing type" do
+ let(:attributes) { valid_attributes.merge({ field_8: "1", field_61: "1" }) }
+
+ it "is set to yes" do
+ expect(parser.log.soctenant).to be(1)
+ end
+ end
+
+ context "when prevten is not a social housing type" do
+ context "and prevtenbuy2 is a social housing type" do
+ let(:attributes) { valid_attributes.merge({ field_8: "1", field_61: "3", field_71: "2" }) }
+
+ it "is set to yes" do
+ expect(parser.log.soctenant).to be(1)
+ end
+ end
+
+ context "and prevtenbuy2 is not a social housing type" do
+ let(:attributes) { valid_attributes.merge({ field_8: "1", field_61: "3", field_71: "4" }) }
+
+ it "is set to no" do
+ expect(parser.log.soctenant).to be(2)
+ end
+ end
+
+ context "and prevtenbuy2 is blank" do
+ let(:attributes) { valid_attributes.merge({ field_8: "1", field_61: "3", field_71: nil }) }
+
+ it "is set to no" do
+ expect(parser.log.soctenant).to be(2)
+ end
+ end
+ end
end
end
From 3a81069bb530a4569515386f5f31b2c6a57451dc Mon Sep 17 00:00:00 2001
From: Rachael Booth
Date: Wed, 7 Feb 2024 17:43:36 +0000
Subject: [PATCH 09/13] CLDC-3143: Update hint text for gender questions for
2024 (#2220)
* CLDC-3143: Update hint text for gender questions for 2024
* Refactor ifs
---
.../lettings/questions/gender_identity1.rb | 9 ++-
.../questions/person_gender_identity.rb | 9 ++-
.../form/sales/questions/gender_identity1.rb | 9 ++-
.../form/sales/questions/gender_identity2.rb | 6 ++
.../sales/questions/person_gender_identity.rb | 6 ++
.../questions/gender_identity1_spec.rb | 69 +++++++++++++++++++
.../questions/person_gender_identity_spec.rb | 27 +++++++-
.../sales/questions/gender_identity1_spec.rb | 31 +++++++--
.../sales/questions/gender_identity2_spec.rb | 27 ++++++++
.../questions/person_gender_identity_spec.rb | 27 ++++++++
10 files changed, 211 insertions(+), 9 deletions(-)
create mode 100644 spec/models/form/lettings/questions/gender_identity1_spec.rb
diff --git a/app/models/form/lettings/questions/gender_identity1.rb b/app/models/form/lettings/questions/gender_identity1.rb
index 769dc1850..f7bba8e89 100644
--- a/app/models/form/lettings/questions/gender_identity1.rb
+++ b/app/models/form/lettings/questions/gender_identity1.rb
@@ -6,7 +6,6 @@ class Form::Lettings::Questions::GenderIdentity1 < ::Form::Question
@header = "Which of these best describes the lead tenant’s gender identity?"
@type = "radio"
@check_answers_card_number = 1
- @hint_text = "The lead tenant is the person in the household who does the most paid work. If several people do the same paid work, the lead tenant is whoever is the oldest."
@answer_options = ANSWER_OPTIONS
@question_number = 33
end
@@ -18,4 +17,12 @@ class Form::Lettings::Questions::GenderIdentity1 < ::Form::Question
"divider" => { "value" => true },
"R" => { "value" => "Tenant prefers not to say" },
}.freeze
+
+ def hint_text
+ if form.start_year_after_2024?
+ "This should be however they personally choose to identify from the options below. This may or may not be the same as their biological sex or the sex they were assigned at birth."
+ else
+ "The lead tenant is the person in the household who does the most paid work. If several people do the same paid work, the lead tenant is whoever is the oldest."
+ end
+ end
end
diff --git a/app/models/form/lettings/questions/person_gender_identity.rb b/app/models/form/lettings/questions/person_gender_identity.rb
index 1416a3414..657438071 100644
--- a/app/models/form/lettings/questions/person_gender_identity.rb
+++ b/app/models/form/lettings/questions/person_gender_identity.rb
@@ -6,7 +6,6 @@ class Form::Lettings::Questions::PersonGenderIdentity < ::Form::Question
@header = "Which of these best describes person #{person_index}’s gender identity?"
@type = "radio"
@check_answers_card_number = person_index
- @hint_text = ""
@answer_options = ANSWER_OPTIONS
@question_number = 32 + (4 * person_index)
end
@@ -18,4 +17,12 @@ class Form::Lettings::Questions::PersonGenderIdentity < ::Form::Question
"divider" => { "value" => true },
"R" => { "value" => "Person prefers not to say" },
}.freeze
+
+ def hint_text
+ if form.start_year_after_2024?
+ "This should be however they personally choose to identify from the options below. This may or may not be the same as their biological sex or the sex they were assigned at birth."
+ else
+ ""
+ end
+ end
end
diff --git a/app/models/form/sales/questions/gender_identity1.rb b/app/models/form/sales/questions/gender_identity1.rb
index b9b47ee0a..7ee550df1 100644
--- a/app/models/form/sales/questions/gender_identity1.rb
+++ b/app/models/form/sales/questions/gender_identity1.rb
@@ -5,7 +5,6 @@ class Form::Sales::Questions::GenderIdentity1 < ::Form::Question
@check_answer_label = "Buyer 1’s gender identity"
@header = "Which of these best describes buyer 1’s gender identity?"
@type = "radio"
- @hint_text = "Buyer 1 is the person in the household who does the most paid work. If it’s a joint purchase and the buyers do the same amount of paid work, buyer 1 is whoever is the oldest."
@answer_options = ANSWER_OPTIONS
@check_answers_card_number = 1
@question_number = 21
@@ -17,4 +16,12 @@ class Form::Sales::Questions::GenderIdentity1 < ::Form::Question
"X" => { "value" => "Non-binary" },
"R" => { "value" => "Prefers not to say" },
}.freeze
+
+ def hint_text
+ if form.start_year_after_2024?
+ "This should be however they personally choose to identify from the options below. This may or may not be the same as their biological sex or the sex they were assigned at birth."
+ else
+ "Buyer 1 is the person in the household who does the most paid work. If it’s a joint purchase and the buyers do the same amount of paid work, buyer 1 is whoever is the oldest."
+ end
+ end
end
diff --git a/app/models/form/sales/questions/gender_identity2.rb b/app/models/form/sales/questions/gender_identity2.rb
index 15ef9fda1..87c155acb 100644
--- a/app/models/form/sales/questions/gender_identity2.rb
+++ b/app/models/form/sales/questions/gender_identity2.rb
@@ -22,4 +22,10 @@ class Form::Sales::Questions::GenderIdentity2 < ::Form::Question
"X" => { "value" => "Non-binary" },
"R" => { "value" => "Buyer prefers not to say" },
}.freeze
+
+ def hint_text
+ return unless form.start_year_after_2024?
+
+ "This should be however they personally choose to identify from the options below. This may or may not be the same as their biological sex or the sex they were assigned at birth."
+ end
end
diff --git a/app/models/form/sales/questions/person_gender_identity.rb b/app/models/form/sales/questions/person_gender_identity.rb
index 94774f5ce..e2da876a4 100644
--- a/app/models/form/sales/questions/person_gender_identity.rb
+++ b/app/models/form/sales/questions/person_gender_identity.rb
@@ -21,4 +21,10 @@ class Form::Sales::Questions::PersonGenderIdentity < ::Form::Question
"X" => { "value" => "Non-binary" },
"R" => { "value" => "Person prefers not to say" },
}.freeze
+
+ def hint_text
+ return unless form.start_year_after_2024?
+
+ "This should be however they personally choose to identify from the options below. This may or may not be the same as their biological sex or the sex they were assigned at birth."
+ end
end
diff --git a/spec/models/form/lettings/questions/gender_identity1_spec.rb b/spec/models/form/lettings/questions/gender_identity1_spec.rb
new file mode 100644
index 000000000..596e38941
--- /dev/null
+++ b/spec/models/form/lettings/questions/gender_identity1_spec.rb
@@ -0,0 +1,69 @@
+require "rails_helper"
+
+RSpec.describe Form::Lettings::Questions::GenderIdentity1, type: :model do
+ subject(:question) { described_class.new(nil, question_definition, page) }
+
+ let(:question_definition) { nil }
+ let(:page) { instance_double(Form::Page) }
+ let(:subsection) { instance_double(Form::Subsection) }
+ let(:form) { instance_double(Form) }
+
+ before do
+ allow(page).to receive(:subsection).and_return(subsection)
+ allow(subsection).to receive(:form).and_return(form)
+ end
+
+ it "has the correct id" do
+ expect(question.id).to eq("sex1")
+ end
+
+ it "has the correct header" do
+ expect(question.header).to eq("Which of these best describes the lead tenant’s gender identity?")
+ end
+
+ it "has the correct check_answer_label" do
+ expect(question.check_answer_label).to eq("Lead tenant’s gender identity")
+ end
+
+ it "has the correct check_answers_card_number" do
+ expect(question.check_answers_card_number).to eq(1)
+ end
+
+ it "has the correct type" do
+ expect(question.type).to eq("radio")
+ end
+
+ it "is not marked as derived" do
+ expect(question.derived?).to be false
+ end
+
+ it "has the correct answer_options" do
+ expect(question.answer_options).to eq({
+ "F" => { "value" => "Female" },
+ "M" => { "value" => "Male" },
+ "X" => { "value" => "Non-binary" },
+ "divider" => { "value" => true },
+ "R" => { "value" => "Tenant prefers not to say" },
+ })
+ end
+
+ context "with form year before 2024" do
+ before do
+ allow(form).to receive(:start_year_after_2024?).and_return(false)
+ end
+
+ it "has the correct hint" do
+ expect(question.hint_text).to eq("The lead tenant is the person in the household who does the most paid work. If several people do the same paid work, the lead tenant is whoever is the oldest.")
+ end
+ end
+
+ context "with form year >= 2024" do
+ before do
+ allow(form).to receive(:start_year_after_2024?).and_return(true)
+ end
+
+ it "has the correct hint" do
+ expect(question.hint_text).to eq("This should be however they personally choose to identify from the options below. This may or may not be the same as their biological sex or the sex they were assigned at birth.")
+ end
+ end
+end
diff --git a/spec/models/form/lettings/questions/person_gender_identity_spec.rb b/spec/models/form/lettings/questions/person_gender_identity_spec.rb
index 703ba764a..bff45a624 100644
--- a/spec/models/form/lettings/questions/person_gender_identity_spec.rb
+++ b/spec/models/form/lettings/questions/person_gender_identity_spec.rb
@@ -6,6 +6,13 @@ RSpec.describe Form::Lettings::Questions::PersonGenderIdentity, type: :model do
let(:question_definition) { nil }
let(:page) { instance_double(Form::Page) }
let(:person_index) { 2 }
+ let(:subsection) { instance_double(Form::Subsection) }
+ let(:form) { instance_double(Form) }
+
+ before do
+ allow(page).to receive(:subsection).and_return(subsection)
+ allow(subsection).to receive(:form).and_return(form)
+ end
it "has correct page" do
expect(question.page).to eq(page)
@@ -19,8 +26,24 @@ RSpec.describe Form::Lettings::Questions::PersonGenderIdentity, type: :model do
expect(question.derived?).to be false
end
- it "has the correct hint" do
- expect(question.hint_text).to eq("")
+ context "with form year before 2024" do
+ before do
+ allow(form).to receive(:start_year_after_2024?).and_return(false)
+ end
+
+ it "has the correct hint" do
+ expect(question.hint_text).to eq("")
+ end
+ end
+
+ context "with form year >= 2024" do
+ before do
+ allow(form).to receive(:start_year_after_2024?).and_return(true)
+ end
+
+ it "has the correct hint" do
+ expect(question.hint_text).to eq("This should be however they personally choose to identify from the options below. This may or may not be the same as their biological sex or the sex they were assigned at birth.")
+ end
end
context "with person 2" do
diff --git a/spec/models/form/sales/questions/gender_identity1_spec.rb b/spec/models/form/sales/questions/gender_identity1_spec.rb
index 2abe952ed..e7f07577c 100644
--- a/spec/models/form/sales/questions/gender_identity1_spec.rb
+++ b/spec/models/form/sales/questions/gender_identity1_spec.rb
@@ -6,6 +6,13 @@ RSpec.describe Form::Sales::Questions::GenderIdentity1, type: :model do
let(:question_id) { nil }
let(:question_definition) { nil }
let(:page) { instance_double(Form::Page) }
+ let(:subsection) { instance_double(Form::Subsection) }
+ let(:form) { instance_double(Form) }
+
+ before do
+ allow(page).to receive(:subsection).and_return(subsection)
+ allow(subsection).to receive(:form).and_return(form)
+ end
it "has correct page" do
expect(question.page).to eq(page)
@@ -31,10 +38,6 @@ RSpec.describe Form::Sales::Questions::GenderIdentity1, type: :model do
expect(question.derived?).to be false
end
- it "has the correct hint" do
- expect(question.hint_text).to eq("Buyer 1 is the person in the household who does the most paid work. If it’s a joint purchase and the buyers do the same amount of paid work, buyer 1 is whoever is the oldest.")
- end
-
it "has the correct answer_options" do
expect(question.answer_options).to eq({
"F" => { "value" => "Female" },
@@ -47,4 +50,24 @@ RSpec.describe Form::Sales::Questions::GenderIdentity1, type: :model do
it "has the correct check_answers_card_number" do
expect(question.check_answers_card_number).to eq(1)
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 hint" do
+ expect(question.hint_text).to eq("Buyer 1 is the person in the household who does the most paid work. If it’s a joint purchase and the buyers do the same amount of paid work, buyer 1 is whoever is the oldest.")
+ end
+ end
+
+ context "with start year >= 2024" do
+ before do
+ allow(form).to receive(:start_year_after_2024?).and_return(true)
+ end
+
+ it "has the correct hint" do
+ expect(question.hint_text).to eq("This should be however they personally choose to identify from the options below. This may or may not be the same as their biological sex or the sex they were assigned at birth.")
+ end
+ end
end
diff --git a/spec/models/form/sales/questions/gender_identity2_spec.rb b/spec/models/form/sales/questions/gender_identity2_spec.rb
index 7c405afc6..28a828155 100644
--- a/spec/models/form/sales/questions/gender_identity2_spec.rb
+++ b/spec/models/form/sales/questions/gender_identity2_spec.rb
@@ -6,6 +6,13 @@ RSpec.describe Form::Sales::Questions::GenderIdentity2, type: :model do
let(:question_id) { nil }
let(:question_definition) { nil }
let(:page) { instance_double(Form::Page) }
+ let(:subsection) { instance_double(Form::Subsection) }
+ let(:form) { instance_double(Form) }
+
+ before do
+ allow(page).to receive(:subsection).and_return(subsection)
+ allow(subsection).to receive(:form).and_return(form)
+ end
it "has correct page" do
expect(question.page).to eq(page)
@@ -49,4 +56,24 @@ RSpec.describe Form::Sales::Questions::GenderIdentity2, type: :model do
{ "condition" => { "sex2" => "R" }, "value" => "Prefers not to say" },
])
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 hint" do
+ expect(question.hint_text).to be_nil
+ end
+ end
+
+ context "with start year >= 2024" do
+ before do
+ allow(form).to receive(:start_year_after_2024?).and_return(true)
+ end
+
+ it "has the correct hint" do
+ expect(question.hint_text).to eq("This should be however they personally choose to identify from the options below. This may or may not be the same as their biological sex or the sex they were assigned at birth.")
+ end
+ end
end
diff --git a/spec/models/form/sales/questions/person_gender_identity_spec.rb b/spec/models/form/sales/questions/person_gender_identity_spec.rb
index 0ae959e82..6c0691d25 100644
--- a/spec/models/form/sales/questions/person_gender_identity_spec.rb
+++ b/spec/models/form/sales/questions/person_gender_identity_spec.rb
@@ -7,6 +7,13 @@ RSpec.describe Form::Sales::Questions::PersonGenderIdentity, type: :model do
let(:question_definition) { nil }
let(:page) { instance_double(Form::Page) }
let(:person_index) { 2 }
+ let(:subsection) { instance_double(Form::Subsection) }
+ let(:form) { instance_double(Form) }
+
+ before do
+ allow(page).to receive(:subsection).and_return(subsection)
+ allow(subsection).to receive(:form).and_return(form)
+ end
it "has correct page" do
expect(question.page).to eq(page)
@@ -29,6 +36,26 @@ RSpec.describe Form::Sales::Questions::PersonGenderIdentity, type: :model do
})
end
+ context "when form year is before 2024" do
+ before do
+ allow(form).to receive(:start_year_after_2024?).and_return(false)
+ end
+
+ it "has the correct hint" do
+ expect(question.hint_text).to be_nil
+ end
+ end
+
+ context "when form year is >= 2024" do
+ before do
+ allow(form).to receive(:start_year_after_2024?).and_return(true)
+ end
+
+ it "has the correct hint" do
+ expect(question.hint_text).to eq("This should be however they personally choose to identify from the options below. This may or may not be the same as their biological sex or the sex they were assigned at birth.")
+ end
+ end
+
context "when person 2" do
let(:question_id) { "sex2" }
let(:person_index) { 2 }
From 140e55d313166160d5b9590cc33e916f55e0506b Mon Sep 17 00:00:00 2001
From: kosiakkatrina <54268893+kosiakkatrina@users.noreply.github.com>
Date: Thu, 8 Feb 2024 08:11:28 +0000
Subject: [PATCH 10/13] CLDC-3184 Add value/discount validation (#2222)
* Add value/discount validation
* fix postcode field
---
app/models/sales_log.rb | 6 ++
.../sales/sale_information_validations.rb | 15 ++++
config/locales/en.yml | 3 +
.../sale_information_validations_spec.rb | 77 +++++++++++++++++++
4 files changed, 101 insertions(+)
diff --git a/app/models/sales_log.rb b/app/models/sales_log.rb
index 3e15c832d..dae70c729 100644
--- a/app/models/sales_log.rb
+++ b/app/models/sales_log.rb
@@ -485,4 +485,10 @@ class SalesLog < Log
def is_staircase?
staircase == 1
end
+
+ def discount_value
+ return unless discount && value
+
+ value * discount / 100
+ end
end
diff --git a/app/models/validations/sales/sale_information_validations.rb b/app/models/validations/sales/sale_information_validations.rb
index 17fbc95b4..c2036227a 100644
--- a/app/models/validations/sales/sale_information_validations.rb
+++ b/app/models/validations/sales/sale_information_validations.rb
@@ -83,4 +83,19 @@ module Validations::Sales::SaleInformationValidations
record.errors.add :type, I18n.t("validations.sale_information.stairbought.over_max", max_stairbought:, type: record.form.get_question("type", record).answer_label(record))
end
end
+
+ def validate_discount_and_value(record)
+ return unless record.saledate && record.form.start_year_after_2024?
+ return unless record.discount && record.value && record.la
+
+ if record.london_property? && record.discount_value > 136_400
+ %i[discount value la postcode_full uprn].each do |field|
+ record.errors.add field, I18n.t("validations.sale_information.value.over_discounted_london_max", discount_value: record.field_formatted_as_currency("discount_value"))
+ end
+ elsif record.property_not_in_london? && record.discount_value > 102_400
+ %i[discount value la postcode_full uprn].each do |field|
+ record.errors.add field, I18n.t("validations.sale_information.value.over_discounted_max", discount_value: record.field_formatted_as_currency("discount_value"))
+ end
+ end
+ end
end
diff --git a/config/locales/en.yml b/config/locales/en.yml
index c7d8c9da2..cd2f373ec 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -619,6 +619,9 @@ en:
out_of_range: "Loan, grants or subsidies must be between £9,000 and £16,000"
stairbought:
over_max: "The percentage bought in this staircasing transaction cannot be higher than %{max_stairbought}% for %{type} sales."
+ value:
+ over_discounted_london_max: "The percentage discount multiplied by the purchase price is %{discount_value}. This figure should not be more than £136,400 for properties in London."
+ over_discounted_max: "The percentage discount multiplied by the purchase price is %{discount_value}. This figure should not be more than £102,400 for properties outside of London."
merge_request:
organisation_part_of_another_merge: "This organisation is part of another merge - select a different one"
organisation_not_selected: "Select an organisation from the search list"
diff --git a/spec/models/validations/sales/sale_information_validations_spec.rb b/spec/models/validations/sales/sale_information_validations_spec.rb
index 25474e55b..24f2e22ee 100644
--- a/spec/models/validations/sales/sale_information_validations_spec.rb
+++ b/spec/models/validations/sales/sale_information_validations_spec.rb
@@ -608,4 +608,81 @@ RSpec.describe Validations::Sales::SaleInformationValidations do
end
end
end
+
+ describe "#validate_discount_and_value" do
+ let(:record) { FactoryBot.build(:sales_log, value: 200_000, discount: 50, ownershipsch: 2, type: 9, saledate: now) }
+ let(:now) { Time.zone.local(2024, 4, 1) }
+
+ around do |example|
+ Timecop.freeze(now) do
+ example.run
+ end
+ Timecop.return
+ end
+
+ context "with a log in the 24/25 collection year" do
+ context "when in London" do
+ before do
+ record.la = "E09000001"
+ end
+
+ it "adds an error if value * discount is more than 136,400" do
+ record.discount = 80
+ sale_information_validator.validate_discount_and_value(record)
+ expect(record.errors["value"]).to include("The percentage discount multiplied by the purchase price is £160,000.00. This figure should not be more than £136,400 for properties in London.")
+ expect(record.errors["discount"]).to include("The percentage discount multiplied by the purchase price is £160,000.00. This figure should not be more than £136,400 for properties in London.")
+ expect(record.errors["la"]).to include("The percentage discount multiplied by the purchase price is £160,000.00. This figure should not be more than £136,400 for properties in London.")
+ expect(record.errors["postcode_full"]).to include("The percentage discount multiplied by the purchase price is £160,000.00. This figure should not be more than £136,400 for properties in London.")
+ expect(record.errors["uprn"]).to include("The percentage discount multiplied by the purchase price is £160,000.00. This figure should not be more than £136,400 for properties in London.")
+ end
+
+ it "does not add an error value * discount is less than 136,400" do
+ sale_information_validator.validate_discount_and_value(record)
+ expect(record.errors["value"]).to be_empty
+ expect(record.errors["discount"]).to be_empty
+ expect(record.errors["la"]).to be_empty
+ expect(record.errors["postcode_full"]).to be_empty
+ expect(record.errors["uprn"]).to be_empty
+ end
+ end
+
+ context "when in outside of London" do
+ before do
+ record.la = "E06000015"
+ end
+
+ it "adds an error if value * discount is more than 136,400" do
+ record.discount = 52
+ sale_information_validator.validate_discount_and_value(record)
+ expect(record.errors["value"]).to include("The percentage discount multiplied by the purchase price is £104,000.00. This figure should not be more than £102,400 for properties outside of London.")
+ expect(record.errors["discount"]).to include("The percentage discount multiplied by the purchase price is £104,000.00. This figure should not be more than £102,400 for properties outside of London.")
+ expect(record.errors["la"]).to include("The percentage discount multiplied by the purchase price is £104,000.00. This figure should not be more than £102,400 for properties outside of London.")
+ expect(record.errors["postcode_full"]).to include("The percentage discount multiplied by the purchase price is £104,000.00. This figure should not be more than £102,400 for properties outside of London.")
+ expect(record.errors["uprn"]).to include("The percentage discount multiplied by the purchase price is £104,000.00. This figure should not be more than £102,400 for properties outside of London.")
+ end
+
+ it "does not add an error value * discount is less than 136,400" do
+ sale_information_validator.validate_discount_and_value(record)
+ expect(record.errors["value"]).to be_empty
+ expect(record.errors["discount"]).to be_empty
+ expect(record.errors["la"]).to be_empty
+ expect(record.errors["postcode_full"]).to be_empty
+ expect(record.errors["uprn"]).to be_empty
+ end
+ end
+ end
+
+ context "when it is a 2023 log" do
+ let(:record) { FactoryBot.build(:sales_log, value: 200_000, discount: 80, ownershipsch: 2, type: 9, saledate: Time.zone.local(2023, 4, 1), la: "E06000015") }
+
+ it "does not add an error" do
+ sale_information_validator.validate_discount_and_value(record)
+ expect(record.errors["value"]).to be_empty
+ expect(record.errors["discount"]).to be_empty
+ expect(record.errors["la"]).to be_empty
+ expect(record.errors["postcode_full"]).to be_empty
+ expect(record.errors["uprn"]).to be_empty
+ end
+ end
+ end
end
From 46aae6e774503f50e1d346e0024076cb92d11b0d Mon Sep 17 00:00:00 2001
From: kosiakkatrina <54268893+kosiakkatrina@users.noreply.github.com>
Date: Thu, 8 Feb 2024 09:03:13 +0000
Subject: [PATCH 11/13] Validate non staircasing mortgage value (#2223)
---
app/models/sales_log.rb | 4 +
.../sales/sale_information_validations.rb | 12 +++
config/locales/en.yml | 1 +
.../sale_information_validations_spec.rb | 73 ++++++++++++++++++-
4 files changed, 89 insertions(+), 1 deletion(-)
diff --git a/app/models/sales_log.rb b/app/models/sales_log.rb
index dae70c729..76c43b09e 100644
--- a/app/models/sales_log.rb
+++ b/app/models/sales_log.rb
@@ -491,4 +491,8 @@ class SalesLog < Log
value * discount / 100
end
+
+ def is_not_staircasing?
+ staircase == 2 || staircase == 3
+ end
end
diff --git a/app/models/validations/sales/sale_information_validations.rb b/app/models/validations/sales/sale_information_validations.rb
index c2036227a..0aaa77a93 100644
--- a/app/models/validations/sales/sale_information_validations.rb
+++ b/app/models/validations/sales/sale_information_validations.rb
@@ -98,4 +98,16 @@ module Validations::Sales::SaleInformationValidations
end
end
end
+
+ def validate_non_staircasing_mortgage(record)
+ return unless record.mortgage && record.value && record.deposit && record.equity
+ return unless record.is_not_staircasing?
+ return unless record.saledate && record.form.start_year_after_2024?
+
+ if record.mortgage_and_deposit_total != record.expected_shared_ownership_deposit_value
+ %i[mortgage value deposit equity].each do |field|
+ record.errors.add field, I18n.t("validations.sale_information.non_staircasing_mortgage", mortgage_and_deposit_total: record.field_formatted_as_currency("mortgage_and_deposit_total"), expected_shared_ownership_deposit_value: record.field_formatted_as_currency("expected_shared_ownership_deposit_value"))
+ end
+ end
+ end
end
diff --git a/config/locales/en.yml b/config/locales/en.yml
index cd2f373ec..204a20b4e 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -622,6 +622,7 @@ en:
value:
over_discounted_london_max: "The percentage discount multiplied by the purchase price is %{discount_value}. This figure should not be more than £136,400 for properties in London."
over_discounted_max: "The percentage discount multiplied by the purchase price is %{discount_value}. This figure should not be more than £102,400 for properties outside of London."
+ non_staircasing_mortgage: "The mortgage and deposit added together is %{mortgage_and_deposit_total} and the purchase price times by the equity is %{expected_shared_ownership_deposit_value}. These figures should be the same."
merge_request:
organisation_part_of_another_merge: "This organisation is part of another merge - select a different one"
organisation_not_selected: "Select an organisation from the search list"
diff --git a/spec/models/validations/sales/sale_information_validations_spec.rb b/spec/models/validations/sales/sale_information_validations_spec.rb
index 24f2e22ee..73243e9fa 100644
--- a/spec/models/validations/sales/sale_information_validations_spec.rb
+++ b/spec/models/validations/sales/sale_information_validations_spec.rb
@@ -596,7 +596,6 @@ RSpec.describe Validations::Sales::SaleInformationValidations do
end
end
end
-
context "when the collection year is before 2024" do
let(:record) { build(:sales_log, ownershipsch: 1, type: 24, saledate: now, stairbought: 90) }
let(:now) { Time.zone.local(2023, 4, 4) }
@@ -685,4 +684,76 @@ RSpec.describe Validations::Sales::SaleInformationValidations do
end
end
end
+
+ describe "#validate_non_staircasing_mortgage" do
+ let(:record) { FactoryBot.build(:sales_log, mortgage: 10_000, deposit: 5_000, value: 30_000, equity: 28, ownershipsch: 1, type: 30, saledate: now) }
+
+ around do |example|
+ Timecop.freeze(now) do
+ Singleton.__init__(FormHandler)
+ example.run
+ end
+ Timecop.return
+ Singleton.__init__(FormHandler)
+ end
+
+ context "with a log in the 24/25 collection year" do
+ let(:now) { Time.zone.local(2024, 4, 4) }
+
+ context "when MORTGAGE + DEPOSIT does not equal VALUE * EQUITY/100 " do
+ context "and it is not a staircase transaction" do
+ before do
+ record.staircase = 2
+ end
+
+ it "adds an error" do
+ sale_information_validator.validate_non_staircasing_mortgage(record)
+ expect(record.errors["mortgage"]).to include("The mortgage and deposit added together is £15,000.00 and the purchase price times by the equity is £8,400.00. These figures should be the same.")
+ expect(record.errors["value"]).to include("The mortgage and deposit added together is £15,000.00 and the purchase price times by the equity is £8,400.00. These figures should be the same.")
+ expect(record.errors["deposit"]).to include("The mortgage and deposit added together is £15,000.00 and the purchase price times by the equity is £8,400.00. These figures should be the same.")
+ expect(record.errors["equity"]).to include("The mortgage and deposit added together is £15,000.00 and the purchase price times by the equity is £8,400.00. These figures should be the same.")
+ end
+ end
+
+ context "and it is a staircase transaction" do
+ before do
+ record.staircase = 1
+ end
+
+ it "does not add an error" do
+ sale_information_validator.validate_non_staircasing_mortgage(record)
+ expect(record.errors["mortgage"]).to be_empty
+ expect(record.errors["value"]).to be_empty
+ expect(record.errors["deposit"]).to be_empty
+ expect(record.errors["equity"]).to be_empty
+ end
+ end
+ end
+
+ context "when MORTGAGE + DEPOSIT equals VALUE * EQUITY/100" do
+ let(:record) { FactoryBot.build(:sales_log, mortgage: 10_000, staircase: 2, deposit: 5_000, value: 30_000, equity: 50, ownershipsch: 1, type: 30, saledate: now) }
+
+ it "does not add an error" do
+ sale_information_validator.validate_non_staircasing_mortgage(record)
+ expect(record.errors["mortgage"]).to be_empty
+ expect(record.errors["value"]).to be_empty
+ expect(record.errors["deposit"]).to be_empty
+ expect(record.errors["equity"]).to be_empty
+ end
+ end
+ end
+
+ context "when it is a 2023 log" do
+ let(:now) { Time.zone.local(2023, 4, 1) }
+ let(:record) { FactoryBot.build(:sales_log, mortgage: 10_000, staircase: 2, deposit: 5_000, value: 30_000, equity: 28, ownershipsch: 1, type: 30, saledate: now) }
+
+ it "does not add an error" do
+ sale_information_validator.validate_non_staircasing_mortgage(record)
+ expect(record.errors["mortgage"]).to be_empty
+ expect(record.errors["value"]).to be_empty
+ expect(record.errors["deposit"]).to be_empty
+ expect(record.errors["equity"]).to be_empty
+ end
+ end
+ end
end
From e4c63b3602945233ab7f50a56f06fa74b3766311 Mon Sep 17 00:00:00 2001
From: kosiakkatrina <54268893+kosiakkatrina@users.noreply.github.com>
Date: Thu, 8 Feb 2024 14:03:53 +0000
Subject: [PATCH 12/13] Update whellchair hint text (#2226)
---
app/models/form/lettings/questions/wheelchair.rb | 2 +-
.../questions/property_wheelchair_accessible.rb | 1 +
.../pages/property_wheelchair_accessible_spec.rb | 4 ++++
.../form/lettings/questions/wheelchair_spec.rb | 16 ++++++++++++++++
.../pages/property_wheelchair_accessible_spec.rb | 4 ++++
.../property_wheelchair_accessible_spec.rb | 16 ++++++++++++++++
6 files changed, 42 insertions(+), 1 deletion(-)
diff --git a/app/models/form/lettings/questions/wheelchair.rb b/app/models/form/lettings/questions/wheelchair.rb
index 3ba4f081f..c2aaa3700 100644
--- a/app/models/form/lettings/questions/wheelchair.rb
+++ b/app/models/form/lettings/questions/wheelchair.rb
@@ -6,7 +6,7 @@ class Form::Lettings::Questions::Wheelchair < ::Form::Question
@header = "Is the property built or adapted to wheelchair-user standards?"
@type = "radio"
@check_answers_card_number = 0
- @hint_text = ""
+ @hint_text = form.start_year_after_2024? ? "This is whether someone who uses a wheelchair is able to make full use of all of the property’s rooms and facilities, including use of both inside and outside space, and entering and exiting the property." : ""
@answer_options = ANSWER_OPTIONS
@question_number = 21
end
diff --git a/app/models/form/sales/questions/property_wheelchair_accessible.rb b/app/models/form/sales/questions/property_wheelchair_accessible.rb
index feb017be0..588f350a2 100644
--- a/app/models/form/sales/questions/property_wheelchair_accessible.rb
+++ b/app/models/form/sales/questions/property_wheelchair_accessible.rb
@@ -7,6 +7,7 @@ class Form::Sales::Questions::PropertyWheelchairAccessible < ::Form::Question
@type = "radio"
@answer_options = ANSWER_OPTIONS
@question_number = 17
+ @hint_text = form.start_year_after_2024? ? "This is whether someone who uses a wheelchair is able to make full use of all of the property’s rooms and facilities, including use of both inside and outside space, and entering and exiting the property." : nil
end
ANSWER_OPTIONS = {
diff --git a/spec/models/form/lettings/pages/property_wheelchair_accessible_spec.rb b/spec/models/form/lettings/pages/property_wheelchair_accessible_spec.rb
index b96a55feb..522a19905 100644
--- a/spec/models/form/lettings/pages/property_wheelchair_accessible_spec.rb
+++ b/spec/models/form/lettings/pages/property_wheelchair_accessible_spec.rb
@@ -5,6 +5,10 @@ RSpec.describe Form::Lettings::Pages::PropertyWheelchairAccessible, type: :model
let(:subsection) { instance_double(Form::Subsection) }
+ before do
+ allow(subsection).to receive(:form).and_return(instance_double(Form, start_year_after_2024?: false))
+ end
+
it "has correct subsection" do
expect(page.subsection).to be(subsection)
end
diff --git a/spec/models/form/lettings/questions/wheelchair_spec.rb b/spec/models/form/lettings/questions/wheelchair_spec.rb
index ac0241674..1fa65a68b 100644
--- a/spec/models/form/lettings/questions/wheelchair_spec.rb
+++ b/spec/models/form/lettings/questions/wheelchair_spec.rb
@@ -4,6 +4,12 @@ RSpec.describe Form::Lettings::Questions::Wheelchair, type: :model do
subject(:question) { described_class.new(nil, nil, page) }
let(:page) { instance_double(Form::Page) }
+ let(:subsection) { instance_double(Form::Subsection) }
+
+ before do
+ allow(page).to receive(:subsection).and_return(subsection)
+ allow(subsection).to receive(:form).and_return(instance_double(Form, start_year_after_2024?: false))
+ end
it "has correct page" do
expect(question.page).to eq(page)
@@ -39,4 +45,14 @@ RSpec.describe Form::Lettings::Questions::Wheelchair, type: :model do
it "is not marked as derived" do
expect(question.derived?).to be false
end
+
+ context "with 2024 form" do
+ before do
+ allow(subsection).to receive(:form).and_return(instance_double(Form, start_year_after_2024?: true))
+ end
+
+ it "has the correct hint_text" do
+ expect(question.hint_text).to eq "This is whether someone who uses a wheelchair is able to make full use of all of the property’s rooms and facilities, including use of both inside and outside space, and entering and exiting the property."
+ end
+ end
end
diff --git a/spec/models/form/sales/pages/property_wheelchair_accessible_spec.rb b/spec/models/form/sales/pages/property_wheelchair_accessible_spec.rb
index f83bb7907..a788bc687 100644
--- a/spec/models/form/sales/pages/property_wheelchair_accessible_spec.rb
+++ b/spec/models/form/sales/pages/property_wheelchair_accessible_spec.rb
@@ -7,6 +7,10 @@ RSpec.describe Form::Sales::Pages::PropertyWheelchairAccessible, type: :model do
let(:page_definition) { nil }
let(:subsection) { instance_double(Form::Subsection) }
+ before do
+ allow(subsection).to receive(:form).and_return(instance_double(Form, start_year_after_2024?: false))
+ end
+
it "has correct subsection" do
expect(page.subsection).to eq(subsection)
end
diff --git a/spec/models/form/sales/questions/property_wheelchair_accessible_spec.rb b/spec/models/form/sales/questions/property_wheelchair_accessible_spec.rb
index c8d7eadaf..bea482aca 100644
--- a/spec/models/form/sales/questions/property_wheelchair_accessible_spec.rb
+++ b/spec/models/form/sales/questions/property_wheelchair_accessible_spec.rb
@@ -6,6 +6,12 @@ RSpec.describe Form::Sales::Questions::PropertyWheelchairAccessible, type: :mode
let(:question_id) { nil }
let(:question_definition) { nil }
let(:page) { instance_double(Form::Page) }
+ let(:subsection) { instance_double(Form::Subsection) }
+
+ before do
+ allow(page).to receive(:subsection).and_return(subsection)
+ allow(subsection).to receive(:form).and_return(instance_double(Form, start_year_after_2024?: false))
+ end
it "has correct page" do
expect(question.page).to eq(page)
@@ -38,4 +44,14 @@ RSpec.describe Form::Sales::Questions::PropertyWheelchairAccessible, type: :mode
"3" => { "value" => "Don't know" },
})
end
+
+ context "with 2024 form" do
+ before do
+ allow(subsection).to receive(:form).and_return(instance_double(Form, start_year_after_2024?: true))
+ end
+
+ it "has the correct hint_text" do
+ expect(question.hint_text).to eq("This is whether someone who uses a wheelchair is able to make full use of all of the property’s rooms and facilities, including use of both inside and outside space, and entering and exiting the property.")
+ end
+ end
end
From 39b6c4ddd8fc61d80e9a392e662f3355c8a308eb Mon Sep 17 00:00:00 2001
From: natdeanlewissoftwire
<94526761+natdeanlewissoftwire@users.noreply.github.com>
Date: Mon, 12 Feb 2024 12:31:12 +0000
Subject: [PATCH 13/13] CLDC-3135 Infer beds for 24/25 bedsits (#2167)
* feat: for 24/25 onwards, infer beds = 1 for bedsits, change hint text and remove validation
* feat: add tests
* feat: update bulk upload inferral
* feat: update tests
* refactor: rename file
* refactor: nest 2024 changes for future DRYness
* refactor: lint
---
.../lettings_log_variables.rb | 6 ++
.../pages/property_number_of_bedrooms.rb | 2 +-
app/models/form/lettings/questions/beds.rb | 5 +-
app/models/lettings_log.rb | 4 ++
.../validations/property_validations.rb | 2 +-
.../lettings/year2024/row_parser.rb | 2 +-
.../pages/property_number_of_bedrooms_spec.rb | 33 ++++++++++
.../form/lettings/questions/beds_spec.rb | 65 +++++++++++++++++++
.../lettings/year2024/row_parser_spec.rb | 18 +++++
9 files changed, 133 insertions(+), 4 deletions(-)
create mode 100644 spec/models/form/lettings/pages/property_number_of_bedrooms_spec.rb
create mode 100644 spec/models/form/lettings/questions/beds_spec.rb
diff --git a/app/models/derived_variables/lettings_log_variables.rb b/app/models/derived_variables/lettings_log_variables.rb
index d0aab14cb..ac17e0219 100644
--- a/app/models/derived_variables/lettings_log_variables.rb
+++ b/app/models/derived_variables/lettings_log_variables.rb
@@ -91,6 +91,9 @@ module DerivedVariables::LettingsLogVariables
self.prevten = 30 if owning_organisation&.provider_type == "LA"
end
end
+ if form.start_year_after_2024? && is_bedsit?
+ self.beds = 1
+ end
child_under_16_constraints!
@@ -179,6 +182,9 @@ private
self.wchair = nil
self.location_id = nil
end
+ if form.start_year_after_2024? && (unittype_gn_changed? && unittype_gn_was == 2)
+ self.beds = nil
+ end
end
def get_totelder
diff --git a/app/models/form/lettings/pages/property_number_of_bedrooms.rb b/app/models/form/lettings/pages/property_number_of_bedrooms.rb
index c3a1a2365..8ed9dc37a 100644
--- a/app/models/form/lettings/pages/property_number_of_bedrooms.rb
+++ b/app/models/form/lettings/pages/property_number_of_bedrooms.rb
@@ -2,7 +2,7 @@ class Form::Lettings::Pages::PropertyNumberOfBedrooms < ::Form::Page
def initialize(id, hsh, subsection)
super
@id = "property_number_of_bedrooms"
- @depends_on = [{ "is_general_needs?" => true }]
+ @depends_on = [{ "is_general_needs?" => true, "is_beds_inferred?" => false }]
end
def questions
diff --git a/app/models/form/lettings/questions/beds.rb b/app/models/form/lettings/questions/beds.rb
index 6fa6c7c2b..e75e688bb 100644
--- a/app/models/form/lettings/questions/beds.rb
+++ b/app/models/form/lettings/questions/beds.rb
@@ -9,8 +9,11 @@ class Form::Lettings::Questions::Beds < ::Form::Question
@check_answers_card_number = 0
@max = 12
@min = 1
- @hint_text = "If shared accommodation, enter the number of bedrooms occupied by this household. A bedsit has 1 bedroom."
@step = 1
@question_number = 22
end
+
+ def hint_text
+ form.start_year_after_2024? ? "If shared accommodation, enter the number of bedrooms occupied by this household." : "If shared accommodation, enter the number of bedrooms occupied by this household. A bedsit has 1 bedroom."
+ end
end
diff --git a/app/models/lettings_log.rb b/app/models/lettings_log.rb
index 03405a12d..cc8c7d58b 100644
--- a/app/models/lettings_log.rb
+++ b/app/models/lettings_log.rb
@@ -356,6 +356,10 @@ class LettingsLog < Log
unittype_gn == 2
end
+ def is_beds_inferred?
+ form.start_year_after_2024? && is_bedsit?
+ end
+
def is_shared_housing?
# 4: Shared flat or maisonette
# 9: Shared house
diff --git a/app/models/validations/property_validations.rb b/app/models/validations/property_validations.rb
index 2f2d8d6b8..ba8318282 100644
--- a/app/models/validations/property_validations.rb
+++ b/app/models/validations/property_validations.rb
@@ -34,7 +34,7 @@ module Validations::PropertyValidations
def validate_shared_housing_rooms(record)
unless record.unittype_gn.nil?
- if record.is_bedsit? && record.beds != 1 && record.beds.present?
+ if record.is_bedsit? && record.beds != 1 && record.beds.present? && !record.form.start_year_after_2024?
record.errors.add :unittype_gn, I18n.t("validations.property.unittype_gn.one_bedroom_bedsit")
record.errors.add :beds, I18n.t("validations.property.unittype_gn.one_bedroom_bedsit")
end
diff --git a/app/services/bulk_upload/lettings/year2024/row_parser.rb b/app/services/bulk_upload/lettings/year2024/row_parser.rb
index c87cd0c03..5f05b6e10 100644
--- a/app/services/bulk_upload/lettings/year2024/row_parser.rb
+++ b/app/services/bulk_upload/lettings/year2024/row_parser.rb
@@ -1036,7 +1036,7 @@ private
attributes["unittype_gn"] = field_26
attributes["builtype"] = field_27
attributes["wchair"] = field_28
- attributes["beds"] = field_29
+ attributes["beds"] = field_26 == 2 ? 1 : field_29
attributes["joint"] = field_36
attributes["startertenancy"] = field_37
attributes["tenancy"] = field_38
diff --git a/spec/models/form/lettings/pages/property_number_of_bedrooms_spec.rb b/spec/models/form/lettings/pages/property_number_of_bedrooms_spec.rb
new file mode 100644
index 000000000..f6cec39e8
--- /dev/null
+++ b/spec/models/form/lettings/pages/property_number_of_bedrooms_spec.rb
@@ -0,0 +1,33 @@
+require "rails_helper"
+
+RSpec.describe Form::Lettings::Pages::PropertyNumberOfBedrooms, type: :model do
+ subject(:page) { described_class.new(page_id, page_definition, subsection) }
+
+ let(:page_id) { nil }
+ let(:page_definition) { nil }
+ let(:subsection) { instance_double(Form::Subsection) }
+
+ it "has correct subsection" do
+ expect(page.subsection).to eq(subsection)
+ end
+
+ it "has correct questions" do
+ expect(page.questions.map(&:id)).to eq(%w[beds])
+ end
+
+ it "has the correct id" do
+ expect(page.id).to eq("property_number_of_bedrooms")
+ end
+
+ it "has the correct header" do
+ expect(page.header).to be_nil
+ end
+
+ it "has the correct description" do
+ expect(page.description).to be_nil
+ end
+
+ it "has the correct depends_on" do
+ expect(page.depends_on).to eq([{ "is_general_needs?" => true, "is_beds_inferred?" => false }])
+ end
+end
diff --git a/spec/models/form/lettings/questions/beds_spec.rb b/spec/models/form/lettings/questions/beds_spec.rb
new file mode 100644
index 000000000..77340f5d5
--- /dev/null
+++ b/spec/models/form/lettings/questions/beds_spec.rb
@@ -0,0 +1,65 @@
+require "rails_helper"
+
+RSpec.describe Form::Lettings::Questions::Beds, type: :model do
+ subject(:question) { described_class.new(question_id, question_definition, page) }
+
+ let(:question_id) { nil }
+ let(:question_definition) { nil }
+ let(:page) { instance_double(Form::Page) }
+ let(:subsection) { instance_double(Form::Subsection) }
+ let(:form) { instance_double(Form) }
+
+ before do
+ allow(form).to receive(:start_year_after_2024?).and_return(false)
+ allow(page).to receive(:subsection).and_return(subsection)
+ allow(subsection).to receive(:form).and_return(form)
+ end
+
+ it "has correct page" do
+ expect(question.page).to eq(page)
+ end
+
+ it "has the correct id" do
+ expect(question.id).to eq("beds")
+ end
+
+ it "has the correct header" do
+ expect(question.header).to eq("How many bedrooms does the property have?")
+ end
+
+ it "has the correct check_answer_label" do
+ expect(question.check_answer_label).to eq("Number of bedrooms")
+ end
+
+ it "has the correct type" do
+ expect(question.type).to eq("numeric")
+ end
+
+ it "is not marked as derived" do
+ expect(question.derived?).to be false
+ end
+
+ it "has the correct min" do
+ expect(question.min).to eq(1)
+ end
+
+ it "has the correct max" do
+ expect(question.max).to eq(12)
+ end
+
+ context "with 2023/24 form" do
+ it "has the correct hint_text" do
+ expect(question.hint_text).to eq("If shared accommodation, enter the number of bedrooms occupied by this household. A bedsit has 1 bedroom.")
+ end
+ end
+
+ context "with 2024/25 form" do
+ before do
+ allow(form).to receive(:start_year_after_2024?).and_return(true)
+ end
+
+ it "has the correct hint_text" do
+ expect(question.hint_text).to eq("If shared accommodation, enter the number of bedrooms occupied by this household.")
+ end
+ end
+end
diff --git a/spec/services/bulk_upload/lettings/year2024/row_parser_spec.rb b/spec/services/bulk_upload/lettings/year2024/row_parser_spec.rb
index a37110785..58be059fc 100644
--- a/spec/services/bulk_upload/lettings/year2024/row_parser_spec.rb
+++ b/spec/services/bulk_upload/lettings/year2024/row_parser_spec.rb
@@ -1816,6 +1816,24 @@ RSpec.describe BulkUpload::Lettings::Year2024::RowParser do
end
end
+ describe "#beds" do
+ context "when property is a bedsit" do
+ let(:attributes) { setup_section_params.merge({ field_26: 2, field_29: 2 }) }
+
+ it "sets value to 1 even if field_29 contradicts this" do
+ expect(parser.log.beds).to be(1)
+ end
+ end
+
+ context "when property is not a bedsit" do
+ let(:attributes) { setup_section_params.merge({ field_26: 1, field_29: 2 }) }
+
+ it "sets value to field_29" do
+ expect(parser.log.beds).to be(2)
+ end
+ end
+ end
+
describe "#cbl" do
context "when field_112 is yes ie 1" do
let(:attributes) { { bulk_upload:, field_112: 1 } }