From 65eb59a3a1ea0cea4669c79ee829911bf1fbac0d Mon Sep 17 00:00:00 2001 From: Rachael Booth Date: Mon, 18 Nov 2024 16:31:15 +0000 Subject: [PATCH] Use subsection copy key in defaults and remove explit keys that are now defaults --- app/models/form/page.rb | 2 +- app/models/form/question.rb | 2 +- app/models/form/sales/pages/deposit.rb | 1 - app/models/form/sales/pages/deposit_discount.rb | 1 - app/models/form/sales/pages/discount.rb | 1 - app/models/form/sales/pages/equity.rb | 1 - app/models/form/sales/pages/extra_borrowing.rb | 1 - app/models/form/sales/pages/grant.rb | 1 - app/models/form/sales/pages/monthly_rent.rb | 1 - app/models/form/sales/pages/mortgage_amount.rb | 1 - app/models/form/sales/pages/mortgage_lender.rb | 1 - app/models/form/sales/pages/mortgage_lender_other.rb | 1 - app/models/form/sales/pages/mortgage_length.rb | 1 - app/models/form/sales/pages/mortgageused.rb | 1 - app/models/form/sales/pages/previous_bedrooms.rb | 1 - app/models/form/sales/pages/previous_property_type.rb | 1 - app/models/form/sales/pages/previous_tenure.rb | 1 - app/models/form/sales/pages/resale.rb | 1 - app/models/form/sales/pages/value_shared_ownership.rb | 1 - app/models/form/sales/questions/deposit_amount.rb | 1 - app/models/form/sales/questions/deposit_discount.rb | 1 - app/models/form/sales/questions/discount.rb | 1 - app/models/form/sales/questions/equity.rb | 1 - app/models/form/sales/questions/extra_borrowing.rb | 1 - app/models/form/sales/questions/fromprop.rb | 1 - app/models/form/sales/questions/grant.rb | 1 - app/models/form/sales/questions/monthly_rent.rb | 1 - app/models/form/sales/questions/mortgage_amount.rb | 1 - app/models/form/sales/questions/mortgage_lender.rb | 1 - app/models/form/sales/questions/mortgage_lender_other.rb | 1 - app/models/form/sales/questions/mortgage_length.rb | 1 - app/models/form/sales/questions/mortgageused.rb | 1 - app/models/form/sales/questions/previous_bedrooms.rb | 1 - app/models/form/sales/questions/previous_tenure.rb | 1 - app/models/form/sales/questions/resale.rb | 1 - app/models/form/sales/questions/value.rb | 1 - .../form/sales/subsections/discounted_ownership_scheme.rb | 1 + app/models/form/sales/subsections/outright_sale.rb | 1 + 38 files changed, 4 insertions(+), 36 deletions(-) diff --git a/app/models/form/page.rb b/app/models/form/page.rb index 7a5c4bf87..c1c09c362 100644 --- a/app/models/form/page.rb +++ b/app/models/form/page.rb @@ -25,7 +25,7 @@ class Form::Page delegate :form, to: :subsection def copy_key - @copy_key ||= "#{form.type}.#{subsection.id}.#{questions[0].id}" + @copy_key ||= "#{form.type}.#{subsection.copy_key}.#{questions[0].id}" end def header diff --git a/app/models/form/question.rb b/app/models/form/question.rb index 9409350f6..05eec89dd 100644 --- a/app/models/form/question.rb +++ b/app/models/form/question.rb @@ -51,7 +51,7 @@ class Form::Question delegate :form, to: :subsection def copy_key - @copy_key ||= "#{form.type}.#{subsection.id}.#{id}" + @copy_key ||= "#{form.type}.#{subsection.copy_key}.#{id}" end def check_answer_label diff --git a/app/models/form/sales/pages/deposit.rb b/app/models/form/sales/pages/deposit.rb index 4870a3c35..b204227b2 100644 --- a/app/models/form/sales/pages/deposit.rb +++ b/app/models/form/sales/pages/deposit.rb @@ -3,7 +3,6 @@ class Form::Sales::Pages::Deposit < ::Form::Page super(id, hsh, subsection) @ownershipsch = ownershipsch @optional = optional - @copy_key = "sales.sale_information.deposit" end def questions diff --git a/app/models/form/sales/pages/deposit_discount.rb b/app/models/form/sales/pages/deposit_discount.rb index 84fcbb45f..3fae9c0f8 100644 --- a/app/models/form/sales/pages/deposit_discount.rb +++ b/app/models/form/sales/pages/deposit_discount.rb @@ -2,7 +2,6 @@ class Form::Sales::Pages::DepositDiscount < ::Form::Page def initialize(id, hsh, subsection, optional:) super(id, hsh, subsection) @optional = optional - @copy_key = "sales.sale_information.cashdis" end def questions diff --git a/app/models/form/sales/pages/discount.rb b/app/models/form/sales/pages/discount.rb index 2d632985e..38d675a77 100644 --- a/app/models/form/sales/pages/discount.rb +++ b/app/models/form/sales/pages/discount.rb @@ -2,7 +2,6 @@ class Form::Sales::Pages::Discount < ::Form::Page def initialize(id, hsh, subsection) super @id = "discount" - @copy_key = "sales.sale_information.discount" @depends_on = [{ "right_to_buy?" => true, }] diff --git a/app/models/form/sales/pages/equity.rb b/app/models/form/sales/pages/equity.rb index 9bf3050a0..46eec40a3 100644 --- a/app/models/form/sales/pages/equity.rb +++ b/app/models/form/sales/pages/equity.rb @@ -2,7 +2,6 @@ class Form::Sales::Pages::Equity < ::Form::Page def initialize(id, hsh, subsection) super @id = "equity" - @copy_key = "sales.sale_information.equity" end def questions diff --git a/app/models/form/sales/pages/extra_borrowing.rb b/app/models/form/sales/pages/extra_borrowing.rb index c6ddb705a..d86db67b5 100644 --- a/app/models/form/sales/pages/extra_borrowing.rb +++ b/app/models/form/sales/pages/extra_borrowing.rb @@ -2,7 +2,6 @@ class Form::Sales::Pages::ExtraBorrowing < ::Form::Page def initialize(id, hsh, subsection, ownershipsch:) super(id, hsh, subsection) @ownershipsch = ownershipsch - @copy_key = "sales.sale_information.extrabor" @description = "" @subsection = subsection @depends_on = [{ diff --git a/app/models/form/sales/pages/grant.rb b/app/models/form/sales/pages/grant.rb index 2f96701c5..1d11fba82 100644 --- a/app/models/form/sales/pages/grant.rb +++ b/app/models/form/sales/pages/grant.rb @@ -2,7 +2,6 @@ class Form::Sales::Pages::Grant < ::Form::Page def initialize(id, hsh, subsection) super @id = "grant" - @copy_key = "sales.sale_information.grant" @depends_on = [{ "right_to_buy?" => false, "rent_to_buy_full_ownership?" => false, diff --git a/app/models/form/sales/pages/monthly_rent.rb b/app/models/form/sales/pages/monthly_rent.rb index 943e47cff..29f0d895f 100644 --- a/app/models/form/sales/pages/monthly_rent.rb +++ b/app/models/form/sales/pages/monthly_rent.rb @@ -2,7 +2,6 @@ class Form::Sales::Pages::MonthlyRent < ::Form::Page def initialize(id, hsh, subsection) super @id = "monthly_rent" - @copy_key = "sales.sale_information.mrent" end def questions diff --git a/app/models/form/sales/pages/mortgage_amount.rb b/app/models/form/sales/pages/mortgage_amount.rb index 41fba167c..e6a722853 100644 --- a/app/models/form/sales/pages/mortgage_amount.rb +++ b/app/models/form/sales/pages/mortgage_amount.rb @@ -2,7 +2,6 @@ class Form::Sales::Pages::MortgageAmount < ::Form::Page def initialize(id, hsh, subsection, ownershipsch:) super(id, hsh, subsection) @ownershipsch = ownershipsch - @copy_key = "sales.sale_information.mortgage" @depends_on = [{ "mortgage_used?" => true }] end diff --git a/app/models/form/sales/pages/mortgage_lender.rb b/app/models/form/sales/pages/mortgage_lender.rb index 87646a514..6db3c01df 100644 --- a/app/models/form/sales/pages/mortgage_lender.rb +++ b/app/models/form/sales/pages/mortgage_lender.rb @@ -2,7 +2,6 @@ class Form::Sales::Pages::MortgageLender < ::Form::Page def initialize(id, hsh, subsection, ownershipsch:) super(id, hsh, subsection) @ownershipsch = ownershipsch - @copy_key = "sales.sale_information.mortgagelender" @description = "" @subsection = subsection @depends_on = [{ diff --git a/app/models/form/sales/pages/mortgage_lender_other.rb b/app/models/form/sales/pages/mortgage_lender_other.rb index 903d6518f..f71089377 100644 --- a/app/models/form/sales/pages/mortgage_lender_other.rb +++ b/app/models/form/sales/pages/mortgage_lender_other.rb @@ -2,7 +2,6 @@ class Form::Sales::Pages::MortgageLenderOther < ::Form::Page def initialize(id, hsh, subsection, ownershipsch:) super(id, hsh, subsection) @ownershipsch = ownershipsch - @copy_key = "sales.sale_information.mortgagelenderother" @description = "" @subsection = subsection @depends_on = [{ diff --git a/app/models/form/sales/pages/mortgage_length.rb b/app/models/form/sales/pages/mortgage_length.rb index 76c46694a..dbc01a695 100644 --- a/app/models/form/sales/pages/mortgage_length.rb +++ b/app/models/form/sales/pages/mortgage_length.rb @@ -2,7 +2,6 @@ class Form::Sales::Pages::MortgageLength < ::Form::Page def initialize(id, hsh, subsection, ownershipsch:) super(id, hsh, subsection) @ownershipsch = ownershipsch - @copy_key = "sales.sale_information.mortlen" @depends_on = [{ "mortgageused" => 1, }] diff --git a/app/models/form/sales/pages/mortgageused.rb b/app/models/form/sales/pages/mortgageused.rb index ab48b0c2d..f9d8eae2e 100644 --- a/app/models/form/sales/pages/mortgageused.rb +++ b/app/models/form/sales/pages/mortgageused.rb @@ -1,7 +1,6 @@ class Form::Sales::Pages::Mortgageused < ::Form::Page def initialize(id, hsh, subsection, ownershipsch:) super(id, hsh, subsection) - @copy_key = "sales.sale_information.mortgageused" @ownershipsch = ownershipsch end diff --git a/app/models/form/sales/pages/previous_bedrooms.rb b/app/models/form/sales/pages/previous_bedrooms.rb index 26b3ef050..214632d49 100644 --- a/app/models/form/sales/pages/previous_bedrooms.rb +++ b/app/models/form/sales/pages/previous_bedrooms.rb @@ -2,7 +2,6 @@ class Form::Sales::Pages::PreviousBedrooms < ::Form::Page def initialize(id, hsh, subsection) super @id = "previous_bedrooms" - @copy_key = "sales.sale_information.frombeds" @depends_on = [ { "soctenant" => 1, diff --git a/app/models/form/sales/pages/previous_property_type.rb b/app/models/form/sales/pages/previous_property_type.rb index c5dd4f66a..26669d774 100644 --- a/app/models/form/sales/pages/previous_property_type.rb +++ b/app/models/form/sales/pages/previous_property_type.rb @@ -2,7 +2,6 @@ class Form::Sales::Pages::PreviousPropertyType < ::Form::Page def initialize(id, hsh, subsection) super @id = "previous_property_type" - @copy_key = "sales.sale_information.fromprop" @description = "" @subsection = subsection @depends_on = [ diff --git a/app/models/form/sales/pages/previous_tenure.rb b/app/models/form/sales/pages/previous_tenure.rb index c35b6bd67..0f4a4b250 100644 --- a/app/models/form/sales/pages/previous_tenure.rb +++ b/app/models/form/sales/pages/previous_tenure.rb @@ -2,7 +2,6 @@ class Form::Sales::Pages::PreviousTenure < ::Form::Page def initialize(id, hsh, subsection) super @id = "shared_ownership_previous_tenure" - @copy_key = "sales.sale_information.socprevten" @header = "" @description = "" @subsection = subsection diff --git a/app/models/form/sales/pages/resale.rb b/app/models/form/sales/pages/resale.rb index 6f4cd24e2..ffdbbc046 100644 --- a/app/models/form/sales/pages/resale.rb +++ b/app/models/form/sales/pages/resale.rb @@ -2,7 +2,6 @@ class Form::Sales::Pages::Resale < ::Form::Page def initialize(id, hsh, subsection) super @id = "resale" - @copy_key = "sales.sale_information.resale" @depends_on = [ { "staircase" => 2, diff --git a/app/models/form/sales/pages/value_shared_ownership.rb b/app/models/form/sales/pages/value_shared_ownership.rb index c2212c787..200563053 100644 --- a/app/models/form/sales/pages/value_shared_ownership.rb +++ b/app/models/form/sales/pages/value_shared_ownership.rb @@ -2,7 +2,6 @@ class Form::Sales::Pages::ValueSharedOwnership < ::Form::Page def initialize(id, hsh, subsection) super @id = "value_shared_ownership" - @copy_key = "sales.sale_information.value" end def questions diff --git a/app/models/form/sales/questions/deposit_amount.rb b/app/models/form/sales/questions/deposit_amount.rb index 41586cd94..6f2b98ce8 100644 --- a/app/models/form/sales/questions/deposit_amount.rb +++ b/app/models/form/sales/questions/deposit_amount.rb @@ -2,7 +2,6 @@ class Form::Sales::Questions::DepositAmount < ::Form::Question def initialize(id, hsh, subsection, ownershipsch:, optional:) super(id, hsh, subsection) @id = "deposit" - @copy_key = "sales.sale_information.deposit" @type = "numeric" @min = 0 @max = 999_999 diff --git a/app/models/form/sales/questions/deposit_discount.rb b/app/models/form/sales/questions/deposit_discount.rb index 289e3962c..bfc5f425d 100644 --- a/app/models/form/sales/questions/deposit_discount.rb +++ b/app/models/form/sales/questions/deposit_discount.rb @@ -2,7 +2,6 @@ class Form::Sales::Questions::DepositDiscount < ::Form::Question def initialize(id, hsh, page) super @id = "cashdis" - @copy_key = "sales.sale_information.cashdis" @type = "numeric" @min = 0 @max = 999_999 diff --git a/app/models/form/sales/questions/discount.rb b/app/models/form/sales/questions/discount.rb index 3807a8cfc..5dcf1f125 100644 --- a/app/models/form/sales/questions/discount.rb +++ b/app/models/form/sales/questions/discount.rb @@ -3,7 +3,6 @@ class Form::Sales::Questions::Discount < ::Form::Question super @id = "discount" @type = "numeric" - @copy_key = "sales.sale_information.discount" @min = 0 @max = form.start_year_2024_or_later? ? 70 : 100 @step = 0.1 diff --git a/app/models/form/sales/questions/equity.rb b/app/models/form/sales/questions/equity.rb index 4aae785b8..7a2a4ce5b 100644 --- a/app/models/form/sales/questions/equity.rb +++ b/app/models/form/sales/questions/equity.rb @@ -2,7 +2,6 @@ class Form::Sales::Questions::Equity < ::Form::Question def initialize(id, hsh, page) super @id = "equity" - @copy_key = "sales.sale_information.equity" @type = "numeric" @min = 0 @max = 100 diff --git a/app/models/form/sales/questions/extra_borrowing.rb b/app/models/form/sales/questions/extra_borrowing.rb index e3cd0ff7e..2ad13ef5d 100644 --- a/app/models/form/sales/questions/extra_borrowing.rb +++ b/app/models/form/sales/questions/extra_borrowing.rb @@ -2,7 +2,6 @@ class Form::Sales::Questions::ExtraBorrowing < ::Form::Question def initialize(id, hsh, subsection, ownershipsch:) super(id, hsh, subsection) @id = "extrabor" - @copy_key = "sales.sale_information.extrabor" @type = "radio" @answer_options = ANSWER_OPTIONS @page = page diff --git a/app/models/form/sales/questions/fromprop.rb b/app/models/form/sales/questions/fromprop.rb index 1a3393b7a..dec591cd0 100644 --- a/app/models/form/sales/questions/fromprop.rb +++ b/app/models/form/sales/questions/fromprop.rb @@ -2,7 +2,6 @@ class Form::Sales::Questions::Fromprop < ::Form::Question def initialize(id, hsh, page) super @id = "fromprop" - @copy_key = "sales.sale_information.fromprop" @type = "radio" @page = page @answer_options = ANSWER_OPTIONS diff --git a/app/models/form/sales/questions/grant.rb b/app/models/form/sales/questions/grant.rb index 17361fe9c..f069fedd2 100644 --- a/app/models/form/sales/questions/grant.rb +++ b/app/models/form/sales/questions/grant.rb @@ -2,7 +2,6 @@ class Form::Sales::Questions::Grant < ::Form::Question def initialize(id, hsh, page) super @id = "grant" - @copy_key = "sales.sale_information.grant" @type = "numeric" @min = 0 @max = 999_999 diff --git a/app/models/form/sales/questions/monthly_rent.rb b/app/models/form/sales/questions/monthly_rent.rb index 7e64d8571..8e9ecfaef 100644 --- a/app/models/form/sales/questions/monthly_rent.rb +++ b/app/models/form/sales/questions/monthly_rent.rb @@ -2,7 +2,6 @@ class Form::Sales::Questions::MonthlyRent < ::Form::Question def initialize(id, hsh, page) super @id = "mrent" - @copy_key = "sales.sale_information.mrent" @type = "numeric" @min = 0 @step = 0.01 diff --git a/app/models/form/sales/questions/mortgage_amount.rb b/app/models/form/sales/questions/mortgage_amount.rb index a6ffcf26a..e0677ee18 100644 --- a/app/models/form/sales/questions/mortgage_amount.rb +++ b/app/models/form/sales/questions/mortgage_amount.rb @@ -2,7 +2,6 @@ class Form::Sales::Questions::MortgageAmount < ::Form::Question def initialize(id, hsh, subsection, ownershipsch:) super(id, hsh, subsection) @id = "mortgage" - @copy_key = "sales.sale_information.mortgage" @type = "numeric" @min = 1 @step = 1 diff --git a/app/models/form/sales/questions/mortgage_lender.rb b/app/models/form/sales/questions/mortgage_lender.rb index a4aa55f17..96bf9e5b3 100644 --- a/app/models/form/sales/questions/mortgage_lender.rb +++ b/app/models/form/sales/questions/mortgage_lender.rb @@ -2,7 +2,6 @@ class Form::Sales::Questions::MortgageLender < ::Form::Question def initialize(id, hsh, subsection, ownershipsch:) super(id, hsh, subsection) @id = "mortgagelender" - @copy_key = "sales.sale_information.mortgagelender" @type = "select" @page = page @bottom_guidance_partial = "mortgage_lender" diff --git a/app/models/form/sales/questions/mortgage_lender_other.rb b/app/models/form/sales/questions/mortgage_lender_other.rb index 49876efb0..8cd5de8fb 100644 --- a/app/models/form/sales/questions/mortgage_lender_other.rb +++ b/app/models/form/sales/questions/mortgage_lender_other.rb @@ -2,7 +2,6 @@ class Form::Sales::Questions::MortgageLenderOther < ::Form::Question def initialize(id, hsh, subsection, ownershipsch:) super(id, hsh, subsection) @id = "mortgagelenderother" - @copy_key = "sales.sale_information.mortgagelenderother" @type = "text" @page = page @ownershipsch = ownershipsch diff --git a/app/models/form/sales/questions/mortgage_length.rb b/app/models/form/sales/questions/mortgage_length.rb index 877818b98..5d94fc832 100644 --- a/app/models/form/sales/questions/mortgage_length.rb +++ b/app/models/form/sales/questions/mortgage_length.rb @@ -2,7 +2,6 @@ class Form::Sales::Questions::MortgageLength < ::Form::Question def initialize(id, hsh, subsection, ownershipsch:) super(id, hsh, subsection) @id = "mortlen" - @copy_key = "sales.sale_information.mortlen" @type = "numeric" @min = 0 @max = 60 diff --git a/app/models/form/sales/questions/mortgageused.rb b/app/models/form/sales/questions/mortgageused.rb index e4a101072..3c3c42840 100644 --- a/app/models/form/sales/questions/mortgageused.rb +++ b/app/models/form/sales/questions/mortgageused.rb @@ -2,7 +2,6 @@ class Form::Sales::Questions::Mortgageused < ::Form::Question def initialize(id, hsh, subsection, ownershipsch:) super(id, hsh, subsection) @id = "mortgageused" - @copy_key = "sales.sale_information.mortgageused" @type = "radio" @answer_options = ANSWER_OPTIONS @ownershipsch = ownershipsch diff --git a/app/models/form/sales/questions/previous_bedrooms.rb b/app/models/form/sales/questions/previous_bedrooms.rb index d29da208a..dd243137d 100644 --- a/app/models/form/sales/questions/previous_bedrooms.rb +++ b/app/models/form/sales/questions/previous_bedrooms.rb @@ -2,7 +2,6 @@ class Form::Sales::Questions::PreviousBedrooms < ::Form::Question def initialize(id, hsh, page) super @id = "frombeds" - @copy_key = "sales.sale_information.frombeds" @type = "numeric" @width = 5 @min = 1 diff --git a/app/models/form/sales/questions/previous_tenure.rb b/app/models/form/sales/questions/previous_tenure.rb index 55b103f0d..794d449b5 100644 --- a/app/models/form/sales/questions/previous_tenure.rb +++ b/app/models/form/sales/questions/previous_tenure.rb @@ -2,7 +2,6 @@ class Form::Sales::Questions::PreviousTenure < ::Form::Question def initialize(id, hsh, page) super @id = "socprevten" - @copy_key = "sales.sale_information.socprevten" @type = "radio" @page = page @answer_options = ANSWER_OPTIONS diff --git a/app/models/form/sales/questions/resale.rb b/app/models/form/sales/questions/resale.rb index 0026adb48..2417960b4 100644 --- a/app/models/form/sales/questions/resale.rb +++ b/app/models/form/sales/questions/resale.rb @@ -2,7 +2,6 @@ class Form::Sales::Questions::Resale < ::Form::Question def initialize(id, hsh, page) super @id = "resale" - @copy_key = "sales.sale_information.resale" @type = "radio" @answer_options = ANSWER_OPTIONS @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max] diff --git a/app/models/form/sales/questions/value.rb b/app/models/form/sales/questions/value.rb index 257344fa2..1d258899d 100644 --- a/app/models/form/sales/questions/value.rb +++ b/app/models/form/sales/questions/value.rb @@ -2,7 +2,6 @@ class Form::Sales::Questions::Value < ::Form::Question def initialize(id, hsh, page) super @id = "value" - @copy_key = "sales.sale_information.value" @type = "numeric" @min = 0 @step = 1 diff --git a/app/models/form/sales/subsections/discounted_ownership_scheme.rb b/app/models/form/sales/subsections/discounted_ownership_scheme.rb index 8131df4a7..ce88d0c9f 100644 --- a/app/models/form/sales/subsections/discounted_ownership_scheme.rb +++ b/app/models/form/sales/subsections/discounted_ownership_scheme.rb @@ -4,6 +4,7 @@ class Form::Sales::Subsections::DiscountedOwnershipScheme < ::Form::Subsection @id = "discounted_ownership_scheme" @label = "Discounted ownership scheme" @depends_on = [{ "ownershipsch" => 2, "setup_completed?" => true }] + @copy_key = "sale_information" end def pages diff --git a/app/models/form/sales/subsections/outright_sale.rb b/app/models/form/sales/subsections/outright_sale.rb index af63c8179..afa0f4a69 100644 --- a/app/models/form/sales/subsections/outright_sale.rb +++ b/app/models/form/sales/subsections/outright_sale.rb @@ -4,6 +4,7 @@ class Form::Sales::Subsections::OutrightSale < ::Form::Subsection @id = "outright_sale" @label = "Outright sale" @depends_on = [{ "ownershipsch" => 3, "setup_completed?" => true }] + @copy_key = "sale_information" end def pages