From 8e236036617301446c60d36f929d24d4187ba840 Mon Sep 17 00:00:00 2001 From: samyou-softwire Date: Tue, 10 Mar 2026 12:23:44 +0000 Subject: [PATCH] CLDC-4204: Update row parser question titles to match form --- .../bulk_upload/sales/year2026/row_parser.rb | 149 +++++++++--------- .../sales/year2026/row_parser_spec.rb | 2 +- 2 files changed, 75 insertions(+), 76 deletions(-) diff --git a/app/services/bulk_upload/sales/year2026/row_parser.rb b/app/services/bulk_upload/sales/year2026/row_parser.rb index cb9eea1ae..35c84abe3 100644 --- a/app/services/bulk_upload/sales/year2026/row_parser.rb +++ b/app/services/bulk_upload/sales/year2026/row_parser.rb @@ -5,124 +5,123 @@ class BulkUpload::Sales::Year2026::RowParser include FormattingHelper QUESTIONS = { - field_1: "What is the day of the sale completion date? - DD", - field_2: "What is the month of the sale completion date? - MM", - field_3: "What is the year of the sale completion date? - YY", + field_1: "What is the sale completion date? - day DD", + field_2: "What is the sale completion date? - month MM", + field_3: "What is the sale completion date? - year YY", field_4: "Which organisation owned this property before the sale?", field_5: "Which organisation is reporting this sale?", - field_6: "Username", + field_6: "What is the CORE username of the account this sale log should be assigned to?", field_7: "What is the purchaser code?", field_8: "Is this a shared ownership or discounted ownership sale?", field_9: "What is the type of shared ownership sale?", field_10: "Is this a staircasing transaction?", field_11: "What is the type of discounted ownership sale?", field_12: "Is this a joint purchase?", - field_13: "Are there more than two joint purchasers of this property?", - field_14: "Was the buyer interviewed for any of the answers you will provide on this log?", - field_15: "Data Protection question", + field_13: "Are there more than 2 joint buyers of this property?", + field_14: "Did you interview the buyer to answer these questions?", + field_15: "Has the buyer seen or been given access to the MHCLG privacy notice?", field_16: "If known, enter this property’s UPRN", - field_17: "Address line 1", - field_18: "Address line 2", + field_17: "Address Line 1", + field_18: "Address Line 2", field_19: "Town or city", field_20: "County", - field_21: "Part 1 of postcode of property", - field_22: "Part 2 of postcode of property", - field_23: "What is the local authority of the property?", + field_21: "Part 1 of the property's postcode", + field_22: "Part 2 of the property's postcode", + field_23: "What is the property's local authority?", field_24: "What type of unit is the property?", field_25: "What is the building height classification?", field_26: "How many bedrooms does the property have?", field_27: "Which type of building is the property?", - field_28: "Is the property built or adapted to wheelchair user standards?", + field_28: "Is the property built or adapted to wheelchair-user standards?", - field_29: "Age of buyer 1", - field_30: "Buyer 1's sex, as registered at birth", + field_29: "What is buyer 1’s age?", + field_30: "What is buyer 1's sex?", field_31: "Is the gender buyer 1 identifies with the same as their sex registered at birth?", field_32: "If 'No', enter buyer 1's gender identity", - field_33: "What is buyer 1’s ethnic group?", - field_34: "What is buyer 1’s nationality?", - field_35: "Working situation of buyer 1", + field_33: "Which of the following best describes buyer 1's ethnic background?", + field_34: "What is buyer 1's nationality?", + field_35: "Which of these best describes buyer 1’s working situation?", field_36: "Will buyer 1 live in the property?", field_37: "Is buyer 2 or person 2 the partner of buyer 1?", - field_38: "Age of person 2", - field_39: "Buyer/Person 2's sex, as registered at birth", - field_40: "Is the gender buyer/person 2 identifies with the same as their sex registered at birth?", - field_41: "If 'No', enter buyer/person 2's gender identity", - field_42: "Which of the following best describes buyer 2’s ethnic background?", - field_43: "What is buyer 2’s nationality?", - field_44: "What is buyer 2 or person 2’s working situation?", - field_45: "Will buyer 2 live in the property?", - field_46: "Besides the buyers, how many people will live in the property?", + field_38: "What is buyer 2's or person 2's age?", + field_39: "What is buyer 2 or person 2's sex?", + field_40: "Is the gender buyer 2 or person 2 identifies with the same as their sex registered at birth?", + field_41: "If 'No', enter buyer 2 or person 2's gender identity", + field_42: "Which of the following best describes buyer 2 or person 2's ethnic background?", + field_43: "What is buyer 2 or person 2's nationality?", + field_44: "Which of these best describes buyer 2 or person 2’s working situation?", + field_45: "Will buyer 2 or person 2 live in the property?", + field_46: "In total, how many people live in the property?", field_47: "Is person 3 the partner of buyer 1?", - field_48: "Age of person 3", - field_49: "Person 3's sex, as registered at birth", - field_50: "Is the gender person 3 identifies with the same as their sex registered at birth?", + field_48: "What is person 3's age?", + field_49: "What is person 3's sex?", + field_50: "Is the gender person 3's identifies with the same as their sex registered at birth?", field_51: "If 'No', enter person 3's gender identity", - field_52: "Working situation of person 3", + field_52: "Which of these best describes person 3’s working situation?", field_53: "Is person 4 the partner of buyer 1?", - field_54: "Age of person 4", - field_55: "Person 4's sex, as registered at birth", - field_56: "Is the gender person 4 identifies with the same as their sex registered at birth?", + field_54: "What is person 4's age?", + field_55: "What is person 4's sex?", + field_56: "Is the gender person 4's identifies with the same as their sex registered at birth?", field_57: "If 'No', enter person 4's gender identity", - field_58: "Working situation of person 4", + field_58: "Which of these best describes person 4’s working situation?", field_59: "Is person 5 the partner of buyer 1?", - field_60: "Age of person 5", - field_61: "Person 5's sex, as registered at birth", - field_62: "Is the gender person 5 identifies with the same as their sex registered at birth?", + field_60: "What is person 5's age?", + field_61: "What is person 5's sex?", + field_62: "Is the gender person 5's identifies with the same as their sex registered at birth?", field_63: "If 'No', enter person 5's gender identity", - field_64: "Working situation of person 5", + field_64: "Which of these best describes person 5’s working situation?", field_65: "Is person 6 the partner of buyer 1?", - field_66: "Age of person 6", - field_67: "Person 6's sex, as registered at birth", - field_68: "Is the gender person 6 identifies with the same as their sex registered at birth?", + field_66: "What is person 6's age?", + field_67: "What is person 6's sex?", + field_68: "Is the gender person 6's identifies with the same as their sex registered at birth?", field_69: "If 'No', enter person 6's gender identity", - field_70: "Working situation of person 6", - - field_71: "What was buyer 1’s previous tenure?", - field_72: "Do you know the postcode of buyer 1’s last settled home?", - field_73: "Part 1 of postcode of buyer 1’s last settled home", - field_74: "Part 2 of postcode of buyer 1’s last settled home", - field_75: "What is the local authority of buyer 1’s last settled home?", + field_70: "Which of these best describes person 6’s working situation?", + field_71: "What was buyer 1's previous tenure?", + field_72: "Do you know the postcode of buyer 1's last settled accommodation?", + field_73: "Part 1 of postcode of buyer 1's last settled accommodation", + field_74: "Part 2 of postcode of buyer 1's last settled accommodation", + field_75: "What is the local authority of buyer 1's last settled accommodation?", field_76: "At the time of purchase, was buyer 2 living at the same address as buyer 1?", - field_77: "What was buyer 2’s previous tenure?", + field_77: "What was buyer 2's previous tenure?", - field_78: "Has the buyer ever served in the UK Armed Forces and for how long?", + field_78: "Have any of the buyers ever served as a regular in the UK armed forces?", field_79: "Is the buyer still serving in the UK armed forces?", - field_80: "Are any of the buyers a spouse or civil partner of a UK Armed Forces regular who died in service within the last 2 years?", + field_80: "Are any of the buyers a spouse or civil partner of a UK armed forces regular who died in service within the last 2 years?", field_81: "Does anyone in the household consider themselves to have a disability?", field_82: "Does anyone in the household use a wheelchair?", - field_83: "What is buyer 1’s gross annual income?", - field_84: "Was buyer 1’s income used for a mortgage application?", - field_85: "What is buyer 2’s gross annual income?", - field_86: "Was buyer 2’s income used for a mortgage application?", + field_83: "What is buyer 1's annual income?", + field_84: "Was buyer 1's income used for a mortgage application?", + field_85: "What is buyer 2's annual income?", + field_86: "Was buyer 2's income used for a mortgage application?", field_87: "Were the buyers receiving any of these housing-related benefits immediately before buying this property?", field_88: "What is the total amount the buyers had in savings before they paid any deposit for the property?", - field_89: "Have any of the purchasers previously owned a property?", + field_89: "Have any of the buyers previously owned a property?", field_90: "Was the previous property under shared ownership?", field_91: "Is this a resale?", - field_92: "How long have the buyers been living in the property before the purchase? - Shared ownership", - field_93: "What is the day of the practical completion or handover date?", - field_94: "What is the month of the practical completion or handover date?", - field_95: "What is the year of the practical completion or handover date?", - field_96: "How many bedrooms did the buyer’s previous property have?", - field_97: "What was the type of the buyer’s previous property?", - field_98: "What was the rent type of the buyer’s previous property?", - field_99: "What was the full purchase price?", + field_92: "How long did the buyer(s) live in the property before purchasing it?", + field_93: "What is the day of the practical completion or handover date? - DD", + field_94: "What is the month of the practical completion or handover date? - MM", + field_95: "What is the year of the practical completion or handover date? - YY", + field_96: "How many bedrooms did the buyer's previous property have?", + field_97: "What was the previous property type?", + field_98: "What was the buyer’s previous tenure?", + field_99: "What is the full purchase price?", field_100: "What was the initial percentage share purchased?", - field_101: "Was a mortgage used for the purchase of this property? - Shared ownership", + field_101: "Was a mortgage used to buy this property?", field_102: "What is the mortgage amount?", - field_103: "What is the length of the mortgage in years? - Shared ownership", + field_103: "What is the length of the mortgage?", field_104: "How much was the cash deposit paid on the property?", - field_105: "How much cash discount was given through Social Homebuy?", + field_105: "How much cash discount was given through Social HomeBuy?", field_106: "What is the basic monthly rent?", field_107: "What are the total monthly service charges for the property?", field_108: "What are the total monthly estate management fees for the property?", field_109: "What percentage of the property has been bought in this staircasing transaction?", - field_110: "What percentage of the property does the buyer now own in total?", + field_110: "What percentage of the property do the buyers now own in total?", field_111: "Was this transaction part of a back-to-back staircasing transaction to facilitate sale of the home on the open market?", field_112: "Is this the first time the buyer has engaged in staircasing in the home?", field_113: "What was the day of the initial purchase of a share in the property? DD", @@ -137,16 +136,16 @@ class BulkUpload::Sales::Year2026::RowParser field_122: "Was a mortgage used for this staircasing transaction?", field_123: "What was the basic monthly rent prior to staircasing?", field_124: "What is the basic monthly rent after staircasing?", - field_125: "Will the service charge change after this staircasing transaction takes place?", - field_126: "What are the new total monthly service charges for the property?", + field_125: "What are the monthly service charges for the property?", + field_126: "If the service charges will change after this staircasing transaction takes places, what is the new monthly service charge amount?", - field_127: "How long have the buyers been living in the property before the purchase? - Discounted ownership", - field_128: "What was the full purchase price?", + field_127: "How long did the buyer(s) live in the property before purchasing it?", + field_128: "What is the full purchase price?", field_129: "What was the amount of any loan, grant, discount or subsidy given?", field_130: "What was the percentage discount?", - field_131: "Was a mortgage used for the purchase of this property? - Discounted ownership", + field_131: "Was a mortgage used to buy this property?", field_132: "What is the mortgage amount?", - field_133: "What is the length of the mortgage in years? - Discounted ownership", + field_133: "What is the length of the mortgage?", field_134: "Does this include any extra borrowing?", field_135: "How much was the cash deposit paid on the property?", field_136: "What are the total monthly leasehold charges for the property?", diff --git a/spec/services/bulk_upload/sales/year2026/row_parser_spec.rb b/spec/services/bulk_upload/sales/year2026/row_parser_spec.rb index e2b134f0e..dc310a7b5 100644 --- a/spec/services/bulk_upload/sales/year2026/row_parser_spec.rb +++ b/spec/services/bulk_upload/sales/year2026/row_parser_spec.rb @@ -1356,7 +1356,7 @@ RSpec.describe BulkUpload::Sales::Year2026::RowParser do it "returns correct errors" do parser.valid? - expect(parser.errors[:field_101]).to include(I18n.t("validations.sales.2026.bulk_upload.invalid_option", question: "was a mortgage used for the purchase of this property? - Shared ownership.")) + expect(parser.errors[:field_101]).to include(I18n.t("validations.sales.2026.bulk_upload.invalid_option", question: "was a mortgage used to buy this property?")) parser.log.blank_invalid_non_setup_fields! parser.log.save!