Browse Source

Update text copy to use 'Other' for consistency in instead of 'other'

pull/3044/head
Manny Dinssa 1 month ago
parent
commit
57a72ebbb1
  1. 8
      app/services/bulk_upload/sales/year2023/row_parser.rb
  2. 6
      app/services/bulk_upload/sales/year2024/row_parser.rb
  3. 8
      spec/fixtures/files/2022_23_sales_bulk_upload.csv
  4. 8
      spec/fixtures/files/blank_bulk_upload_sales.csv
  5. 4
      spec/services/bulk_upload/lettings/year2024/row_parser_spec.rb
  6. 4
      spec/services/bulk_upload/lettings/year2025/row_parser_spec.rb

8
app/services/bulk_upload/sales/year2023/row_parser.rb

@ -16,7 +16,7 @@ class BulkUpload::Sales::Year2023::RowParser
field_9: "What is the type of discounted ownership sale?", field_9: "What is the type of discounted ownership sale?",
field_10: "What is the type of outright sale?", field_10: "What is the type of outright sale?",
field_11: "If 'other', what is the 'other' type?", field_11: "If 'Other', what is the 'Other' type?",
field_12: "Is the buyer a company?", field_12: "Is the buyer a company?",
field_13: "Will the buyers live in the property?", field_13: "Will the buyers live in the property?",
field_14: "Is this a joint purchase?", field_14: "Is this a joint purchase?",
@ -122,7 +122,7 @@ class BulkUpload::Sales::Year2023::RowParser
field_105: "Was a mortgage used for the purchase of this property? - Shared ownership", field_105: "Was a mortgage used for the purchase of this property? - Shared ownership",
field_106: "What is the mortgage amount?", field_106: "What is the mortgage amount?",
field_107: "What is the name of the mortgage lender? - Shared ownership", field_107: "What is the name of the mortgage lender? - Shared ownership",
field_108: "If 'other', what is the name of the mortgage lender?", field_108: "If 'Other', what is the name of the mortgage lender?",
field_109: "What is the length of the mortgage in years? - Shared ownership", field_109: "What is the length of the mortgage in years? - Shared ownership",
field_110: "Does this include any extra borrowing?", field_110: "Does this include any extra borrowing?",
@ -138,7 +138,7 @@ class BulkUpload::Sales::Year2023::RowParser
field_120: "What is the mortgage amount?", field_120: "What is the mortgage amount?",
field_121: "What is the name of the mortgage lender? - Discounted ownership", field_121: "What is the name of the mortgage lender? - Discounted ownership",
field_122: "If 'other', what is the name of the mortgage lender?", field_122: "If 'Other', what is the name of the mortgage lender?",
field_123: "What is the length of the mortgage in years? - Discounted ownership", field_123: "What is the length of the mortgage in years? - Discounted ownership",
field_124: "Does this include any extra borrowing?", field_124: "Does this include any extra borrowing?",
field_125: "How much was the cash deposit paid on the property?", field_125: "How much was the cash deposit paid on the property?",
@ -148,7 +148,7 @@ class BulkUpload::Sales::Year2023::RowParser
field_129: "What is the mortgage amount?", field_129: "What is the mortgage amount?",
field_130: "What is the name of the mortgage lender? - Outright sale", field_130: "What is the name of the mortgage lender? - Outright sale",
field_131: "If 'other', what is the name of the mortgage lender?", field_131: "If 'Other', what is the name of the mortgage lender?",
field_132: "What is the length of the mortgage in years? - Outright sale", field_132: "What is the length of the mortgage in years? - Outright sale",
field_133: "Does this include any extra borrowing?", field_133: "Does this include any extra borrowing?",
field_134: "How much was the cash deposit paid on the property?", field_134: "How much was the cash deposit paid on the property?",

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

@ -17,7 +17,7 @@ class BulkUpload::Sales::Year2024::RowParser
field_10: "What is the type of discounted ownership sale?", field_10: "What is the type of discounted ownership sale?",
field_11: "What is the type of outright sale?", field_11: "What is the type of outright sale?",
field_12: "If 'other', what is the 'other' type?", field_12: "If 'Other', what is the 'Other' type?",
field_13: "Is the buyer a company?", field_13: "Is the buyer a company?",
field_14: "Will the buyers live in the property?", field_14: "Will the buyers live in the property?",
field_15: "Is this a joint purchase?", field_15: "Is this a joint purchase?",
@ -120,7 +120,7 @@ class BulkUpload::Sales::Year2024::RowParser
field_103: "Was a mortgage used for the purchase of this property? - Shared ownership", field_103: "Was a mortgage used for the purchase of this property? - Shared ownership",
field_104: "What is the mortgage amount?", field_104: "What is the mortgage amount?",
field_105: "What is the name of the mortgage lender? - Shared ownership", field_105: "What is the name of the mortgage lender? - Shared ownership",
field_106: "If 'other', what is the name of the mortgage lender?", field_106: "If 'Other', what is the name of the mortgage lender?",
field_107: "What is the length of the mortgage in years? - Shared ownership", field_107: "What is the length of the mortgage in years? - Shared ownership",
field_108: "Does this include any extra borrowing?", field_108: "Does this include any extra borrowing?",
@ -136,7 +136,7 @@ class BulkUpload::Sales::Year2024::RowParser
field_118: "What is the mortgage amount?", field_118: "What is the mortgage amount?",
field_119: "What is the name of the mortgage lender? - Discounted ownership", field_119: "What is the name of the mortgage lender? - Discounted ownership",
field_120: "If 'other', what is the name of the mortgage lender?", field_120: "If 'Other', what is the name of the mortgage lender?",
field_121: "What is the length of the mortgage in years? - Discounted ownership", field_121: "What is the length of the mortgage in years? - Discounted ownership",
field_122: "Does this include any extra borrowing?", field_122: "Does this include any extra borrowing?",
field_123: "How much was the cash deposit paid on the property?", field_123: "How much was the cash deposit paid on the property?",

8
spec/fixtures/files/2022_23_sales_bulk_upload.csv vendored

@ -50,7 +50,7 @@ Discounted ownership","How much was the cash deposit paid on the property?
Discounted ownership","What are the total monthly leasehold charges for the property? Discounted ownership","What are the total monthly leasehold charges for the property?
Discounted ownership",What is the type of outright sale?,"What is the 'other' type of outright sale? Discounted ownership",What is the type of outright sale?,"What is the 'Other' type of outright sale?
Outright sale",[BLANK],"What is the full purchase price? Outright sale",[BLANK],"What is the full purchase price?
@ -66,15 +66,15 @@ Outright sale","Which organisation owned this property before the sale?
Organisation's CORE ID",Username,BLANK,Has the buyer ever served in the UK Armed Forces and for how long?,[BLANK],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?,"What is the name of the mortgage lender? Organisation's CORE ID",Username,BLANK,Has the buyer ever served in the UK Armed Forces and for how long?,[BLANK],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?,"What is the name of the mortgage lender?
Shared ownership","What is the name of the 'other' mortgage lender? Shared ownership","What is the name of the 'Other' mortgage lender?
Shared ownership","What is the name of the mortgage lender? Shared ownership","What is the name of the mortgage lender?
Discounted ownership","What is the name of the 'other' mortgage lender? Discounted ownership","What is the name of the 'Other' mortgage lender?
Discounted ownership","What is the name of the mortgage lender? Discounted ownership","What is the name of the mortgage lender?
Outright sale","What is the name of the 'other' mortgage lender? Outright sale","What is the name of the 'Other' mortgage lender?
Outright sale",Were the buyers receiving any of these housing-related benefits immediately before buying this property?,"What is the length of the mortgage in years? Outright sale",Were the buyers receiving any of these housing-related benefits immediately before buying this property?,"What is the length of the mortgage in years?

1 Question What is the purchaser code? What is the day of the sale completion date? - DD What is the month of the sale completion date? - MM What is the year of the sale completion date? - YY [BLANK] Was the buyer interviewed for any of the answers you will provide on this log? Age of Buyer 1 Age of Buyer 2 or Person 2 Age of Person 3 Age of Person 4 Age of Person 5 Age of Person 6 Gender identity of Buyer 1 Gender identity of Buyer 2 or Person 2 Gender identity of Person 3 Gender identity of Person 4 Gender identity of Person 5 Gender identity of Person 6 Person 2's relationship to lead tenant Person 3's relationship to lead tenant Person 4's relationship to lead tenant Person 5's relationship to lead tenant Person 6's relationship to lead tenant Working situation of Buyer 1 Working situation of Buyer 2 or Person 2 Working situation of Person 3 Working situation of Person 4 Working situation of Person 5 Working situation of Person 6 What is the buyer 1's ethnic group? What is buyer 1's nationality? What is buyer 1's gross annual income? What is buyer 2's gross annual income? Was buyer 1's income used for a mortgage application? Was buyer 2's income used for a mortgage application? What is the total amount the buyers had in savings before they paid any deposit for the property? To the nearest £10 Have any of the buyers previously owned a property? [BLANK] What was buyer 1's previous tenure? What is the local authority of buyer 1's last settled home Part 1 of postcode of buyer 1's last settled home Part 2 of postcode of buyer 1's last settled home Do you know the postcode of buyer 1's last settled home? Was the buyer registered with their PRP (HA)? Was the buyer registered with the local authority? Was the buyer registered with a Help to Buy agent? Was the buyer registered with another PRP (HA)? Does anyone in the household consider themselves to have a disability? Does anyone in the household use a wheelchair? How many bedrooms does the property have? What type of unit is the property? Which type of building is the property? What is the local authority of the property? Part 1 of postcode of property Part 2 of postcode of property Is the property built or adapted to wheelchair-user standards? What is the type of shared ownership sale? Is this a resale? Shared ownership What is the day of the practical completion or handover date? - DD Shared ownership What is the month of the practical completion or handover date? - MM Shared ownership What is the year of the practical completion or handover date? - YY Shared ownership What is the day of the exchange of contracts date? - DD Shared ownership What is the month of the exchange of contracts date? - MM Shared ownership What is the year of the exchange of contracts date? - YY Shared ownership Was the household re-housed under a local authority nominations agreement? Shared ownership How many bedrooms did the buyer's previous property have? Shared ownership What was the type of the buyer's previous property? Shared ownership What was the full purchase price? Shared ownership What was the initial percentage equity stake purchased? Shared ownership What is the mortgage amount? Shared ownership Does this include any extra borrowing? Shared ownership How much was the cash deposit paid on the property? Shared ownership How much cash discount was given through Social Homebuy? Shared ownership What is the basic monthly rent? Shared ownership What are the total monthly leasehold charges for the property? Shared ownership What is the type of discounted ownership sale? What was the full purchase price? Discounted ownership What was the amount of any loan, grant, discount or subsidy given? Discounted ownership What was the percentage discount? Discounted ownership What is the mortgage amount? Discounted ownership Does this include any extra borrowing? Discounted ownership How much was the cash deposit paid on the property? Discounted ownership What are the total monthly leasehold charges for the property? Discounted ownership What is the type of outright sale? What is the 'other' type of outright sale? Outright sale What is the 'Other' type of outright sale? Outright sale [BLANK] What is the full purchase price? Outright sale What is the mortgage amount? Outright sale Does this include any extra borrowing? Outright sale How much was the cash deposit paid on the property? Outright sale What are the total monthly leasehold charges for the property? Outright sale Which organisation owned this property before the sale? Organisation's CORE ID Username BLANK Has the buyer ever served in the UK Armed Forces and for how long? [BLANK] 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? What is the name of the mortgage lender? Shared ownership What is the name of the 'other' mortgage lender? Shared ownership What is the name of the 'Other' mortgage lender? Shared ownership What is the name of the mortgage lender? Discounted ownership What is the name of the 'other' mortgage lender? Discounted ownership What is the name of the 'Other' mortgage lender? Discounted ownership What is the name of the mortgage lender? Outright sale What is the name of the 'other' mortgage lender? Outright sale What is the name of the 'Other' mortgage lender? Outright sale Were the buyers receiving any of these housing-related benefits immediately before buying this property? What is the length of the mortgage in years? Shared ownership What is the length of the mortgage in years? Discounted ownership What is the length of the mortgage in years? Outright sale How long have the buyers been living in the property before the purchase? Discounted ownership Are there more than two joint purchasers of this property? How long have the buyers been living in the property before the purchase? Shared ownership Is this a staircasing transaction? Data Protection question Was this purchase made through an ownership scheme? Is the buyer a company? Outright sale Will the buyers live in the property? Is this a joint purchase? Will buyer 1 live in the property? Will buyer 2 live in the property? Besides the buyers, how many people live in the property? What percentage of the property has been bought in this staircasing transaction? Shared ownership What percentage of the property does the buyer now own in total? Shared ownership What was the rent type of the buyer's previous property? Shared ownership Was a mortgage used for the purchase of this property? Shared ownership Was a mortgage used for the purchase of this property? Discounted ownership Was a mortgage used for the purchase of this property? Outright sale
50
51
52
53
54
55
56
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80

8
spec/fixtures/files/blank_bulk_upload_sales.csv vendored

@ -50,7 +50,7 @@ Discounted ownership","How much was the cash deposit paid on the property?
Discounted ownership","What are the total monthly leasehold charges for the property? Discounted ownership","What are the total monthly leasehold charges for the property?
Discounted ownership",What is the type of outright sale?,"What is the 'other' type of outright sale? Discounted ownership",What is the type of outright sale?,"What is the 'Other' type of outright sale?
Outright sale",[BLANK],"What is the full purchase price? Outright sale",[BLANK],"What is the full purchase price?
@ -66,15 +66,15 @@ Outright sale","Which organisation owned this property before the sale?
Organisation's CORE ID",Username,BLANK,Has the buyer ever served in the UK Armed Forces and for how long?,[BLANK],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?,"What is the name of the mortgage lender? Organisation's CORE ID",Username,BLANK,Has the buyer ever served in the UK Armed Forces and for how long?,[BLANK],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?,"What is the name of the mortgage lender?
Shared ownership","What is the name of the 'other' mortgage lender? Shared ownership","What is the name of the 'Other' mortgage lender?
Shared ownership","What is the name of the mortgage lender? Shared ownership","What is the name of the mortgage lender?
Discounted ownership","What is the name of the 'other' mortgage lender? Discounted ownership","What is the name of the 'Other' mortgage lender?
Discounted ownership","What is the name of the mortgage lender? Discounted ownership","What is the name of the mortgage lender?
Outright sale","What is the name of the 'other' mortgage lender? Outright sale","What is the name of the 'Other' mortgage lender?
Outright sale",Were the buyers receiving any of these housing-related benefits immediately before buying this property?,"What is the length of the mortgage in years? Outright sale",Were the buyers receiving any of these housing-related benefits immediately before buying this property?,"What is the length of the mortgage in years?

1 Question What is the purchaser code? What is the day of the sale completion date? - DD What is the month of the sale completion date? - MM What is the year of the sale completion date? - YY [BLANK] Was the buyer interviewed for any of the answers you will provide on this log? Age of Buyer 1 Age of Buyer 2 or Person 2 Age of Person 3 Age of Person 4 Age of Person 5 Age of Person 6 Gender identity of Buyer 1 Gender identity of Buyer 2 or Person 2 Gender identity of Person 3 Gender identity of Person 4 Gender identity of Person 5 Gender identity of Person 6 Person 2's relationship to lead tenant Person 3's relationship to lead tenant Person 4's relationship to lead tenant Person 5's relationship to lead tenant Person 6's relationship to lead tenant Working situation of Buyer 1 Working situation of Buyer 2 or Person 2 Working situation of Person 3 Working situation of Person 4 Working situation of Person 5 Working situation of Person 6 What is the buyer 1's ethnic group? What is buyer 1's nationality? What is buyer 1's gross annual income? What is buyer 2's gross annual income? Was buyer 1's income used for a mortgage application? Was buyer 2's income used for a mortgage application? What is the total amount the buyers had in savings before they paid any deposit for the property? To the nearest £10 Have any of the buyers previously owned a property? [BLANK] What was buyer 1's previous tenure? What is the local authority of buyer 1's last settled home Part 1 of postcode of buyer 1's last settled home Part 2 of postcode of buyer 1's last settled home Do you know the postcode of buyer 1's last settled home? Was the buyer registered with their PRP (HA)? Was the buyer registered with the local authority? Was the buyer registered with a Help to Buy agent? Was the buyer registered with another PRP (HA)? Does anyone in the household consider themselves to have a disability? Does anyone in the household use a wheelchair? How many bedrooms does the property have? What type of unit is the property? Which type of building is the property? What is the local authority of the property? Part 1 of postcode of property Part 2 of postcode of property Is the property built or adapted to wheelchair-user standards? What is the type of shared ownership sale? Is this a resale? Shared ownership What is the day of the practical completion or handover date? - DD Shared ownership What is the month of the practical completion or handover date? - MM Shared ownership What is the year of the practical completion or handover date? - YY Shared ownership What is the day of the exchange of contracts date? - DD Shared ownership What is the month of the exchange of contracts date? - MM Shared ownership What is the year of the exchange of contracts date? - YY Shared ownership Was the household re-housed under a local authority nominations agreement? Shared ownership How many bedrooms did the buyer's previous property have? Shared ownership What was the type of the buyer's previous property? Shared ownership What was the full purchase price? Shared ownership What was the initial percentage equity stake purchased? Shared ownership What is the mortgage amount? Shared ownership Does this include any extra borrowing? Shared ownership How much was the cash deposit paid on the property? Shared ownership How much cash discount was given through Social Homebuy? Shared ownership What is the basic monthly rent? Shared ownership What are the total monthly leasehold charges for the property? Shared ownership What is the type of discounted ownership sale? What was the full purchase price? Discounted ownership What was the amount of any loan, grant, discount or subsidy given? Discounted ownership What was the percentage discount? Discounted ownership What is the mortgage amount? Discounted ownership Does this include any extra borrowing? Discounted ownership How much was the cash deposit paid on the property? Discounted ownership What are the total monthly leasehold charges for the property? Discounted ownership What is the type of outright sale? What is the 'other' type of outright sale? Outright sale What is the 'Other' type of outright sale? Outright sale [BLANK] What is the full purchase price? Outright sale What is the mortgage amount? Outright sale Does this include any extra borrowing? Outright sale How much was the cash deposit paid on the property? Outright sale What are the total monthly leasehold charges for the property? Outright sale Which organisation owned this property before the sale? Organisation's CORE ID Username BLANK Has the buyer ever served in the UK Armed Forces and for how long? [BLANK] 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? What is the name of the mortgage lender? Shared ownership What is the name of the 'other' mortgage lender? Shared ownership What is the name of the 'Other' mortgage lender? Shared ownership What is the name of the mortgage lender? Discounted ownership What is the name of the 'other' mortgage lender? Discounted ownership What is the name of the 'Other' mortgage lender? Discounted ownership What is the name of the mortgage lender? Outright sale What is the name of the 'other' mortgage lender? Outright sale What is the name of the 'Other' mortgage lender? Outright sale Were the buyers receiving any of these housing-related benefits immediately before buying this property? What is the length of the mortgage in years? Shared ownership What is the length of the mortgage in years? Discounted ownership What is the length of the mortgage in years? Outright sale How long have the buyers been living in the property before the purchase? Discounted ownership Are there more than two joint purchasers of this property? How long have the buyers been living in the property before the purchase? Shared ownership Is this a staircasing transaction? Data Protection question Was this purchase made through an ownership scheme? Is the buyer a company? Outright sale Will the buyers live in the property? Is this a joint purchase? Will buyer 1 live in the property? Will buyer 2 live in the property? Besides the buyers, how many people live in the property? What percentage of the property has been bought in this staircasing transaction? Shared ownership What percentage of the property does the buyer now own in total? Shared ownership What was the rent type of the buyer's previous property? Shared ownership Was a mortgage used for the purchase of this property? Shared ownership Was a mortgage used for the purchase of this property? Discounted ownership Was a mortgage used for the purchase of this property? Outright sale
50
51
52
53
54
55
56
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80

4
spec/services/bulk_upload/lettings/year2024/row_parser_spec.rb

@ -2635,7 +2635,7 @@ RSpec.describe BulkUpload::Lettings::Year2024::RowParser do
end end
describe "#reasonother" do describe "#reasonother" do
context "when reason is 'other'" do context "when reason is 'Other'" do
let(:attributes) { { bulk_upload:, field_98: "20", field_99: "some other reason" } } let(:attributes) { { bulk_upload:, field_98: "20", field_99: "some other reason" } }
it "is set to given free text string" do it "is set to given free text string" do
@ -2643,7 +2643,7 @@ RSpec.describe BulkUpload::Lettings::Year2024::RowParser do
end end
end end
context "when reason is not 'other'" do context "when reason is not 'Other'" do
let(:attributes) { { bulk_upload:, field_98: "50", field_99: "some other reason" } } let(:attributes) { { bulk_upload:, field_98: "50", field_99: "some other reason" } }
it "is set to nil" do it "is set to nil" do

4
spec/services/bulk_upload/lettings/year2025/row_parser_spec.rb

@ -2408,7 +2408,7 @@ RSpec.describe BulkUpload::Lettings::Year2025::RowParser do
end end
describe "#reasonother" do describe "#reasonother" do
context "when reason is 'other'" do context "when reason is 'Other'" do
let(:attributes) { { bulk_upload:, field_98: "20", field_99: "some other reason" } } let(:attributes) { { bulk_upload:, field_98: "20", field_99: "some other reason" } }
it "is set to given free text string" do it "is set to given free text string" do
@ -2416,7 +2416,7 @@ RSpec.describe BulkUpload::Lettings::Year2025::RowParser do
end end
end end
context "when reason is not 'other'" do context "when reason is not 'Other'" do
let(:attributes) { { bulk_upload:, field_98: "50", field_99: "some other reason" } } let(:attributes) { { bulk_upload:, field_98: "50", field_99: "some other reason" } }
it "is set to nil" do it "is set to nil" do

Loading…
Cancel
Save