diff --git a/.rake_tasks~ b/.rake_tasks~ new file mode 100644 index 000000000..e69de29bb diff --git a/app/controllers/test_data_controller.rb b/app/controllers/test_data_controller.rb index 3959019a6..9195b77aa 100644 --- a/app/controllers/test_data_controller.rb +++ b/app/controllers/test_data_controller.rb @@ -51,22 +51,24 @@ class TestDataController < ApplicationController redirect_to sales_log_path(log) end - def create_2024_test_sales_bulk_upload - return render_not_found unless FeatureToggle.create_test_logs_enabled? - - file = Tempfile.new("test_sales_log.csv") + [2024, 2025].each do |year| + define_method("create_#{year}_test_sales_bulk_upload") do + return render_not_found unless FeatureToggle.create_test_logs_enabled? - log = FactoryBot.create(:sales_log, :completed, assigned_to: current_user, value: 180_000, deposit: 150_000) - log_to_csv = BulkUpload::SalesLogToCsv.new(log:, line_ending: "\n", overrides: { organisation_id: "ORG#{log.owning_organisation_id}", managing_organisation_id: "ORG#{log.owning_organisation_id}" }) - file.write(log_to_csv.default_field_numbers_row) - file.write(log_to_csv.to_csv_row) - file.rewind - send_file file.path, type: "text/csv", - filename: "test_sales_log.csv", - disposition: "attachment", - after_send: lambda { - file.close - file.unlink - } + file = Tempfile.new("#{year}_test_sales_log.csv") + log = FactoryBot.create(:sales_log, :completed, assigned_to: current_user, value: 180_000, deposit: 150_000, county: "Somerset", saledate: Time.zone.local(year.to_i, rand(4..12), rand(1..28))) + log_to_csv = BulkUpload::SalesLogToCsv.new(log:, line_ending: "\n", overrides: { organisation_id: "ORG#{log.owning_organisation_id}", managing_organisation_id: "ORG#{log.owning_organisation_id}" }) + file.write(log_to_csv.default_field_numbers_row) + file.write(log_to_csv.to_csv_row) + file.rewind + send_file file.path, + type: "text/csv", + filename: "#{year}_test_sales_log.csv", + disposition: "attachment", + after_send: lambda { + file.close + file.unlink + } + end end end diff --git a/app/frontend/styles/_task-list.scss b/app/frontend/styles/_task-list.scss index f8e2128dd..a739bc245 100644 --- a/app/frontend/styles/_task-list.scss +++ b/app/frontend/styles/_task-list.scss @@ -52,3 +52,7 @@ margin-bottom: 0; } } + +.app-red-text { + color: govuk-colour("red"); +} diff --git a/app/helpers/bulk_upload/sales_log_to_csv.rb b/app/helpers/bulk_upload/sales_log_to_csv.rb index bc1435186..5fad19e74 100644 --- a/app/helpers/bulk_upload/sales_log_to_csv.rb +++ b/app/helpers/bulk_upload/sales_log_to_csv.rb @@ -19,7 +19,7 @@ class BulkUpload::SalesLogToCsv case year when 2022 to_2022_csv_row - when 2023, 2024 + when 2023, 2024, 2025 to_year_csv_row(year, seed:) else raise NotImplementedError "No mapping function implemented for year #{year}" @@ -67,6 +67,8 @@ class BulkUpload::SalesLogToCsv [6, 3, 4, 5, nil, 28, 30, 38, 47, 51, 55, 59, 31, 39, 48, 52, 56, 60, 37, 46, 50, 54, 58, 35, 43, 49, 53, 57, 61, 32, 33, 78, 80, 79, 81, 83, 84, nil, 62, 66, 64, 65, 63, 67, 69, 70, 68, 76, 77, 16, 17, 18, 26, 24, 25, 27, 8, 91, 95, 96, 97, 92, 93, 94, 98, 100, 101, 103, 104, 106, 110, 111, 112, 113, 114, 9, 116, 117, 118, 120, 124, 125, 126, 10, 11, nil, 127, 129, 133, 134, 135, 1, 2, nil, 73, nil, 75, 107, 108, 121, 122, 130, 131, 82, 109, 123, 132, 115, 15, 86, 87, 29, 7, 12, 13, 14, 36, 44, 45, 88, 89, 102, 105, 119, 128, 19, 20, 21, 22, 23, 34, 40, 41, 42, 71, 72, 74, 85, 90, 99] when 2024 (1..131).to_a + when 2025 + (1..121).to_a else raise NotImplementedError "No mapping function implemented for year #{year}" end @@ -395,6 +397,141 @@ class BulkUpload::SalesLogToCsv ] end + def to_2025_row + [ + log.saledate&.day, + log.saledate&.month, + log.saledate&.strftime("%y"), + overrides[:organisation_id] || log.owning_organisation&.old_visible_id, + overrides[:managing_organisation_id] || log.managing_organisation&.old_visible_id, + log.assigned_to&.email, + log.purchid, + log.ownershipsch, + log.ownershipsch == 1 ? log.type : "", # field_9: "What is the type of shared ownership sale?", + log.staircase, # 10 + log.ownershipsch == 2 ? log.type : "", # field_11: "What is the type of discounted ownership sale?", + log.jointpur, + log.jointmore, + log.noint, + log.privacynotice, + + log.uprn, + log.address_line1&.tr(",", " "), # 20 + log.address_line2&.tr(",", " "), + log.town_or_city&.tr(",", " "), + log.county&.tr(",", " "), + ((log.postcode_full || "").split(" ") || [""]).first, + ((log.postcode_full || "").split(" ") || [""]).last, + log.la, + log.proptype, + log.beds, + log.builtype, + log.wchair, + + log.age1, + log.sex1, + log.ethnic, # 30 + log.nationality_all_group, + log.ecstat1, + log.buy1livein, + log.relat2, + log.age2, + log.sex2, + log.ethnic_group2, + log.nationality_all_buyer2_group, + log.ecstat2, + log.buy2livein, # 40 + log.hholdcount, + + log.relat3, + log.age3, + log.sex3, + log.ecstat3, + log.relat4, + log.age4, + log.sex4, + log.ecstat4, + log.relat5, # 50 + log.age5, + log.sex5, + log.ecstat5, + log.relat6, + log.age6, + log.sex6, + log.ecstat6, + + log.prevten, + log.ppcodenk, + ((log.ppostcode_full || "").split(" ") || [""]).first, # 60 + ((log.ppostcode_full || "").split(" ") || [""]).last, + log.prevloc, + log.buy2living, + log.prevtenbuy2, + + log.hhregres, + log.hhregresstill, + log.armedforcesspouse, + log.disabled, + log.wheel, + + log.income1, # 70 + log.inc1mort, + log.income2, + log.inc2mort, + log.hb, + log.savings.present? || "R", + log.prevown, + log.prevshared, + + log.resale, + log.proplen, + log.hodate&.day, # 80 + log.hodate&.month, + log.hodate&.strftime("%y"), + log.frombeds, + log.fromprop, + log.socprevten, + log.value, + log.equity, + log.mortgageused, + log.mortgage, + log.mortlen, # 90 + log.deposit, + log.cashdis, + log.mrent, + log.mscharge, + log.management_fee, + + log.stairbought, + log.stairowned, + log.staircasesale, + log.firststair, + log.initialpurchase&.day, # 100 + log.initialpurchase&.month, + log.initialpurchase&.strftime("%y"), + log.numstair, + log.lasttransaction&.day, + log.lasttransaction&.month, + log.lasttransaction&.strftime("%y"), + log.value, + log.equity, + log.mortgageused, + log.mrentprestaircasing, # 110 + log.mrent, + + log.proplen, + log.value, + log.grant, + log.discount, + log.mortgageused, + log.mortgage, + log.mortlen, + log.extrabor, + log.deposit, # 120 + log.mscharge, + ] + end + def custom_field_numbers_row(seed: nil, field_numbers: nil) if seed ["Field number"] + field_numbers.shuffle(random: Random.new(seed)) diff --git a/app/helpers/collection_deadline_helper.rb b/app/helpers/collection_deadline_helper.rb index 3c4f7e502..de9c12075 100644 --- a/app/helpers/collection_deadline_helper.rb +++ b/app/helpers/collection_deadline_helper.rb @@ -61,12 +61,15 @@ module CollectionDeadlineHelper first_quarter(year).merge(quarter: "Q1"), second_quarter(year).merge(quarter: "Q2"), third_quarter(year).merge(quarter: "Q3"), + fourth_quarter(year).merge(quarter: "Q4"), ] end def quarter_for_date(date: Time.zone.now) - quarters = quarter_dates(current_collection_start_year) + collection_start_year = collection_start_year_for_date(date) + return unless QUARTERLY_DEADLINES.key?(collection_start_year) + quarters = quarter_dates(collection_start_year) quarter = quarters.find { |q| date.between?(q[:start_date], q[:cutoff_date] + 1.day) } return unless quarter diff --git a/app/helpers/tasklist_helper.rb b/app/helpers/tasklist_helper.rb index ff52f4094..631f4d315 100644 --- a/app/helpers/tasklist_helper.rb +++ b/app/helpers/tasklist_helper.rb @@ -2,6 +2,7 @@ module TasklistHelper include GovukLinkHelper include GovukVisuallyHiddenHelper include CollectionTimeHelper + include CollectionDeadlineHelper def breadcrumb_logs_title(log, current_user) log_type = log.lettings? ? "Lettings" : "Sales" @@ -70,6 +71,22 @@ module TasklistHelper status == :cannot_start_yet ? "" : "govuk-task-list__item--with-link" end + def deadline_text(log) + return if log.completed? + return if log.startdate.nil? + + log_quarter = quarter_for_date(date: log.startdate) + return if log_quarter.nil? + + deadline_for_log = log_quarter.cutoff_date + + if deadline_for_log.beginning_of_day >= Time.zone.today.beginning_of_day + "
Upcoming #{log_quarter.quarter} deadline: #{log_quarter.cutoff_date.strftime('%-d %B %Y')}.
".html_safe + else + "
Overdue: #{log_quarter.quarter} deadline #{log_quarter.cutoff_date.strftime('%-d %B %Y')}.
".html_safe + end + end + private def breadcrumb_organisation(log) diff --git a/app/models/derived_variables/lettings_log_variables.rb b/app/models/derived_variables/lettings_log_variables.rb index f584b6238..1e2aab790 100644 --- a/app/models/derived_variables/lettings_log_variables.rb +++ b/app/models/derived_variables/lettings_log_variables.rb @@ -72,6 +72,7 @@ module DerivedVariables::LettingsLogVariables self.beds = 1 end + clear_child_ecstat_for_age_changes! child_under_16_constraints! self.hhtype = household_type @@ -243,6 +244,14 @@ private end end + def clear_child_ecstat_for_age_changes! + (2..8).each do |idx| + if public_send("age#{idx}_changed?") && self["ecstat#{idx}"] == 9 + self["ecstat#{idx}"] = nil + end + end + end + def household_type return unless totelder && totadult && totchild diff --git a/app/models/derived_variables/sales_log_variables.rb b/app/models/derived_variables/sales_log_variables.rb index ef4997283..ff8cd4916 100644 --- a/app/models/derived_variables/sales_log_variables.rb +++ b/app/models/derived_variables/sales_log_variables.rb @@ -46,6 +46,7 @@ module DerivedVariables::SalesLogVariables if saledate && form.start_year_2024_or_later? self.soctenant = soctenant_from_prevten_values + clear_child_ecstat_for_age_changes! child_under_16_constraints! end @@ -181,6 +182,15 @@ private end end + def clear_child_ecstat_for_age_changes! + start_index = joint_purchase? ? 3 : 2 + (start_index..6).each do |idx| + if public_send("age#{idx}_changed?") && self["ecstat#{idx}"] == 9 + self["ecstat#{idx}"] = nil + end + end + end + def household_type return unless total_elder && total_adult && totchild diff --git a/app/models/form/sales/pages/living_before_purchase.rb b/app/models/form/sales/pages/living_before_purchase.rb index b8797537b..3e2df425a 100644 --- a/app/models/form/sales/pages/living_before_purchase.rb +++ b/app/models/form/sales/pages/living_before_purchase.rb @@ -24,7 +24,7 @@ class Form::Sales::Pages::LivingBeforePurchase < ::Form::Page end def page_routed_to?(log) - return false if form.start_year_2025_or_later? && log.resale != 2 + return false if form.start_year_2025_or_later? && log.resale != 2 && log.ownershipsch == 1 if @joint_purchase log.joint_purchase? diff --git a/app/models/form/sales/questions/living_before_purchase_years.rb b/app/models/form/sales/questions/living_before_purchase_years.rb index d2df3209b..010aa6edc 100644 --- a/app/models/form/sales/questions/living_before_purchase_years.rb +++ b/app/models/form/sales/questions/living_before_purchase_years.rb @@ -9,7 +9,7 @@ class Form::Sales::Questions::LivingBeforePurchaseYears < ::Form::Question @step = 1 @width = 5 @ownershipsch = ownershipsch - @question_number = question_number + @question_number = QUESTION_NUMBER_FROM_YEAR_AND_OWNERSHIP.fetch(form.start_date.year, QUESTION_NUMBER_FROM_YEAR_AND_OWNERSHIP.max_by { |k, _v| k }.last)[ownershipsch] end def suffix_label(log) diff --git a/app/models/forms/bulk_upload_form/prepare_your_file.rb b/app/models/forms/bulk_upload_form/prepare_your_file.rb index 1838e754f..7f6cfd759 100644 --- a/app/models/forms/bulk_upload_form/prepare_your_file.rb +++ b/app/models/forms/bulk_upload_form/prepare_your_file.rb @@ -10,12 +10,7 @@ module Forms attribute :organisation_id, :integer def view_path - case year - when 2024 - "bulk_upload_#{log_type}_logs/forms/prepare_your_file_2024" - when 2025 - "bulk_upload_#{log_type}_logs/forms/prepare_your_file_2025" - end + "bulk_upload_#{log_type}_logs/forms/prepare_your_file" end def back_path @@ -44,6 +39,10 @@ module Forms "#{year} to #{year + 1}" end + def slash_year_combo + "#{year}/#{(year + 1) % 100}" + end + def save! true end diff --git a/app/services/bulk_upload/sales/log_creator.rb b/app/services/bulk_upload/sales/log_creator.rb index 69f1580a0..a21e7a31a 100644 --- a/app/services/bulk_upload/sales/log_creator.rb +++ b/app/services/bulk_upload/sales/log_creator.rb @@ -33,6 +33,8 @@ private BulkUpload::Sales::Year2023::CsvParser.new(path:) when 2024 BulkUpload::Sales::Year2024::CsvParser.new(path:) + when 2025 + BulkUpload::Sales::Year2025::CsvParser.new(path:) else raise "csv parser not found" end diff --git a/app/services/bulk_upload/sales/validator.rb b/app/services/bulk_upload/sales/validator.rb index 7ad9638d7..0b2d68bc5 100644 --- a/app/services/bulk_upload/sales/validator.rb +++ b/app/services/bulk_upload/sales/validator.rb @@ -108,6 +108,8 @@ private BulkUpload::Sales::Year2023::CsvParser.new(path:) when 2024 BulkUpload::Sales::Year2024::CsvParser.new(path:) + when 2025 + BulkUpload::Sales::Year2025::CsvParser.new(path:) else raise "csv parser not found" end diff --git a/app/services/bulk_upload/sales/year2024/row_parser.rb b/app/services/bulk_upload/sales/year2024/row_parser.rb index 443d5e665..f33bfb5fa 100644 --- a/app/services/bulk_upload/sales/year2024/row_parser.rb +++ b/app/services/bulk_upload/sales/year2024/row_parser.rb @@ -375,6 +375,7 @@ class BulkUpload::Sales::Year2024::RowParser greater_than_or_equal_to: 0, less_than_or_equal_to: 70, if: :discounted_ownership?, + allow_blank: true, }, on: :before_log diff --git a/app/services/bulk_upload/sales/year2025/csv_parser.rb b/app/services/bulk_upload/sales/year2025/csv_parser.rb new file mode 100644 index 000000000..ec052dbfb --- /dev/null +++ b/app/services/bulk_upload/sales/year2025/csv_parser.rb @@ -0,0 +1,124 @@ +require "csv" + +class BulkUpload::Sales::Year2025::CsvParser + include CollectionTimeHelper + + FIELDS = 121 + MAX_COLUMNS = 142 + FORM_YEAR = 2025 + + attr_reader :path + + def initialize(path:) + @path = path + end + + def row_offset + if with_headers? + rows.find_index { |row| row[0].present? && row[0].match(/field number/i) } + 1 + else + 0 + end + end + + def col_offset + with_headers? ? 1 : 0 + end + + def cols + @cols ||= ("A".."DR").to_a + end + + def row_parsers + @row_parsers ||= body_rows.map { |row| + next if row.empty? + + stripped_row = row[col_offset..] + hash = Hash[field_numbers.zip(stripped_row)] + + BulkUpload::Sales::Year2025::RowParser.new(hash) + }.compact + end + + def body_rows + rows[row_offset..] + end + + def rows + @rows ||= CSV.parse(normalised_string, row_sep:) + end + + def column_for_field(field) + cols[field_numbers.find_index(field) + col_offset] + end + + def wrong_template_for_year? + collection_start_year_for_date(first_record_start_date) != FORM_YEAR + rescue Date::Error + false + end + + def missing_required_headers? + !with_headers? + end + + def correct_field_count? + valid_field_numbers_count = field_numbers.count { |f| f != "field_blank" } + + valid_field_numbers_count == FIELDS + end + +private + + def default_field_numbers + (1..FIELDS).map do |number| + if number.to_s.match?(/^[0-9]+$/) + "field_#{number}" + else + "field_blank" + end + end + end + + def field_numbers + @field_numbers ||= if with_headers? + rows[row_offset - 1][col_offset..].map { |number| number.to_s.match?(/^[0-9]+$/) ? "field_#{number}" : "field_blank" } + else + default_field_numbers + end + end + + def headers + @headers ||= ("field_1".."field_#{FIELDS}").to_a + end + + def with_headers? + # we will eventually want to validate that headers exist for this year + rows.map { |r| r[0] }.any? { |cell| cell&.match?(/field number/i) } + end + + def row_sep + "\n" + end + + def normalised_string + return @normalised_string if @normalised_string + + @normalised_string = File.read(path, encoding: "bom|utf-8") + @normalised_string.gsub!("\r\n", "\n") + @normalised_string.scrub!("") + @normalised_string.tr!("\r", "\n") + + @normalised_string + end + + def first_record_start_date + if with_headers? + year = row_parsers.first.field_3.to_s.strip.length.between?(1, 2) ? row_parsers.first.field_3.to_i + 2000 : row_parsers.first.field_3.to_i + Date.new(year, row_parsers.first.field_2.to_i, row_parsers.first.field_1.to_i) + else + year = rows.first[2].to_s.strip.length.between?(1, 2) ? rows.first[2].to_i + 2000 : rows.first[2].to_i + Date.new(year, rows.first[1].to_i, rows.first[0].to_i) + end + end +end diff --git a/app/services/bulk_upload/sales/year2025/row_parser.rb b/app/services/bulk_upload/sales/year2025/row_parser.rb new file mode 100644 index 000000000..ee97d6776 --- /dev/null +++ b/app/services/bulk_upload/sales/year2025/row_parser.rb @@ -0,0 +1,1502 @@ +class BulkUpload::Sales::Year2025::RowParser + include ActiveModel::Model + include ActiveModel::Attributes + include InterruptionScreenHelper + 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_4: "Which organisation owned this property before the sale?", + field_5: "Which organisation is reporting this sale?", + field_6: "Username", + field_7: "What is the purchaser code?", + field_8: "What is the sale type?", + 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_16: "If known, enter this property's UPRN", + 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_24: "What type of unit is the property?", + field_25: "How many bedrooms does the property have?", + field_26: "Which type of building is the property?", + field_27: "Is the property built or adapted to wheelchair user standards?", + + field_28: "Age of buyer 1", + field_29: "Gender identity of buyer 1", + field_30: "What is buyer 1's ethnic group?", + field_31: "What is buyer 1's nationality?", + field_32: "Working situation of buyer 1", + field_33: "Will buyer 1 live in the property?", + field_34: "Is buyer 2 or person 2 the partner of buyer 1?", + field_35: "Age of person 2", + field_36: "Gender identity of person 2", + field_37: "Which of the following best describes buyer 2's ethnic background?", + field_38: "What is buyer 2's nationality?", + field_39: "What is buyer 2 or person 2's working situation?", + field_40: "Will buyer 2 live in the property?", + field_41: "Besides the buyers, how many people will live in the property?", + + field_42: "Is person 3 the partner of buyer 1?", + field_43: "Age of person 3", + field_44: "Gender identity of person 3", + field_45: "Working situation of person 3", + field_46: "Is person 4 the partner of buyer 1?", + field_47: "Age of person 4", + field_48: "Gender identity of person 4", + field_49: "Working situation of person 4", + field_50: "Is person 5 the partner of buyer 1?", + field_51: "Age of person 5", + field_52: "Gender identity of person 5", + field_53: "Working situation of person 5", + field_54: "Is person 6 the partner of buyer 1?", + field_55: "Age of person 6", + field_56: "Gender identity of person 6", + field_57: "Working situation of person 6", + + field_58: "What was buyer 1's previous tenure?", + field_59: "Do you know the postcode of buyer 1's last settled home?", + field_60: "Part 1 of postcode of buyer 1's last settled home", + field_61: "Part 2 of postcode of buyer 1's last settled home", + field_62: "What is the local authority of buyer 1's last settled home?", + field_63: "At the time of purchase, was buyer 2 living at the same address as buyer 1?", + field_64: "What was buyer 2's previous tenure?", + + field_65: "Has the buyer ever served in the UK Armed Forces and for how long?", + field_66: "Is the buyer still serving in the UK armed forces?", + field_67: "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_68: "Does anyone in the household consider themselves to have a disability?", + field_69: "Does anyone in the household use a wheelchair?", + + field_70: "What is buyer 1's gross annual income?", + field_71: "Was buyer 1's income used for a mortgage application?", + field_72: "What is buyer 2's gross annual income?", + field_73: "Was buyer 2's income used for a mortgage application?", + field_74: "Were the buyers receiving any of these housing-related benefits immediately before buying this property?", + field_75: "What is the total amount the buyers had in savings before they paid any deposit for the property?", + field_76: "Have any of the purchasers previously owned a property?", + field_77: "Was the previous property under shared ownership?", + + field_78: "Is this a resale?", + field_79: "How long have the buyers been living in the property before the purchase? - Shared ownership", + field_80: "What is the day of the practical completion or handover date?", + field_81: "What is the month of the practical completion or handover date?", + field_82: "What is the year of the practical completion or handover date?", + field_83: "How many bedrooms did the buyer's previous property have?", + field_84: "What was the type of the buyer's previous property?", + field_85: "What was the rent type of the buyer's previous property?", + field_86: "What was the full purchase price?", + field_87: "What was the initial percentage share purchased?", + field_88: "Was a mortgage used for the purchase of this property? - Shared ownership", + field_89: "What is the mortgage amount?", + field_90: "What is the length of the mortgage in years? - Shared ownership", + field_91: "How much was the cash deposit paid on the property?", + field_92: "How much cash discount was given through Social Homebuy?", + field_93: "What is the basic monthly rent?", + field_94: "What are the total monthly service charges for the property?", + field_95: "What are the total monthly estate management fees for the property?", + + field_96: "What percentage of the property has been bought in this staircasing transaction?", + field_97: "What percentage of the property does the buyer now own in total?", + field_98: "Was this transaction part of a back-to-back staircasing transaction to facilitate sale of the home on the open market?", + field_99: "Is this the first time the buyer has engaged in staircasing in the home?", + field_100: "What was the day of the initial purchase of a share in the property? DD", + field_101: "What was the month of the initial purchase of a share in the property? MM", + field_102: "What was the year of the initial purchase of a share in the property? YYYY", + field_103: "Including this time, how many times has the shared owner engaged in staircasing in the home?", + field_104: "What was the day of the last staircasing transaction? DD", + field_105: "What was the month of the last staircasing transaction? MM", + field_106: "What was the year of the last staircasing transaction? YYYY", + field_107: "What is the full purchase price for this staircasing transaction?", + field_108: "What was the percentage share purchased in the initial transaction?", + field_109: "Was a mortgage used for this staircasing transaction?", + field_110: "What was the basic monthly rent prior to staircasing?", + field_111: "What is the basic monthly rent after staircasing?", + + field_112: "How long have the buyers been living in the property before the purchase? - Discounted ownership", + field_113: "What was the full purchase price?", + field_114: "What was the amount of any loan, grant, discount or subsidy given?", + field_115: "What was the percentage discount?", + field_116: "Was a mortgage used for the purchase of this property? - Discounted ownership", + field_117: "What is the mortgage amount?", + field_118: "What is the length of the mortgage in years? - Discounted ownership", + field_119: "Does this include any extra borrowing?", + field_120: "How much was the cash deposit paid on the property?", + field_121: "What are the total monthly leasehold charges for the property?", + }.freeze + + ERROR_BASE_KEY = "validations.sales.2025.bulk_upload".freeze + + attribute :bulk_upload + attribute :block_log_creation, :boolean, default: -> { false } + + attribute :field_blank + + attribute :field_1, :integer + attribute :field_2, :integer + attribute :field_3, :integer + attribute :field_4, :string + attribute :field_5, :string + attribute :field_6, :string + attribute :field_7, :string + attribute :field_8, :integer + attribute :field_9, :integer + attribute :field_10, :integer + attribute :field_11, :integer + attribute :field_12, :integer + attribute :field_13, :integer + attribute :field_14, :integer + attribute :field_15, :integer + + attribute :field_16, :string + attribute :field_17, :string + attribute :field_18, :string + attribute :field_19, :string + attribute :field_20, :string + attribute :field_21, :string + attribute :field_22, :string + attribute :field_23, :string + attribute :field_24, :integer + attribute :field_25, :integer + attribute :field_26, :integer + attribute :field_27, :integer + + attribute :field_28, :string + attribute :field_29, :string + attribute :field_30, :integer + attribute :field_31, :integer + attribute :field_32, :integer + attribute :field_33, :integer + attribute :field_34, :integer + attribute :field_35, :string + attribute :field_36, :string + attribute :field_37, :integer + attribute :field_38, :integer + attribute :field_39, :integer + attribute :field_40, :integer + attribute :field_41, :integer + + attribute :field_42, :integer + attribute :field_43, :string + attribute :field_44, :string + attribute :field_45, :integer + attribute :field_46, :integer + attribute :field_47, :string + attribute :field_48, :string + attribute :field_49, :integer + attribute :field_50, :integer + attribute :field_51, :string + attribute :field_52, :string + attribute :field_53, :integer + attribute :field_54, :integer + attribute :field_55, :string + attribute :field_56, :string + attribute :field_57, :integer + + attribute :field_58, :integer + attribute :field_59, :integer + attribute :field_60, :string + attribute :field_61, :string + attribute :field_62, :string + attribute :field_63, :integer + attribute :field_64, :string + + attribute :field_65, :integer + attribute :field_66, :integer + attribute :field_67, :integer + attribute :field_68, :integer + attribute :field_69, :integer + + attribute :field_70, :string + attribute :field_71, :integer + attribute :field_72, :string + attribute :field_73, :integer + attribute :field_74, :integer + attribute :field_75, :string + attribute :field_76, :integer + attribute :field_77, :integer + + attribute :field_78, :integer + attribute :field_79, :integer + attribute :field_80, :integer + attribute :field_81, :integer + attribute :field_82, :integer + attribute :field_83, :integer + attribute :field_84, :integer + attribute :field_85, :integer + attribute :field_86, :integer + attribute :field_87, :integer + attribute :field_88, :integer + attribute :field_89, :integer + attribute :field_90, :integer + attribute :field_91, :integer + attribute :field_92, :integer + attribute :field_93, :decimal + attribute :field_94, :decimal + attribute :field_95, :decimal + + attribute :field_96, :integer + attribute :field_97, :integer + attribute :field_98, :integer + attribute :field_99, :integer + attribute :field_100, :integer + attribute :field_101, :integer + attribute :field_102, :integer + attribute :field_103, :integer + attribute :field_104, :integer + attribute :field_105, :integer + attribute :field_106, :integer + attribute :field_107, :integer + attribute :field_108, :integer + attribute :field_109, :integer + attribute :field_110, :integer + attribute :field_111, :decimal + + attribute :field_112, :integer + attribute :field_113, :integer + attribute :field_114, :integer + attribute :field_115, :integer + attribute :field_116, :integer + attribute :field_117, :integer + attribute :field_118, :integer + attribute :field_119, :integer + attribute :field_120, :integer + attribute :field_121, :integer + + validates :field_1, + presence: { + message: I18n.t("#{ERROR_BASE_KEY}.not_answered", question: "sale completion date (day)."), + category: :setup, + }, + on: :after_log + + validates :field_2, + presence: { + message: I18n.t("#{ERROR_BASE_KEY}.not_answered", question: "sale completion date (month)."), + category: :setup, + }, on: :after_log + + validates :field_3, + presence: { + message: I18n.t("#{ERROR_BASE_KEY}.not_answered", question: "sale completion date (year)."), + category: :setup, + }, + format: { + with: /\A(\d{2}|\d{4})\z/, + message: I18n.t("#{ERROR_BASE_KEY}.saledate.year_not_two_or_four_digits"), + category: :setup, + if: proc { field_3.present? }, + }, on: :after_log + + validates :field_8, + inclusion: { + in: [1, 2], + if: proc { field_8.present? }, + category: :setup, + question: QUESTIONS[:field_8].downcase, + }, + on: :before_log + + validates :field_8, + presence: { + message: I18n.t("#{ERROR_BASE_KEY}.not_answered", question: "shared ownership sale type."), + category: :setup, + }, + on: :after_log + + validates :field_9, + inclusion: { + in: [2, 30, 18, 16, 24, 28, 31, 32], + if: proc { field_9.present? }, + category: :setup, + question: QUESTIONS[:field_9].downcase, + }, + on: :before_log + + validates :field_9, + presence: { + message: I18n.t("#{ERROR_BASE_KEY}.not_answered", question: "type of shared ownership sale."), + category: :setup, + if: :shared_ownership?, + }, + on: :after_log + + validates :field_10, + inclusion: { + in: [1, 2], + if: proc { field_10.present? }, + category: :setup, + question: QUESTIONS[:field_10].downcase, + }, + on: :before_log + + validates :field_10, + presence: { + message: I18n.t("#{ERROR_BASE_KEY}.not_answered", question: "staircasing transaction."), + category: :setup, + if: :shared_ownership?, + }, + on: :after_log + + validates :field_11, + inclusion: { + in: [8, 9, 14, 21, 22, 27, 29], + if: proc { field_11.present? }, + category: :setup, + question: QUESTIONS[:field_11].downcase, + }, + on: :before_log + + validates :field_11, + presence: { + message: I18n.t("#{ERROR_BASE_KEY}.not_answered", question: "type of discounted ownership sale."), + category: :setup, + if: :discounted_ownership?, + }, + on: :after_log + + validates :field_115, + numericality: { + message: I18n.t("#{ERROR_BASE_KEY}.numeric.within_range", field: "Percentage discount", min: "0%", max: "70%"), + greater_than_or_equal_to: 0, + less_than_or_equal_to: 70, + if: :discounted_ownership?, + allow_blank: true, + }, + on: :before_log + + validates :field_12, + presence: { + message: I18n.t("#{ERROR_BASE_KEY}.not_answered", question: "joint purchase."), + category: :setup, + if: :joint_purchase_asked?, + }, + on: :after_log + + validates :field_13, + presence: { + message: I18n.t("#{ERROR_BASE_KEY}.not_answered", question: "more than 2 joint buyers."), + category: :setup, + if: :joint_purchase?, + }, + on: :after_log + + validate :validate_buyer1_economic_status, on: :before_log + validate :validate_address_option_found, on: :after_log + validate :validate_buyer2_economic_status, on: :before_log + validate :validate_valid_radio_option, on: :before_log + + validate :validate_owning_org_data_given, on: :after_log + validate :validate_owning_org_exists, on: :after_log + validate :validate_owning_org_owns_stock, on: :after_log + validate :validate_owning_org_permitted, on: :after_log + + validate :validate_assigned_to_exists, on: :after_log + validate :validate_assigned_to_related, on: :after_log + validate :validate_assigned_to_when_support, on: :after_log + validate :validate_managing_org_related, on: :after_log + validate :validate_relevant_collection_window, on: :after_log + validate :validate_incomplete_soft_validations, on: :after_log + + validate :validate_uprn_exists_if_any_key_address_fields_are_blank, on: :after_log + validate :validate_address_fields, on: :after_log + validate :validate_if_log_already_exists, on: :after_log, if: -> { FeatureToggle.bulk_upload_duplicate_log_check_enabled? } + + validate :validate_nationality, on: :after_log + validate :validate_buyer_2_nationality, on: :after_log + + validate :validate_nulls, on: :after_log + + def self.question_for_field(field) + QUESTIONS[field] + end + + def attribute_set + @attribute_set ||= instance_variable_get(:@attributes) + end + + def blank_row? + attribute_set + .to_hash + .reject { |k, _| %w[bulk_upload block_log_creation].include?(k) } + .values + .reject(&:blank?) + .compact + .empty? + end + + def log + @log ||= SalesLog.new(attributes_for_log) + end + + def valid? + errors.clear + + return true if blank_row? + + super(:before_log) + @before_errors = errors.dup + + log.valid? + + super(:after_log) + errors.merge!(@before_errors) + + log.errors.each do |error| + fields = field_mapping_for_errors[error.attribute] || [] + + fields.each do |field| + next if errors.include?(field) + next if error.type == :skip_bu_error + + question = log.form.get_question(error.attribute, log) + + if question.present? && setup_question?(question) + errors.add(field, error.message, category: :setup) + else + errors.add(field, error.message) + end + end + end + + errors.blank? + end + + def block_log_creation? + block_log_creation + end + + def inspect + "#<%= govuk_link_to "Download the lettings bulk upload template (2024 to 2025)", @form.template_path %>
+<%= govuk_link_to "Download the lettings bulk upload template (#{@form.year_combo})", @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.
Use one of these templates to upload logs for 2024/25:
-<%= 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.
+Use one of these templates to upload logs for <%= @form.slash_year_combo %>:
+<%= govuk_link_to "Download the sales bulk upload template (#{@form.year_combo})", @form.template_path %>: In this template, the questions are in the same order as the <%= @form.slash_year_combo %> 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.
<%= govuk_link_to "Guidance for submitting social housing lettings and sales data (opens in a new tab)", guidance_path, target: "#" %>
This log has not been started.
<% elsif @log.status == "completed" %>@@ -36,6 +37,7 @@
<% end %> + <%= deadline_text(@log) %> <%= render "tasklist" %> <%= edit_actions_for_log(@log, bulk_upload_filter_applied) %> diff --git a/config/locales/en.yml b/config/locales/en.yml index 6ca3ea322..3e35a32ce 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -57,6 +57,8 @@ en: <<: *bulk_upload__row_parser__base bulk_upload/lettings/year2023/row_parser: <<: *bulk_upload__row_parser__base + bulk_upload/sales/year2025/row_parser: + <<: *bulk_upload__row_parser__base bulk_upload/sales/year2024/row_parser: <<: *bulk_upload__row_parser__base bulk_upload/sales/year2023/row_parser: diff --git a/config/locales/forms/2025/sales/sale_information.en.yml b/config/locales/forms/2025/sales/sale_information.en.yml index 93f5226b5..95eed6185 100644 --- a/config/locales/forms/2025/sales/sale_information.en.yml +++ b/config/locales/forms/2025/sales/sale_information.en.yml @@ -148,7 +148,7 @@ en: value_shared_ownership: check_answer_label: "Full purchase price" check_answer_prompt: "" - hint_text: "Enter the full purchase price of the property before any discounts are applied. For shared ownership, enter the full purchase price paid for 100% equity (this is equal to the value of the share owned by the PRP plus the value bought by the purchaser)." + hint_text: "Enter the full purchase price of the property before any discounts are applied. This is the full purchase price paid for 100% equity (this is equal to the value of the share owned by the PRP plus the value bought by the purchaser)." question_text: "What was the full purchase price?" value_shared_ownership_staircase: check_answer_label: "Full purchase price" diff --git a/config/locales/validations/sales/2025/bulk_upload.en.yml b/config/locales/validations/sales/2025/bulk_upload.en.yml new file mode 100644 index 000000000..c9d194fd0 --- /dev/null +++ b/config/locales/validations/sales/2025/bulk_upload.en.yml @@ -0,0 +1,46 @@ +en: + validations: + sales: + 2025: + bulk_upload: + not_answered: "You must answer %{question}" + invalid_option: "Enter a valid value for %{question}" + spreadsheet_dupe: "This is a duplicate of a log in your file." + duplicate: "This is a duplicate log." + blank_file: "Template is blank - The template must be filled in for us to create the logs and check if data is correct." + wrong_template: + over_max_column_count: "Too many columns, please ensure you have used the correct template." + no_headers: "Your file does not contain the required header rows. Add or check the header rows and upload your file again. [Read more about using the template headers](%{guidance_link})." + wrong_field_numbers_count: "Incorrect number of fields, please ensure you have used the correct template." + wrong_template: "Incorrect sale dates, please ensure you have used the correct template." + numeric: + within_range: "%{field} must be between %{min} and %{max}." + owning_organisation: + not_found: "The owning organisation code is incorrect." + not_stock_owner: "The owning organisation code provided is for an organisation that does not own stock." + not_permitted: + support: "This owning organisation is not affiliated with %{name}." + not_support: "You do not have permission to add logs for this owning organisation." + assigned_to: + not_found: "User with the specified email could not be found." + organisation_not_related: "User must be related to owning organisation or managing organisation." + managing_organisation_not_related: "This organisation does not have a relationship with the owning organisation." + saledate: + outside_collection_window: "Enter a date within the %{year_combo} collection year, which is between 1st April %{start_year} and 31st March %{end_year}." + year_not_two_or_four_digits: "Sale completion year must be 2 or 4 digits." + ecstat1: + buyer_cannot_be_over_16_and_child: "Buyer 1's age cannot be 16 or over if their working situation is child under 16." + buyer_cannot_be_child: "Buyer 1 cannot have a working situation of child under 16." + age1: + buyer_cannot_be_over_16_and_child: "Buyer 1's age cannot be 16 or over if their working situation is child under 16." + ecstat2: + buyer_cannot_be_over_16_and_child: "Buyer 2's age cannot be 16 or over if their working situation is child under 16." + buyer_cannot_be_child: "Buyer 2 cannot have a working situation of child under 16." + age2: + buyer_cannot_be_over_16_and_child: "Buyer 2's age cannot be 16 or over if their working situation is child under 16." + address: + not_found: "We could not find this address. Check the address data in your CSV file is correct and complete, or select the correct address using the CORE site." + not_determined: "There are multiple matches for this address. Either select the correct address manually or correct the UPRN in the CSV file." + not_answered: "Enter either the UPRN or the full address." + nationality: + invalid: "Select a valid nationality." diff --git a/session-manager-plugin.deb b/session-manager-plugin.deb new file mode 100644 index 000000000..3befd8f9c Binary files /dev/null and b/session-manager-plugin.deb differ diff --git a/spec/helpers/tasklist_helper_spec.rb b/spec/helpers/tasklist_helper_spec.rb index c5e1bd784..dc683c7b2 100644 --- a/spec/helpers/tasklist_helper_spec.rb +++ b/spec/helpers/tasklist_helper_spec.rb @@ -204,4 +204,49 @@ RSpec.describe TasklistHelper do end end end + + describe "deadline text" do + context "when log does not have a sale/start date" do + let(:log) { build(:sales_log, saledate: nil) } + + it "returns nil" do + expect(deadline_text(log)).to be_nil + end + end + + context "when log is completed" do + let(:log) { build(:sales_log, :completed, status: "completed") } + + it "returns nil" do + expect(deadline_text(log)).to be_nil + end + end + + context "when today is before the deadline for log with sale/start date" do + let(:log) { build(:sales_log, saledate: Time.zone.local(2025, 6, 1)) } + + it "returns the deadline text" do + allow(Time.zone).to receive(:today).and_return(Time.zone.local(2025, 5, 7)) + expect(deadline_text(log)).to include("Upcoming Q1 deadline: 11 July 2025.") + end + end + + context "when today is the deadline for log with sale/start date" do + let(:log) { build(:sales_log, saledate: Time.zone.local(2025, 2, 1)) } + + it "returns the overdue text" do + allow(Time.zone).to receive(:today).and_return(Time.zone.local(2025, 6, 6)) + expect(deadline_text(log)).to include("Upcoming Q4 deadline: 6 June 2025.") + end + end + + context "when today is after the deadline for log with sale/start date" do + let(:log) { build(:sales_log, saledate: Time.zone.local(2025, 2, 1)) } + + it "returns the overdue text" do + allow(Time.zone).to receive(:today).and_return(Time.zone.local(2025, 6, 7)) + expect(deadline_text(log)).to include("Overdue: Q4 deadline 6 June 2025.") + end + end + end end diff --git a/spec/models/bulk_upload_spec.rb b/spec/models/bulk_upload_spec.rb index 03342b627..61e16920e 100644 --- a/spec/models/bulk_upload_spec.rb +++ b/spec/models/bulk_upload_spec.rb @@ -41,6 +41,7 @@ RSpec.describe BulkUpload, type: :model do [ { year: 2023, expected_value: "2023 to 2024" }, { year: 2024, expected_value: "2024 to 2025" }, + { year: 2025, expected_value: "2025 to 2026" }, ].each do |test_case| context "when the bulk upload year is #{test_case[:year]}" do let(:bulk_upload) { build(:bulk_upload, year: test_case[:year]) } diff --git a/spec/models/form/sales/pages/living_before_purchase_spec.rb b/spec/models/form/sales/pages/living_before_purchase_spec.rb index b597f90e9..1f7cf6c51 100644 --- a/spec/models/form/sales/pages/living_before_purchase_spec.rb +++ b/spec/models/form/sales/pages/living_before_purchase_spec.rb @@ -95,7 +95,7 @@ RSpec.describe Form::Sales::Pages::LivingBeforePurchase, type: :model do end it "does not route to the page when resale is not 2" do - log = build(:sales_log, jointpur: 1, resale: nil) + log = build(:sales_log, jointpur: 1, resale: nil, ownershipsch: 1) expect(page.routed_to?(log, nil)).to eq(false) end end diff --git a/spec/models/lettings_log_derived_fields_spec.rb b/spec/models/lettings_log_derived_fields_spec.rb index d315db51e..e4edb194e 100644 --- a/spec/models/lettings_log_derived_fields_spec.rb +++ b/spec/models/lettings_log_derived_fields_spec.rb @@ -1206,4 +1206,24 @@ RSpec.describe LettingsLog, type: :model do end end end + + describe "#clear_child_ecstat_for_age_changes!" do + it "clears the working situation of a person that was previously a child under 16" do + log = create(:lettings_log, :completed, age2: 13) + log.age2 = 17 + expect { log.set_derived_fields! }.to change(log, :ecstat2).from(9).to(nil) + end + + it "does not clear the working situation of a person that had an age change but is still a child under 16" do + log = create(:lettings_log, :completed, age2: 13) + log.age2 = 15 + expect { log.set_derived_fields! }.to not_change(log, :ecstat2) + end + + it "does not clear the working situation of a person that had an age change but is still an adult" do + log = create(:lettings_log, :completed, age2: 45) + log.age2 = 46 + expect { log.set_derived_fields! }.to not_change(log, :ecstat2) + end + end end diff --git a/spec/models/sales_log_derived_fields_spec.rb b/spec/models/sales_log_derived_fields_spec.rb index 8eda0c36f..7827ce282 100644 --- a/spec/models/sales_log_derived_fields_spec.rb +++ b/spec/models/sales_log_derived_fields_spec.rb @@ -78,6 +78,26 @@ RSpec.describe SalesLog, type: :model do expect { log.set_derived_fields! }.to change(log, :mortgage).from(50_000).to(nil) end + describe "#clear_child_ecstat_for_age_changes!" do + it "clears the working situation of a person that was previously a child under 16" do + log = create(:sales_log, :completed, age3: 13, age4: 16, age5: 45) + log.age3 = 17 + expect { log.set_derived_fields! }.to change(log, :ecstat3).from(9).to(nil) + end + + it "does not clear the working situation of a person that had an age change but is still a child under 16" do + log = create(:sales_log, :completed, age3: 13, age4: 16, age5: 45) + log.age3 = 15 + expect { log.set_derived_fields! }.to not_change(log, :ecstat3) + end + + it "does not clear the working situation of a person that had an age change but is still an adult" do + log = create(:sales_log, :completed, age3: 13, age4: 16, age5: 45) + log.age5 = 46 + expect { log.set_derived_fields! }.to not_change(log, :ecstat5) + end + end + context "with a log that is not outright sales" do it "does not derive deposit when mortgage used is no" do log = build(:sales_log, :shared_ownership_setup_complete, value: 123_400, deposit: nil, mortgageused: 2) diff --git a/spec/requests/lettings_logs_controller_spec.rb b/spec/requests/lettings_logs_controller_spec.rb index 55cf3d573..92683edb3 100644 --- a/spec/requests/lettings_logs_controller_spec.rb +++ b/spec/requests/lettings_logs_controller_spec.rb @@ -1155,6 +1155,21 @@ RSpec.describe LettingsLogsController, type: :request do expect(lettings_log.status).to eq("completed") expect(page).to have_link("review and make changes to this log", href: "/lettings-logs/#{lettings_log.id}/review") end + + it "does not show guidance link" do + expect(page).not_to have_content("Guidance for submitting social housing lettings and sales data (opens in a new tab)") + end + end + + context "and the log is not started" do + let(:lettings_log) { create(:lettings_log, status: "not_started", assigned_to: user) } + + it "shows guidance link" do + allow(Time.zone).to receive(:now).and_return(lettings_log.form.edit_end_date - 1.day) + get lettings_log_path(lettings_log) + expect(lettings_log.status).to eq("not_started") + expect(page).to have_content("Guidance for submitting social housing lettings and sales data (opens in a new tab)") + end end context "with bulk_upload_id filter" do diff --git a/spec/requests/sales_logs_controller_spec.rb b/spec/requests/sales_logs_controller_spec.rb index d8209fa1d..e85ecb813 100644 --- a/spec/requests/sales_logs_controller_spec.rb +++ b/spec/requests/sales_logs_controller_spec.rb @@ -866,6 +866,7 @@ RSpec.describe SalesLogsController, type: :request do context "when viewing a sales log" do let(:headers) { { "Accept" => "text/html" } } let(:completed_sales_log) { FactoryBot.create(:sales_log, :completed, owning_organisation: user.organisation, assigned_to: user) } + let(:not_started_sales_log) { FactoryBot.create(:sales_log, owning_organisation: user.organisation, assigned_to: user) } before do sign_in user @@ -956,6 +957,16 @@ RSpec.describe SalesLogsController, type: :request do expect(page).to have_content("This log is from the 2021 to 2022 collection window, which is now closed.") end end + + it "does not show guidance link" do + get "/sales-logs/#{completed_sales_log.id}", headers:, params: {} + expect(page).not_to have_content("Guidance for submitting social housing lettings and sales data (opens in a new tab)") + end + + it "shows guidance link for not_started log" do + get "/sales-logs/#{not_started_sales_log.id}", headers:, params: {} + expect(page).to have_content("Guidance for submitting social housing lettings and sales data (opens in a new tab)") + end end context "when requesting CSV download" do diff --git a/spec/services/bulk_upload/sales/log_creator_spec.rb b/spec/services/bulk_upload/sales/log_creator_spec.rb index 2353a74c6..51c90781f 100644 --- a/spec/services/bulk_upload/sales/log_creator_spec.rb +++ b/spec/services/bulk_upload/sales/log_creator_spec.rb @@ -5,162 +5,187 @@ RSpec.describe BulkUpload::Sales::LogCreator do let(:owning_org) { create(:organisation, old_visible_id: 123) } let(:user) { create(:user, organisation: owning_org) } - - let(:bulk_upload) { create(:bulk_upload, :sales, user:, year: 2024) } - let(:csv_parser) { instance_double(BulkUpload::Sales::Year2024::CsvParser) } - let(:row_parser) { instance_double(BulkUpload::Sales::Year2024::RowParser) } let(:log) { build(:sales_log, :completed, assigned_to: user, owning_organisation: owning_org, managing_organisation: owning_org) } - before do - allow(BulkUpload::Sales::Year2024::CsvParser).to receive(:new).and_return(csv_parser) - allow(csv_parser).to receive(:row_parsers).and_return([row_parser]) - allow(row_parser).to receive(:log).and_return(log) - allow(row_parser).to receive(:bulk_upload=).and_return(true) - allow(row_parser).to receive(:valid?).and_return(true) - allow(row_parser).to receive(:blank_row?).and_return(false) - end - - describe "#call" do - context "when a valid csv with new log" do - it "creates a new log" do - expect { service.call }.to change(SalesLog, :count) - end - - it "create a log with pending status" do - service.call - expect(SalesLog.last.status).to eql("pending") - end - - it "associates log with bulk upload" do - service.call - - log = SalesLog.last - expect(log.bulk_upload).to eql(bulk_upload) - expect(bulk_upload.sales_logs).to include(log) - end - - it "sets the creation method" do - service.call + [2023, 2024, 2025].each do |year| + context "when #{year}" do + let(:bulk_upload) { create(:bulk_upload, :sales, user:, year:) } + let(:year_csv_parser) { instance_double("BulkUpload::Sales::Year#{year}::CsvParser".constantize) } + let(:year_row_parser) { instance_double("BulkUpload::Sales::Year#{year}::RowParser".constantize) } - expect(SalesLog.last.creation_method_bulk_upload?).to be true - end - end - - context "when a valid csv with several blank rows" do before do - allow(row_parser).to receive(:blank_row?).and_return(true) - end - - it "ignores them and does not create the logs" do - expect { service.call }.not_to change(SalesLog, :count) - end - end - - context "when a valid csv with row with one invalid non setup field" do - let(:log) do - build( - :sales_log, - :completed, - age1: 5, - owning_organisation: owning_org, - assigned_to: user, - managing_organisation: owning_org, - ) - end - - it "creates the log" do - expect { service.call }.to change(SalesLog, :count).by(1) - end - - it "blanks invalid field" do - service.call - - record = SalesLog.last - expect(record.age1).to be_blank - end - end - - context "when a valid csv with row with compound errors on non setup field" do - let(:log) do - build( - :sales_log, - :completed, - owning_organisation: owning_org, - assigned_to: user, - managing_organisation: owning_org, - ownershipsch: 2, - value: 200_000, - deposit: 10_000, - mortgageused: 1, - mortgage: 100_000, - grant: 10_000, - ) + allow("BulkUpload::Sales::Year#{year}::CsvParser".constantize).to receive(:new).and_return(year_csv_parser) + allow(year_csv_parser).to receive(:row_parsers).and_return([year_row_parser]) + allow(year_row_parser).to receive(:log).and_return(log) + allow(year_row_parser).to receive(:bulk_upload=).and_return(true) + allow(year_row_parser).to receive(:valid?).and_return(true) + allow(year_row_parser).to receive(:blank_row?).and_return(false) end - it "creates the log" do - expect { service.call }.to change(SalesLog, :count).by(1) - end - - it "blanks invalid field" do - service.call - - record = SalesLog.last - expect(record.value).to be_blank - expect(record.deposit).to be_blank - expect(record.mortgage).to be_blank - expect(record.grant).to be_blank - end - end - - context "when pre-creating logs" do - it "creates a new log" do + it "creates a parser for the correct year" do + # This would fail without parser stubs, so the parser must be for the expected year expect { service.call }.to change(SalesLog, :count) end - - it "creates a log with correct states" do - service.call - - last_log = SalesLog.last - - expect(last_log.status).to eql("pending") - expect(last_log.status_cache).to eql("completed") - end end + end - context "when valid csv with existing log" do - xit "what should happen?" + # Apart from picking the correct year's parser, everything else is year-independent + context "when 2024" do + let(:bulk_upload) { create(:bulk_upload, :sales, user:, year: 2024) } + let(:csv_parser) { instance_double(BulkUpload::Sales::Year2024::CsvParser) } + let(:row_parser) { instance_double(BulkUpload::Sales::Year2024::RowParser) } + + before do + allow(BulkUpload::Sales::Year2024::CsvParser).to receive(:new).and_return(csv_parser) + allow(csv_parser).to receive(:row_parsers).and_return([row_parser]) + allow(row_parser).to receive(:log).and_return(log) + allow(row_parser).to receive(:bulk_upload=).and_return(true) + allow(row_parser).to receive(:valid?).and_return(true) + allow(row_parser).to receive(:blank_row?).and_return(false) end - context "with a valid csv and soft validations" do - let(:log) do - build( - :sales_log, - :completed, - age1: 30, - age1_known: 0, - ecstat1: 5, - owning_organisation: owning_org, - assigned_to: user, - managing_organisation: owning_org, - ) - end - - it "creates a new log" do - expect { service.call }.to change(SalesLog, :count) - end - - it "creates a log with pending status" do - service.call - expect(SalesLog.last.status).to eql("pending") - end + describe "#call" do + context "when a valid csv with new log" do + it "creates a new log" do + expect { service.call }.to change(SalesLog, :count) + end + + it "create a log with pending status" do + service.call + expect(SalesLog.last.status).to eql("pending") + end - it "does not set unanswered soft validations" do - service.call + it "associates log with bulk upload" do + service.call - log = SalesLog.last - expect(log.age1).to be(30) - expect(log.ecstat1).to be(5) - expect(log.retirement_value_check).to be(nil) + log = SalesLog.last + expect(log.bulk_upload).to eql(bulk_upload) + expect(bulk_upload.sales_logs).to include(log) + end + + it "sets the creation method" do + service.call + + expect(SalesLog.last.creation_method_bulk_upload?).to be true + end + end + + context "when a valid csv with several blank rows" do + before do + allow(row_parser).to receive(:blank_row?).and_return(true) + end + + it "ignores them and does not create the logs" do + expect { service.call }.not_to change(SalesLog, :count) + end + end + + context "when a valid csv with row with one invalid non setup field" do + let(:log) do + build( + :sales_log, + :completed, + age1: 5, + owning_organisation: owning_org, + assigned_to: user, + managing_organisation: owning_org, + ) + end + + it "creates the log" do + expect { service.call }.to change(SalesLog, :count).by(1) + end + + it "blanks invalid field" do + service.call + + record = SalesLog.last + expect(record.age1).to be_blank + end + end + + context "when a valid csv with row with compound errors on non setup field" do + let(:log) do + build( + :sales_log, + :completed, + owning_organisation: owning_org, + assigned_to: user, + managing_organisation: owning_org, + ownershipsch: 2, + value: 200_000, + deposit: 10_000, + mortgageused: 1, + mortgage: 100_000, + grant: 10_000, + ) + end + + it "creates the log" do + expect { service.call }.to change(SalesLog, :count).by(1) + end + + it "blanks invalid field" do + service.call + + record = SalesLog.last + expect(record.value).to be_blank + expect(record.deposit).to be_blank + expect(record.mortgage).to be_blank + expect(record.grant).to be_blank + end + end + + context "when pre-creating logs" do + it "creates a new log" do + expect { service.call }.to change(SalesLog, :count) + end + + it "creates a log with correct states" do + service.call + + last_log = SalesLog.last + + expect(last_log.status).to eql("pending") + expect(last_log.status_cache).to eql("completed") + end + end + + context "when valid csv with existing log" do + xit "what should happen?" + end + + context "with a valid csv and soft validations" do + let(:log) do + build( + :sales_log, + :completed, + age1: 30, + age1_known: 0, + ecstat1: 5, + owning_organisation: owning_org, + assigned_to: user, + managing_organisation: owning_org, + ) + end + + it "creates a new log" do + expect { service.call }.to change(SalesLog, :count) + end + + it "creates a log with pending status" do + service.call + expect(SalesLog.last.status).to eql("pending") + end + + it "does not set unanswered soft validations" do + service.call + + log = SalesLog.last + expect(log.age1).to be(30) + expect(log.ecstat1).to be(5) + expect(log.retirement_value_check).to be(nil) + end end end end diff --git a/spec/services/bulk_upload/sales/validator_spec.rb b/spec/services/bulk_upload/sales/validator_spec.rb index 71a94a725..6bd118344 100644 --- a/spec/services/bulk_upload/sales/validator_spec.rb +++ b/spec/services/bulk_upload/sales/validator_spec.rb @@ -58,6 +58,22 @@ RSpec.describe BulkUpload::Sales::Validator do end end + context "when trying to upload 2024 logs for 2025 bulk upload" do + let(:bulk_upload) { create(:bulk_upload, user:, year: 2025) } + let(:log) { build(:sales_log, :completed, saledate: Time.zone.local(2024, 10, 10), assigned_to: user) } + + before do + file.write(log_to_csv.default_field_numbers_row_for_year(2025)) + file.write(log_to_csv.to_year_csv_row(2025)) + file.rewind + end + + it "is not valid" do + expect(validator).not_to be_valid + expect(validator.errors["base"]).to eql([I18n.t("validations.sales.2025.bulk_upload.wrong_template.wrong_template")]) + end + end + [ { line_ending: "\n", name: "unix" }, { line_ending: "\r\n", name: "windows" }, diff --git a/spec/services/bulk_upload/sales/year2025/csv_parser_spec.rb b/spec/services/bulk_upload/sales/year2025/csv_parser_spec.rb new file mode 100644 index 000000000..849e6bf2f --- /dev/null +++ b/spec/services/bulk_upload/sales/year2025/csv_parser_spec.rb @@ -0,0 +1,191 @@ +require "rails_helper" + +RSpec.describe BulkUpload::Sales::Year2025::CsvParser do + subject(:service) { described_class.new(path:) } + + let(:file) { Tempfile.new } + let(:path) { file.path } + let(:log) { build(:sales_log, :completed, :with_uprn) } + + context "when parsing csv with headers" do + before do + file.write("Question\n") + file.write("Additional info\n") + file.write("Values\n") + file.write("Can be empty?\n") + file.write("Type of letting the question applies to\n") + file.write("Duplicate check field?\n") + file.write(BulkUpload::SalesLogToCsv.new(log:).default_field_numbers_row_for_year(2025)) + file.write(BulkUpload::SalesLogToCsv.new(log:).to_year_csv_row(2025)) + file.write("\n") + file.rewind + end + + it "returns correct offsets" do + expect(service.row_offset).to eq(7) + expect(service.col_offset).to eq(1) + end + + it "parses csv correctly" do + expect(service.row_parsers[0].field_16).to eql(log.uprn) + end + + it "counts the number of valid field numbers correctly" do + expect(service).to be_correct_field_count + end + + it "does not parse the last empty row" do + expect(service.row_parsers.count).to eq(1) + end + end + + context "when some csv headers are empty (and we don't care about them)" do + before do + file.write("Question\n") + file.write("Additional info\n") + file.write("Values\n") + file.write("\n") + file.write("Type of letting the question applies to\n") + file.write("Duplicate check field?\n") + file.write(BulkUpload::SalesLogToCsv.new(log:).default_field_numbers_row_for_year(2025)) + file.write(BulkUpload::SalesLogToCsv.new(log:).to_year_csv_row(2025)) + file.write("\n") + file.rewind + end + + it "returns correct offsets" do + expect(service.row_offset).to eq(7) + expect(service.col_offset).to eq(1) + end + + it "parses csv correctly" do + expect(service.row_parsers[0].field_16).to eql(log.uprn) + end + + it "counts the number of valid field numbers correctly" do + expect(service).to be_correct_field_count + end + + it "does not parse the last empty row" do + expect(service.row_parsers.count).to eq(1) + end + end + + context "when parsing csv with headers in arbitrary order" do + let(:seed) { rand } + + before do + file.write("Question\n") + file.write("Additional info\n") + file.write("Values\n") + file.write("Can be empty?\n") + file.write("Type of letting the question applies to\n") + file.write("Duplicate check field?\n") + file.write(BulkUpload::SalesLogToCsv.new(log:).default_field_numbers_row_for_year(2025, seed:)) + file.write(BulkUpload::SalesLogToCsv.new(log:).to_year_csv_row(2025, seed:)) + file.rewind + end + + it "returns correct offsets" do + expect(service.row_offset).to eq(7) + expect(service.col_offset).to eq(1) + end + + it "parses csv correctly" do + expect(service.row_parsers[0].field_16).to eql(log.uprn) + end + end + + context "when parsing csv without headers" do + let(:file) { Tempfile.new } + let(:path) { file.path } + let(:log) { build(:sales_log, :completed, :with_uprn) } + + before do + file.write(BulkUpload::SalesLogToCsv.new(log:, col_offset: 0).to_year_csv_row(2025)) + file.rewind + end + + it "returns correct offsets" do + expect(service.row_offset).to eq(0) + expect(service.col_offset).to eq(0) + end + + it "parses csv correctly" do + expect(service.row_parsers[0].field_16).to eql(log.uprn) + end + end + + context "when parsing with BOM aka byte order mark" do + let(:file) { Tempfile.new } + let(:path) { file.path } + let(:log) { build(:sales_log, :completed, :with_uprn) } + let(:bom) { "\uFEFF" } + + before do + file.write(bom) + file.write(BulkUpload::SalesLogToCsv.new(log:, col_offset: 0).to_year_csv_row(2025)) + file.close + end + + it "parses csv correctly" do + expect(service.row_parsers[0].field_16).to eql(log.uprn) + end + end + + context "when an invalid byte sequence" do + let(:file) { Tempfile.new } + let(:path) { file.path } + let(:log) { build(:sales_log, :completed, :with_uprn) } + let(:invalid_sequence) { "\x81" } + + before do + file.write(invalid_sequence) + file.write(BulkUpload::SalesLogToCsv.new(log:, col_offset: 0).to_year_csv_row(2025)) + file.close + end + + it "parses csv correctly" do + expect(service.row_parsers[0].field_16).to eql(log.uprn) + end + end + + describe "#column_for_field", aggregate_failures: true do + context "when headers present" do + before do + file.write("Question\n") + file.write("Additional info\n") + file.write("Values\n") + file.write("Can be empty?\n") + file.write("Type of letting the question applies to\n") + file.write("Duplicate check field?\n") + file.write(BulkUpload::SalesLogToCsv.new(log:).default_field_numbers_row_for_year(2025)) + file.write(BulkUpload::SalesLogToCsv.new(log:).to_year_csv_row(2025)) + file.rewind + end + + it "returns correct column" do + expect(service.column_for_field("field_1")).to eql("B") + expect(service.column_for_field("field_99")).to eql("CV") + end + end + end + + context "when parsing csv with carriage returns" do + before do + file.write("Question\r\n") + file.write("Additional info\r") + file.write("Values\r\n") + file.write("Can be empty?\r") + file.write("Type of letting the question applies to\r\n") + file.write("Duplicate check field?\r") + file.write(BulkUpload::SalesLogToCsv.new(log:).default_field_numbers_row_for_year(2025)) + file.write(BulkUpload::SalesLogToCsv.new(log:).to_year_csv_row(2025)) + file.rewind + end + + it "parses csv correctly" do + expect(service.row_parsers[0].field_16).to eql(log.uprn) + end + end +end diff --git a/spec/services/bulk_upload/sales/year2025/row_parser_spec.rb b/spec/services/bulk_upload/sales/year2025/row_parser_spec.rb new file mode 100644 index 000000000..a0b87cdc1 --- /dev/null +++ b/spec/services/bulk_upload/sales/year2025/row_parser_spec.rb @@ -0,0 +1,1915 @@ +require "rails_helper" + +RSpec.describe BulkUpload::Sales::Year2025::RowParser do + subject(:parser) { described_class.new(attributes) } + + let(:now) { Time.zone.parse("01/05/2025") } + + let(:attributes) { { bulk_upload: } } + let(:bulk_upload) { create(:bulk_upload, :sales, user:, year: 2025) } + let(:user) { create(:user, organisation: owning_org) } + let(:owning_org) { create(:organisation, :with_old_visible_id) } + let(:managing_org) { create(:organisation, :with_old_visible_id) } + + let(:setup_section_params) do + { + bulk_upload:, + field_1: now.day.to_s, # sale day + field_2: now.month.to_s, # sale month + field_3: now.strftime("%g"), # sale year + field_4: owning_org.old_visible_id, # organisation + field_5: managing_org.old_visible_id, # organisation + field_6: user.email, # user + field_7: "test id", # purchase id + field_8: "1", # owhershipsch + field_9: "2", # shared ownership sale type + field_10: "1", # staircasing + field_12: "2", # joint purchase + field_14: "1", # noint + field_15: "1", # privacy notice + } + end + let(:valid_attributes) do + { + bulk_upload:, + field_1: "12", + field_2: "5", + field_3: "25", + field_4: owning_org.old_visible_id, + field_5: managing_org.old_visible_id, + field_7: "test id", + field_8: "1", + field_9: "2", + field_10: "1", + field_12: "1", + field_13: "2", + field_14: "1", + field_15: "1", + field_16: "12", + field_17: "Address line 1", + field_21: "CR0", + field_22: "4BB", + field_23: "E09000008", + field_24: "1", + field_25: "2", + field_26: "1", + field_27: "3", + field_28: "32", + field_29: "M", + field_30: "12", + field_31: "28", + field_32: "1", + field_33: "1", + field_34: "R", + field_35: "32", + field_36: "F", + field_37: "17", + field_38: "28", + field_39: "2", + field_40: "1", + field_41: "0", + field_58: "1", + field_59: "1", + field_60: "A1", + field_61: "1AA", + field_62: "E09000008", + field_63: "3", + field_65: "3", + field_67: "5", + field_68: "3", + field_69: "3", + field_70: "30000", + field_71: "1", + field_72: "15000", + field_73: "1", + field_74: "4", + field_75: "20000", + field_76: "3", + field_79: "5", + field_80: "24", + field_81: "3", + field_82: "2022", + field_83: "1", + field_84: "1", + field_85: "1", + field_107: "250000", + field_108: "25", + field_109: "1", + field_89: "5000", + field_90: "20", + field_96: "10", + field_97: "40", + field_98: "1", + field_99: "2", + field_94: "200", + field_91: "20000", + field_111: "800", + field_100: "05", + field_101: "04", + field_102: "2020", + field_103: "4", + field_104: "06", + field_105: "07", + field_106: "2023", + field_110: "900", + } + end + + around do |example| + create(:organisation_relationship, parent_organisation: owning_org, child_organisation: managing_org) + + Timecop.freeze(Time.zone.local(2026, 2, 22)) do + Singleton.__init__(FormHandler) + example.run + end + end + + describe "#blank_row?" do + context "when a new object" do + it "returns true" do + expect(parser).to be_blank_row + end + end + + context "when any field is populated" do + before do + parser.field_4 = "1" + end + + it "returns false" do + expect(parser).not_to be_blank_row + end + end + + context "when the only populated fields are empty strings or whitespace" do + before do + parser.field_6 = " " + parser.field_25 = "" + end + + it "returns true" do + expect(parser).to be_blank_row + end + end + end + + describe "purchaser_code" do + before do + def purch_id_field + described_class::QUESTIONS.key("What is the purchaser code?").to_s + end + end + + let(:attributes) do + { + bulk_upload:, + purch_id_field => "some purchaser code", + } + end + + it "is linked to the correct field" do + expect(parser.purchaser_code).to eq("some purchaser code") + end + end + + describe "previous postcode known" do + context "when field_59 is 1" do + let(:attributes) do + { + bulk_upload:, + field_59: 1, + } + end + + it "sets previous postcode known to yes" do + expect(parser.log.ppcodenk).to eq(0) + end + end + + context "when field_59 is 2" do + let(:attributes) do + { + bulk_upload:, + field_59: 2, + } + end + + it "sets previous postcode known to no" do + expect(parser.log.ppcodenk).to eq(1) + end + end + end + + describe "income and savings fields" do + context "when set to R" do + let(:attributes) do + { + bulk_upload:, + field_70: "R", # income 1 + field_72: "R", # income 2 + field_75: "R", # savings + } + end + + it "sets the not known field as not known" do + expect(parser.log.income1nk).to be(1) + expect(parser.log.income2nk).to be(1) + expect(parser.log.savingsnk).to be(1) + end + + it "leaves the value field nil" do + expect(parser.log.income1).to be_nil + expect(parser.log.income2).to be_nil + expect(parser.log.savings).to be_nil + end + end + + context "when set to a number" do + let(:attributes) do + { + bulk_upload:, + field_70: "30000", # income 1 + field_72: "0", # income 2 + field_75: "12420", # savings + } + end + + it "sets the not known field as known" do + expect(parser.log.income1nk).to be(0) + expect(parser.log.income2nk).to be(0) + expect(parser.log.savingsnk).to be(0) + end + + it "sets the values" do + expect(parser.log.income1).to be(30_000) + expect(parser.log.income2).to be(0) + expect(parser.log.savings).to be(12_420) + end + end + end + + describe "validations" do + before do + stub_request(:get, /api\.postcodes\.io/) + .to_return(status: 200, body: "{\"status\":200,\"result\":{\"admin_district\":\"Manchester\", \"codes\":{\"admin_district\": \"E08000003\"}}}", headers: {}) + + stub_request(:get, /api\.os\.uk/) + .to_return(status: 200, body: { results: [{ DPA: { MATCH: 0.9, BUILDING_NAME: "result address line 1", POST_TOWN: "result town or city", POSTCODE: "AA1 1AA", UPRN: "12345" } }] }.to_json, headers: {}) + end + + describe "#valid?" do + context "when the row is blank" do + let(:attributes) { { bulk_upload: } } + + it "returns true" do + expect(parser).to be_valid + end + end + + context "when calling the method multiple times" do + let(:attributes) { { bulk_upload:, field_8: 2 } } + + it "does not add keep adding errors to the pile" do + parser.valid? + expect { parser.valid? }.not_to change(parser.errors, :count) + end + end + + context "when valid row" do + let(:attributes) { valid_attributes } + + it "returns true" do + expect(parser).to be_valid + end + + it "instantiates a log with everything completed", aggregate_failures: true do + parser.valid? + + questions = parser.send(:questions).reject do |q| + parser.send(:log).optional_fields.include?(q.id) || q.completed?(parser.send(:log)) + end + + expect(questions.map(&:id).size).to eq(0) + expect(questions.map(&:id)).to eql([]) + end + end + + describe "#validate_nulls" do + context "when non-setup questions are null" do + let(:attributes) { setup_section_params.merge({ field_29: "" }) } + + it "fetches the question's check_answer_label if it exists" do + parser.valid? + expect(parser.errors[:field_29]).to eql([I18n.t("validations.not_answered", question: "buyer 1’s gender identity.")]) + end + end + + context "when other null error is added" do + let(:attributes) { setup_section_params.merge({ field_17: nil }) } + + it "only has one error added to the field" do + parser.valid? + expect(parser.errors[:field_17]).to eql([I18n.t("validations.sales.2025.bulk_upload.address.not_answered")]) + end + end + + context "when an invalid value error has been added" do + let(:attributes) { setup_section_params.merge({ field_10: "2", field_32: "100" }) } + + it "does not add an additional error" do + parser.valid? + expect(parser.errors[:field_32].length).to eq(1) + expect(parser.errors[:field_32]).to include(match I18n.t("validations.sales.2025.bulk_upload.invalid_option", question: "")) + end + end + end + end + + context "when setup section not complete and type is not given" do + let(:attributes) do + { + bulk_upload:, + field_7: "test id", + } + end + + it "has errors on correct setup fields" do + parser.valid? + + errors = parser.errors.select { |e| e.options[:category] == :setup }.map(&:attribute).sort + + expect(errors).to eql(%i[field_1 field_14 field_15 field_2 field_3 field_4 field_5 field_8]) + end + end + + context "when setup section not complete and type is shared ownership" do + let(:attributes) do + { + bulk_upload:, + field_7: "test id", + field_8: "1", + } + end + + it "has errors on correct setup fields" do + parser.valid? + + errors = parser.errors.select { |e| e.options[:category] == :setup }.map(&:attribute).sort + + expect(errors).to eql(%i[field_1 field_10 field_12 field_14 field_15 field_2 field_3 field_4 field_5 field_9]) + end + end + + context "when setup section not complete it's shared ownership joint purchase" do + let(:attributes) do + { + bulk_upload:, + field_7: "test id", + field_8: "1", + field_9: "2", + field_12: "1", + } + end + + it "has errors on correct setup fields" do + parser.valid? + + errors = parser.errors.select { |e| e.options[:category] == :setup }.map(&:attribute).sort + + expect(errors).to eql(%i[field_1 field_10 field_13 field_14 field_15 field_2 field_3 field_4 field_5]) + end + end + + context "when setup section not complete and type is discounted ownership" do + let(:attributes) do + { + bulk_upload:, + field_7: "test id", + field_8: "2", + field_11: nil, + } + end + + it "has errors on correct setup fields" do + parser.valid? + + errors = parser.errors.select { |e| e.options[:category] == :setup }.map(&:attribute).sort + + expect(errors).to eql(%i[field_1 field_11 field_12 field_14 field_15 field_2 field_3 field_4 field_5]) + end + end + + context "when setup section not complete and it's discounted ownership joint purchase" do + let(:attributes) do + { + bulk_upload:, + field_28: "2", + field_43: "8", + field_36: "1", + } + end + + it "has errors on correct setup fields" do + parser.valid? + + errors = parser.errors.select { |e| e.options[:category] == :setup }.map(&:attribute).sort + + expect(errors).to eql(%i[field_1 field_14 field_15 field_2 field_3 field_4 field_5 field_8]) + end + end + + describe "#field_4" do # owning org + context "when no data given" do + let(:attributes) { setup_section_params.merge(field_4: nil) } + + it "is not permitted as setup error" do + parser.valid? + expect(parser.errors.where(:field_4, category: :setup).map(&:message)).to eql([I18n.t("validations.sales.2025.bulk_upload.not_answered", question: "owning organisation.")]) + end + + it "blocks log creation" do + parser.valid? + expect(parser).to be_block_log_creation + end + end + + context "when cannot find owning org" do + let(:attributes) { { bulk_upload:, field_4: "donotexist" } } + + it "is not permitted as a setup error" do + parser.valid? + expect(parser.errors.where(:field_4, category: :setup).map(&:message)).to eql([I18n.t("validations.sales.2025.bulk_upload.owning_organisation.not_found")]) + end + + it "blocks log creation" do + parser.valid? + expect(parser).to be_block_log_creation + end + end + + context "when not affiliated with owning org" do + let(:unaffiliated_org) { create(:organisation, :with_old_visible_id) } + + let(:attributes) { { bulk_upload:, field_4: unaffiliated_org.old_visible_id } } + + it "is not permitted as setup error" do + parser.valid? + expect(parser.errors.where(:field_4, category: :setup).map(&:message)).to eql([I18n.t("validations.sales.2025.bulk_upload.owning_organisation.not_permitted.not_support")]) + end + + it "blocks log creation" do + parser.valid? + expect(parser).to be_block_log_creation + end + end + + context "when user's org has absorbed owning organisation with stock owners" do + let(:merged_org) { create(:organisation, :with_old_visible_id, holds_own_stock: true) } + let(:merged_org_stock_owner) { create(:organisation, :with_old_visible_id, holds_own_stock: true) } + + let(:attributes) { { bulk_upload:, field_4: merged_org_stock_owner.old_visible_id } } + + before do + create(:organisation_relationship, parent_organisation: merged_org_stock_owner, child_organisation: merged_org) + merged_org.update!(absorbing_organisation: user.organisation, merge_date: Time.zone.today) + merged_org.reload + user.organisation.reload + end + + it "is permitted" do + parser.valid? + expect(parser.errors.where(:field_4)).not_to be_present + end + end + + context "when user's org has absorbed owning organisation" do + let(:merged_org) { create(:organisation, :with_old_visible_id, holds_own_stock: true) } + + let(:attributes) { { bulk_upload:, field_4: merged_org.old_visible_id, field_6: user.email } } + + before do + merged_org.update!(absorbing_organisation: user.organisation, merge_date: Time.zone.today) + merged_org.reload + user.organisation.reload + user.reload + end + + it "is permitted" do + parser = described_class.new(attributes) + + parser.valid? + expect(parser.errors.where(:field_4)).not_to be_present + expect(parser.errors.where(:field_6)).not_to be_present + end + end + + context "when user's org has absorbed owning organisation before the startdate" do + let(:merged_org) { create(:organisation, :with_old_visible_id, holds_own_stock: true) } + + let(:attributes) { setup_section_params.merge({ field_4: merged_org.old_visible_id, field_6: user.email }) } + + before do + merged_org.update!(absorbing_organisation: user.organisation, merge_date: Time.zone.today - 3.years) + merged_org.reload + user.organisation.reload + user.reload + end + + it "is not permitted" do + parser = described_class.new(attributes) + + parser.valid? + expect(parser.errors[:field_4]).to include(/The owning organisation must be active on the sale completion date/) + expect(parser.errors[:field_1]).to include(/Enter a date when the owning organisation was active/) + expect(parser.errors[:field_2]).to include(/Enter a date when the owning organisation was active/) + expect(parser.errors[:field_3]).to include(/Enter a date when the owning organisation was active/) + end + end + + context "when user is an unaffiliated non-support user and bulk upload organisation is affiliated with the owning organisation" do + let(:affiliated_org) { create(:organisation, :with_old_visible_id) } + let(:unaffiliated_user) { create(:user, organisation: create(:organisation)) } + let(:attributes) { { bulk_upload:, field_4: affiliated_org.old_visible_id } } + let(:organisation_id) { unaffiliated_user.organisation_id } + + before do + create(:organisation_relationship, parent_organisation: owning_org, child_organisation: affiliated_org) + bulk_upload.update!(organisation_id:, user: unaffiliated_user) + end + + it "blocks log creation and adds an error to field_4" do + parser = described_class.new(attributes) + parser.valid? + expect(parser).to be_block_log_creation + expect(parser.errors[:field_4]).to include(I18n.t("validations.sales.2025.bulk_upload.owning_organisation.not_permitted.not_support")) + end + end + + context "when user is an unaffiliated support user and bulk upload organisation is affiliated with the owning organisation" do + let(:affiliated_org) { create(:organisation, :with_old_visible_id) } + let(:unaffiliated_support_user) { create(:user, :support, organisation: create(:organisation)) } + let(:attributes) { { bulk_upload:, field_4: affiliated_org.old_visible_id } } + let(:organisation_id) { affiliated_org.id } + + before do + create(:organisation_relationship, parent_organisation: owning_org, child_organisation: affiliated_org) + bulk_upload.update!(organisation_id:, user: unaffiliated_support_user) + end + + it "does not block log creation and does not add an error to field_4" do + parser = described_class.new(attributes) + parser.valid? + expect(parser.errors[:field_4]).not_to include(I18n.t("validations.sales.2025.bulk_upload.owning_organisation.not_permitted.not_support")) + end + end + end + + describe "#field_6" do # username for assigned_to + context "when blank" do + let(:attributes) { setup_section_params.merge(bulk_upload:, field_6: nil) } + + it "is permitted" do + parser.valid? + expect(parser.errors[:field_6]).to be_blank + end + + it "sets assigned to to bulk upload user" do + parser.valid? + expect(parser.log.assigned_to).to eq(bulk_upload.user) + end + + it "sets created by to bulk upload user" do + parser.valid? + expect(parser.log.created_by).to eq(bulk_upload.user) + end + end + + context "when blank and bulk upload user is support" do + let(:bulk_upload) { create(:bulk_upload, :sales, user: create(:user, :support), year: 2025) } + + let(:attributes) { setup_section_params.merge(bulk_upload:, field_6: nil) } + + it "is not permitted" do + parser.valid? + expect(parser.errors[:field_6]).to be_present + expect(parser.errors[:field_6]).to include(I18n.t("validations.sales.2025.bulk_upload.not_answered", question: "what is the CORE username of the account this sales log should be assigned to?")) + end + + it "blocks log creation" do + parser.valid? + expect(parser).to be_block_log_creation + end + end + + context "when user could not be found" do + let(:attributes) { { bulk_upload:, field_6: "idonotexist@example.com" } } + + it "is not permitted" do + parser.valid? + expect(parser.errors[:field_6]).to be_present + end + end + + context "when an unaffiliated user" do + let(:other_user) { create(:user) } + + let(:attributes) { { bulk_upload:, field_4: owning_org.old_visible_id, field_6: other_user.email } } + + it "is not permitted as a setup error" do + parser.valid? + expect(parser.errors.where(:field_6, category: :setup)).to be_present + end + + it "blocks log creation" do + parser.valid? + expect(parser).to be_block_log_creation + end + end + + context "when a user part of owning org" do + let(:other_user) { create(:user, organisation: owning_org) } + + let(:attributes) { { bulk_upload:, field_4: owning_org.old_visible_id, field_6: other_user.email } } + + it "is permitted" do + parser.valid? + expect(parser.errors[:field_6]).to be_blank + end + + it "sets assigned to to the user" do + parser.valid? + expect(parser.log.assigned_to).to eq(other_user) + end + + it "sets created by to bulk upload user" do + parser.valid? + expect(parser.log.created_by).to eq(bulk_upload.user) + end + end + + context "when email matches other than casing" do + let(:other_user) { create(:user, organisation: owning_org) } + + let(:attributes) { { bulk_upload:, field_4: owning_org.old_visible_id, field_6: other_user.email.upcase! } } + + it "is permitted" do + parser.valid? + expect(parser.errors[:field_6]).to be_blank + end + end + end + + describe "fields 1, 2, 3 => saledate" do + context "when all of these fields are blank" do + let(:attributes) { setup_section_params.merge({ field_1: nil, field_2: nil, field_3: nil }) } + + it "returns them as setup errors" do + parser.valid? + expect(parser.errors.where(:field_1, category: :setup)).to be_present + expect(parser.errors.where(:field_2, category: :setup)).to be_present + expect(parser.errors.where(:field_3, category: :setup)).to be_present + end + end + + context "when one of these fields is blank" do + let(:attributes) { setup_section_params.merge({ field_1: "1", field_2: "1", field_3: nil }) } + + it "returns an error only on blank field as setup error" do + parser.valid? + expect(parser.errors[:field_1]).to be_blank + expect(parser.errors[:field_2]).to be_blank + expect(parser.errors.where(:field_3, category: :setup)).to be_present + end + end + + context "when field 3 is 4 digits instead of 2" do + let(:attributes) { setup_section_params.merge({ bulk_upload:, field_3: "2025" }) } + + it "correctly sets the date" do + parser.valid? + expect(parser.errors.where(:field_3, category: :setup)).to be_empty + expect(parser.log.saledate).to eq(Time.zone.local(2025, 5, 1)) + end + end + + context "when field 2 is not 2 or 4 digits" do + let(:attributes) { setup_section_params.merge({ bulk_upload:, field_3: "202" }) } + + it "returns a setup error" do + parser.valid? + expect(parser.errors.where(:field_3, category: :setup).map(&:message)).to include(I18n.t("validations.sales.2025.bulk_upload.saledate.year_not_two_or_four_digits")) + end + end + + context "when invalid date given" do + let(:attributes) { setup_section_params.merge({ field_1: "a", field_2: "12", field_3: "2023" }) } + + it "does not raise an error" do + expect { parser.valid? }.not_to raise_error + end + end + + context "when inside of collection year" do + around do |example| + Timecop.freeze(Date.new(2025, 10, 1)) do + example.run + end + end + + let(:attributes) { setup_section_params.merge({ field_1: "1", field_2: "10", field_3: "25" }) } + + let(:bulk_upload) { create(:bulk_upload, :sales, user:, year: 2025) } + + it "does not return errors" do + parser.valid? + expect(parser.errors[:field_1]).not_to be_present + expect(parser.errors[:field_2]).not_to be_present + expect(parser.errors[:field_3]).not_to be_present + end + end + + context "when outside of collection year" do + around do |example| + Timecop.freeze(Date.new(2023, 4, 2)) do + example.run + end + end + + let(:attributes) { setup_section_params.merge({ field_1: "1", field_2: "1", field_3: "22" }) } + + let(:bulk_upload) { create(:bulk_upload, :sales, user:, year: 2023) } + + it "returns setup errors" do + parser.valid? + expect(parser.errors.where(:field_1, category: :setup)).to be_present + expect(parser.errors.where(:field_2, category: :setup)).to be_present + expect(parser.errors.where(:field_3, category: :setup)).to be_present + end + end + end + + context "when the log already exists in the db" do + let(:attributes) { valid_attributes } + + before do + parser.log.save! + parser.instance_variable_set(:@valid, nil) + end + + it "is not a valid row" do + expect(parser).not_to be_valid + end + + it "adds an error to all (and only) the fields used to determine duplicates" do + parser.valid? + + error_message = I18n.t("validations.sales.2025.bulk_upload.duplicate") + + [ + :field_4, # Owning org + :field_1, # Sale completion date + :field_2, # Sale completion date + :field_3, # Sale completion date + :field_21, # Postcode + :field_22, # Postcode + :field_28, # Buyer 1 age + :field_29, # Buyer 1 gender + :field_32, # Buyer 1 working situation + :field_7, # Purchaser code + ].each do |field| + expect(parser.errors[field]).to include(error_message) + end + end + end + + context "when a hidden log already exists in db" do + before do + parser.log.status = "pending" + parser.log.save! + end + + it "is a valid row" do + expect(parser).to be_valid + end + + it "does not add duplicate errors" do + parser.valid? + + [ + :field_4, # Owning org + :field_1, # Sale completion date + :field_2, # Sale completion date + :field_3, # Sale completion date + :field_21, # Postcode + :field_22, # Postcode + :field_28, # Buyer 1 age + :field_29, # Buyer 1 gender + :field_32, # Buyer 1 working situation + :field_7, # Purchaser code + ].each do |field| + expect(parser.errors[field]).to be_blank + end + end + end + + describe "#field_8" do # ownership scheme + context "when an invalid option" do + let(:attributes) { setup_section_params.merge({ field_8: "100" }) } + + it "returns setup error" do + parser.valid? + expect(parser.errors.where(:field_8, category: :setup)).to be_present + end + end + end + + describe "#field_9" do # type for shared ownership sale + context "when an invalid option" do + let(:attributes) { setup_section_params.merge({ field_9: "100" }) } + + it "returns setup error" do + parser.valid? + expect(parser.errors.where(:field_9, category: :setup)).to be_present + end + end + end + + describe "#field_11" do # type for discounted sale + context "when an invalid option" do + let(:attributes) { setup_section_params.merge({ field_11: "100" }) } + + it "returns setup error" do + parser.valid? + expect(parser.errors.where(:field_11, category: :setup)).to be_present + end + end + end + + describe "#field_115" do # percentage discount + context "when percentage discount over 70" do + let(:attributes) { valid_attributes.merge({ field_8: "2", field_10: "2", field_11: "9", field_115: "71" }) } + + it "returns correct error" do + parser.valid? + expect(parser.errors.where(:field_115).map(&:message)).to include(I18n.t("validations.sales.2025.bulk_upload.numeric.within_range", field: "Percentage discount", min: "0%", max: "70%")) + end + end + + context "when percentage discount not over 70" do + let(:attributes) { valid_attributes.merge({ field_8: "2", field_10: "2", field_115: "70" }) } + + it "does not return error" do + parser.valid? + expect(parser.errors.where(:field_115)).not_to be_present + end + end + + context "when percentage less than 0" do + let(:attributes) { valid_attributes.merge({ field_8: "2", field_10: "2", field_115: "-1" }) } + + it "returns correct error" do + parser.valid? + expect(parser.errors.where(:field_115).map(&:message)).to include(I18n.t("validations.sales.2025.bulk_upload.numeric.within_range", field: "Percentage discount", min: "0%", max: "70%")) + end + end + end + + describe "#field_12" do # joint purchase + context "when an invalid option" do + let(:attributes) { setup_section_params.merge({ field_12: "100" }) } + + it "returns a setup error" do + parser.valid? + expect(parser.errors.where(:field_12, category: :setup)).to be_present + end + end + end + + describe "#field_13" do # more than 2 joint buyers? + context "when invalid option and must be answered" do + let(:attributes) { setup_section_params.merge({ field_12: "1", field_13: "100" }) } + + it "returns a setup error" do + parser.valid? + expect(parser.errors.where(:field_13, category: :setup)).to be_present + end + end + end + + describe "UPRN and address fields" do + context "when a valid UPRN is given" do + let(:attributes) { setup_section_params.merge({ field_16: "12" }) } + + it "does not add errors" do + parser.valid? + %i[field_16 field_17 field_18 field_19 field_20 field_21 field_22].each do |field| + expect(parser.errors[field]).to be_empty + end + end + + it "sets UPRN, UPRN known, and UPRN confirmed" do + expect(parser.log.uprn).to eq("12") + expect(parser.log.uprn_known).to eq(1) + expect(parser.log.uprn_confirmed).to eq(1) + end + end + + context "when an invalid UPRN is given" do + context "and address fields are not given" do + let(:attributes) { setup_section_params.merge({ field_16: "1234567890123" }) } + + it "adds an appropriate error to the UPRN field" do + parser.valid? + expect(parser.errors[:field_16]).to eql(["UPRN must be 12 digits or less."]) + end + + it "adds errors to missing key address fields" do + parser.valid? + expect(parser.errors[:field_17]).to eql([I18n.t("validations.sales.2025.bulk_upload.not_answered", question: "address line 1.")]) + expect(parser.errors[:field_19]).to eql([I18n.t("validations.sales.2025.bulk_upload.not_answered", question: "town or city.")]) + expect(parser.errors[:field_21]).to eql([I18n.t("validations.sales.2025.bulk_upload.not_answered", question: "part 1 of postcode.")]) + expect(parser.errors[:field_22]).to eql([I18n.t("validations.sales.2025.bulk_upload.not_answered", question: "part 2 of postcode.")]) + end + end + + context "and address fields are given" do + let(:attributes) { setup_section_params.merge({ field_16: "1234567890123", field_17: "address line 1", field_19: "town or city", field_21: "AA1", field_22: "1AA" }) } + + it "adds an error to the UPRN field only" do + parser.valid? + expect(parser.errors[:field_16]).to eql(["UPRN must be 12 digits or less."]) + %i[field_17 field_19 field_21 field_22].each do |field| + expect(parser.errors[field]).to be_empty + end + end + + it "does not do an address search" do + parser.valid? + expect(a_request(:any, /api\.os\.uk\/search\/places\/v1\/find/)).not_to have_been_made + end + end + end + + context "when no UPRN is given" do + context "and no address fields are given" do + let(:attributes) { setup_section_params } + + it "adds appropriate errors to UPRN and key address fields" do + parser.valid? + expect(parser.errors[:field_16]).to eql([I18n.t("validations.sales.2025.bulk_upload.address.not_answered")]) + expect(parser.errors[:field_17]).to eql([I18n.t("validations.sales.2025.bulk_upload.address.not_answered")]) + expect(parser.errors[:field_19]).to eql([I18n.t("validations.sales.2025.bulk_upload.address.not_answered")]) + expect(parser.errors[:field_21]).to eql([I18n.t("validations.sales.2025.bulk_upload.address.not_answered")]) + expect(parser.errors[:field_22]).to eql([I18n.t("validations.sales.2025.bulk_upload.address.not_answered")]) + end + end + + context "and some key address field is missing" do + let(:attributes) { setup_section_params.merge({ field_19: "town or city", field_21: "AA1", field_22: "1AA" }) } + + it "adds errors to UPRN and the missing key address field" do + parser.valid? + expect(parser.errors[:field_16]).to eql([I18n.t("validations.sales.2025.bulk_upload.address.not_answered")]) + expect(parser.errors[:field_17]).to eql([I18n.t("validations.sales.2025.bulk_upload.address.not_answered")]) + expect(parser.errors[:field_19]).to be_empty + expect(parser.errors[:field_21]).to be_empty + expect(parser.errors[:field_22]).to be_empty + end + end + + context "and all key address fields are present" do + let(:attributes) { setup_section_params.merge({ field_16: nil, field_17: "address line 1", field_19: "town or city", field_21: "AA1", field_22: "1AA" }) } + + context "and an address can be found with a high enough match rating" do + before do + stub_request(:get, /api\.os\.uk\/search\/places\/v1\/find/) + .to_return(status: 200, body: { results: [{ DPA: { MATCH: 0.7, BUILDING_NAME: "", POST_TOWN: "", POSTCODE: "AA1 1AA", UPRN: "1" } }] }.to_json, headers: {}) + end + + it "does not add errors" do + parser.valid? + %i[field_16 field_17 field_18 field_19 field_20 field_21 field_22].each do |field| + expect(parser.errors[field]).to be_empty + end + end + end + + context "when no address can be found" do + before do + stub_request(:get, /api\.os\.uk\/search\/places\/v1\/find/) + .to_return(status: 200, body: { results: [] }.to_json, headers: {}) + end + + it "adds address not found errors to address fields only" do + parser.valid? + expect(parser.errors[:field_16]).to be_empty + %i[field_17 field_18 field_19 field_20 field_21 field_22].each do |field| + expect(parser.errors[field]).to eql([I18n.t("validations.sales.2025.bulk_upload.address.not_found")]) + end + end + end + + context "when no address has a high enough match rating" do + before do + stub_request(:get, /api\.os\.uk\/search\/places\/v1\/find/) + .to_return(status: 200, body: { results: [{ DPA: { MATCH: 0.6, BUILDING_NAME: "", POST_TOWN: "", POSTCODE: "AA1 1AA", UPRN: "1" } }] }.to_json, headers: {}) + end + + it "adds address not found errors to address fields only" do + parser.valid? + expect(parser.errors[:field_16]).to be_empty + %i[field_17 field_18 field_19 field_20 field_21 field_22].each do |field| + expect(parser.errors[field]).to eql([I18n.t("validations.sales.2025.bulk_upload.address.not_determined")]) + end + end + end + end + end + end + + describe "#field_15" do # data protection + let(:attributes) { setup_section_params.merge({ field_15: nil }) } + + before do + parser.valid? + end + + context "when not answered" do + it "returns a setup error" do + expect(parser.errors.where(:field_15, category: :setup)).to be_present + end + end + + context "when the privacy notice is not accepted" do + it "cannot be nulled" do + expect(parser.errors[:field_15]).to eq(["You must show or give the buyer access to the MHCLG privacy notice before you can submit this log."]) + end + end + end + + [ + %w[age1_known details_known_1 age1 field_28 field_34 field_36], + %w[age2_known details_known_2 age2 field_35 field_34 field_36], + %w[age3_known details_known_3 age3 field_43 field_42 field_44], + %w[age4_known details_known_4 age4 field_47 field_46 field_48], + %w[age5_known details_known_5 age5 field_51 field_50 field_52], + %w[age6_known details_known_6 age6 field_55 field_54 field_56], + ].each do |known, details_known, age, field, relationship, gender| + describe "##{known} and ##{age}" do + context "when #{field} is blank" do + context "and person details are blank" do + let(:attributes) { setup_section_params.merge({ field.to_s => nil, relationship.to_sym => nil, gender.to_sym => nil, field_15: "1", field_41: "5" }) } + + it "does not set ##{known}" do + unless known == "age1_known" + expect(parser.log.public_send(known)).to be_nil + end + end + + it "sets ##{details_known} to no" do + unless details_known == "details_known_1" + expect(parser.log.public_send(details_known)).to eq(2) + end + end + + it "sets ##{age} to nil" do + expect(parser.log.public_send(age)).to be_nil + end + end + + context "and person details are given" do + let(:attributes) { setup_section_params.merge({ field.to_sym => nil, relationship.to_sym => "C", gender.to_sym => "X", field_15: "1", field_41: "5" }) } + + it "does not set ##{age}" do + parser.valid? + expect(parser.errors[field.to_sym]).to include(/You must answer/) + end + end + end + + context "when #{field} is R" do + let(:attributes) { setup_section_params.merge({ field.to_s => "R", field_14: "1", field_41: "5", field_15: "1" }) } + + it "sets ##{known} 1" do + expect(parser.log.public_send(known)).to be(1) + end + + it "sets ##{age} to nil" do + expect(parser.log.public_send(age)).to be_nil + end + end + + context "when #{field} is a number" do + let(:attributes) { setup_section_params.merge({ field.to_s => "50", field_14: "1", field_41: "5", field_15: "1" }) } + + it "sets ##{known} to 0" do + expect(parser.log.public_send(known)).to be(0) + end + + it "sets ##{age} to given age" do + expect(parser.log.public_send(age)).to be(50) + end + end + + context "when #{field} is a non-sensical value" do + let(:attributes) { setup_section_params.merge({ field.to_s => "A", field_14: "1", field_41: "5", field_15: "1" }) } + + it "sets ##{known} to 0" do + expect(parser.log.public_send(known)).to be(0) + end + + it "sets ##{age} to nil" do + expect(parser.log.public_send(age)).to be_nil + end + end + end + end + + describe "field_39" do # ecstat2 + context "when buyer 2 has no age but has ecstat as child" do + let(:attributes) { valid_attributes.merge({ field_35: nil, field_39: "9" }) } + + it "a custom validation is applied" do + parser.valid? + + expect(parser.errors[:field_39]).to include I18n.t("validations.sales.2025.bulk_upload.ecstat2.buyer_cannot_be_child") + end + end + + context "when buyer 2 is under 16" do + let(:attributes) { valid_attributes.merge({ field_35: "9" }) } + + it "a custom validation is applied" do + parser.valid? + + validation_message = "Buyer 2’s age must be between 16 and 110." + expect(parser.errors[:field_35]).to include validation_message + end + end + + context "when buyer 2 is over 16 but has ecstat as child" do + let(:attributes) { valid_attributes.merge({ field_35: "17", field_39: "9" }) } + + it "a custom validation is applied" do + parser.valid? + + expect(parser.errors[:field_39]).to include I18n.t("validations.sales.2025.bulk_upload.ecstat2.buyer_cannot_be_over_16_and_child") + expect(parser.errors[:field_35]).to include I18n.t("validations.sales.2025.bulk_upload.age2.buyer_cannot_be_over_16_and_child") + end + end + + context "when person 2 a child but not a buyer" do + let(:attributes) { valid_attributes.merge({ field_12: 2, field_35: "10", field_39: "9" }) } + + it "does not add errors to their age and ecstat fields" do + parser.valid? + expect(parser.errors[:field_35]).to be_empty + expect(parser.errors[:field_39]).to be_empty + end + end + end + + describe "field_32" do # ecstat1 + context "when buyer 1 has no age but has ecstat as child" do + let(:attributes) { valid_attributes.merge({ field_28: nil, field_32: "9" }) } + + it "a custom validation is applied" do + parser.valid? + + expect(parser.errors[:field_32]).to include I18n.t("validations.sales.2025.bulk_upload.ecstat1.buyer_cannot_be_child") + end + end + + context "when buyer 1 is under 16" do + let(:attributes) { valid_attributes.merge({ field_28: "9" }) } + + it "a custom validation is applied" do + parser.valid? + + validation_message = "Buyer 1’s age must be between 16 and 110." + expect(parser.errors[:field_28]).to include validation_message + end + end + + context "when buyer 1 is over 16 but has ecstat as child" do + let(:attributes) { valid_attributes.merge({ field_28: "17", field_32: "9" }) } + + it "a custom validation is applied" do + parser.valid? + + expect(parser.errors[:field_32]).to include I18n.t("validations.sales.2025.bulk_upload.ecstat1.buyer_cannot_be_over_16_and_child") + expect(parser.errors[:field_28]).to include I18n.t("validations.sales.2025.bulk_upload.age1.buyer_cannot_be_over_16_and_child") + end + end + end + + describe "#field_33" do # will buyer1 live in property? + context "when not a possible value" do + let(:attributes) { valid_attributes.merge({ field_10: "2", field_33: "3" }) } + + it "is not valid" do + parser.valid? + expect(parser.errors).to include(:field_33) + end + end + end + + describe "#field_109" do # staircasing mortgageused + context "when invalid value" do + let(:attributes) { setup_section_params.merge(field_109: "4") } + + it "returns correct errors" do + parser.valid? + expect(parser.errors[:field_109]).to include(I18n.t("validations.sales.2025.bulk_upload.invalid_option", question: "was a mortgage used for this staircasing transaction?")) + + parser.log.blank_invalid_non_setup_fields! + parser.log.save! + expect(parser.log.mortgageused).to be_nil + end + end + + context "when value is 3 and stairowned is not 100" do + let(:attributes) { setup_section_params.merge(field_109: "3", field_10: "1", field_96: "50", field_97: "99", field_120: nil) } + + it "returns correct errors" do + parser.valid? + expect(parser.errors[:field_109]).to include("The percentage owned has to be 100% if the mortgage used is 'Don’t know'") + + parser.log.blank_invalid_non_setup_fields! + parser.log.save! + expect(parser.log.mortgageused).to be_nil + end + end + + context "when value is 3 and stairowned is not answered" do + let(:attributes) { setup_section_params.merge(field_109: "3", field_10: "1", field_96: "50", field_97: nil, field_120: nil) } + + it "does not add errors" do + parser.valid? + expect(parser.errors[:field_109]).to be_empty + end + end + + context "when value is 3 and stairowned is 100" do + let(:attributes) { setup_section_params.merge(field_109: "3", field_10: "1", field_96: "50", field_97: "100", field_120: nil) } + + it "does not add errors and sets mortgage used to 3" do + parser.valid? + expect(parser.log.mortgageused).to eq(3) + expect(parser.log.stairowned).to eq(100) + expect(parser.log.deposit).to be_nil + expect(parser.errors[:field_109]).to be_empty + expect(parser.errors[:field_120]).to be_empty + end + end + end + + describe "#field_88" do # shared ownership mortgageused + context "when invalid value" do + let(:attributes) { setup_section_params.merge(field_10: "2", field_88: "4") } + + it "returns correct errors" do + parser.valid? + expect(parser.errors[:field_88]).to include(I18n.t("validations.sales.2025.bulk_upload.invalid_option", question: "was a mortgage used for the purchase of this property? - Shared ownership.")) + + parser.log.blank_invalid_non_setup_fields! + parser.log.save! + expect(parser.log.mortgageused).to be_nil + end + end + + context "when value is 3 and stairowned is not answered" do + let(:attributes) { setup_section_params.merge(field_88: "3", field_10: "2", field_96: "50", field_97: nil, field_120: nil) } + + it "returns correct errors" do + parser.valid? + expect(parser.errors[:field_88]).to include(I18n.t("validations.invalid_option", question: "was a mortgage used for the purchase of this property?")) + + parser.log.blank_invalid_non_setup_fields! + parser.log.save! + expect(parser.log.mortgageused).to be_nil + end + end + + context "with non staircasing mortgage error" do + let(:attributes) { setup_section_params.merge(field_9: "30", field_88: "1", field_89: "10000", field_91: "5000", field_86: "30000", field_87: "28", field_10: "2") } + + it "does not add a BU error on type (because it's a setup field and would block log creation)" do + parser.valid? + expect(parser.errors[:field_9]).to be_empty + end + + it "includes errors on other related fields" do + parser.valid? + expect(parser.errors[:field_89]).to include("The mortgage (£10,000.00) and cash deposit (£5,000.00) added together is £15,000.00.The full purchase price (£30,000.00) multiplied by the percentage equity stake purchased (28.0%) is £8,400.00.These two amounts should be the same.") + expect(parser.errors[:field_91]).to include("The mortgage (£10,000.00) and cash deposit (£5,000.00) added together is £15,000.00.The full purchase price (£30,000.00) multiplied by the percentage equity stake purchased (28.0%) is £8,400.00.These two amounts should be the same.") + expect(parser.errors[:field_86]).to include("The mortgage (£10,000.00) and cash deposit (£5,000.00) added together is £15,000.00.The full purchase price (£30,000.00) multiplied by the percentage equity stake purchased (28.0%) is £8,400.00.These two amounts should be the same.") + expect(parser.errors[:field_87]).to include("The mortgage (£10,000.00) and cash deposit (£5,000.00) added together is £15,000.00.The full purchase price (£30,000.00) multiplied by the percentage equity stake purchased (28.0%) is £8,400.00.These two amounts should be the same.") + end + + it "does not add errors to other ownership type fields" do + parser.valid? + expect(parser.errors[:field_117]).to be_empty + expect(parser.errors[:field_120]).to be_empty + expect(parser.errors[:field_113]).to be_empty + expect(parser.errors[:field_107]).to be_empty + expect(parser.errors[:field_108]).to be_empty + expect(parser.errors[:field_116]).to be_empty + expect(parser.errors[:field_109]).to be_empty + end + end + end + + describe "#field_116" do + let(:attributes) { valid_attributes.merge({ field_8: "2", field_11: "9", field_116: "3" }) } + + it "does not allow 3 (don't know) as an option for discounted ownership" do + parser.valid? + expect(parser.errors[:field_116]).to include(I18n.t("validations.invalid_option", question: "was a mortgage used for the purchase of this property?")) + + parser.log.blank_invalid_non_setup_fields! + parser.log.save! + expect(parser.log.mortgageused).to be_nil + end + + context "when validate_discounted_ownership_value is triggered" do + let(:attributes) { setup_section_params.merge(field_113: 100, field_120: 100, field_8: 2, field_10: 2, field_11: 9, field_116: 2, field_115: 10) } + + it "only adds errors to the discounted ownership field" do + parser.valid? + expect(parser.errors[:field_88]).to be_empty + expect(parser.errors[:field_117]).to include("The mortgage and cash deposit (£100.00) added together is £100.00.The full purchase price (£100.00) subtracted by the sum of the full purchase price (£100.00) multiplied by the percentage discount (10.0%) is £90.00.These two amounts should be the same.") + expect(parser.errors[:field_126]).to be_empty + end + end + end + + describe "soft validations" do + context "when soft validation is triggered" do + let(:attributes) { valid_attributes.merge({ field_10: 2, field_28: 22, field_32: 5 }) } + + it "adds an error to the relevant fields" do + parser.valid? + expect(parser.errors.where(:field_28, category: :soft_validation)).to be_present + expect(parser.errors.where(:field_32, category: :soft_validation)).to be_present + end + + it "populates with correct error message" do + parser.valid? + expect(parser.errors.where(:field_28, category: :soft_validation).first.message).to eql("You told us this person is aged 22 years and retired. The minimum expected retirement age in England is 66.") + expect(parser.errors.where(:field_32, category: :soft_validation).first.message).to eql("You told us this person is aged 22 years and retired. The minimum expected retirement age in England is 66.") + end + end + end + + describe "log_already_exists?" do + let(:attributes) { { bulk_upload: } } + + before do + build(:sales_log, owning_organisation: nil, saledate: nil, purchid: nil, age1: nil, sex1: nil, ecstat1: nil).save(validate: false) + end + + it "does not add duplicate logs validation to the blank row" do + expect(parser.log_already_exists?).to eq(false) + end + end + end + + describe "#log" do + describe "#noint" do + context "when field is set to 1" do + let(:attributes) { valid_attributes.merge({ field_14: 1 }) } + + it "is correctly set" do + expect(parser.log.noint).to be(1) + end + end + + context "when field is set to 2" do + let(:attributes) { valid_attributes.merge({ field_14: 2 }) } + + it "is correctly set" do + expect(parser.log.noint).to be(2) + end + end + end + + describe "#uprn" do + let(:attributes) { setup_section_params.merge({ field_16: "12" }) } + + it "is correctly set" do + expect(parser.log.uprn).to eql("12") + end + end + + describe "#uprn_known" do + context "when uprn known" do + let(:attributes) { setup_section_params.merge({ field_16: "12" }) } + + it "is correctly set" do + expect(parser.log.uprn_known).to be(1) + end + end + + context "when uprn not known" do + let(:attributes) { setup_section_params.merge({ field_16: nil }) } + + it "is correctly set" do + expect(parser.log.uprn_known).to be(0) + end + end + end + + describe "#address_line1" do + let(:attributes) { setup_section_params.merge({ field_17: "some street" }) } + + it "is correctly set" do + expect(parser.log.address_line1).to eql("some street") + end + end + + describe "#address_line2" do + let(:attributes) { setup_section_params.merge({ field_18: "some other street" }) } + + it "is correctly set" do + expect(parser.log.address_line2).to eql("some other street") + end + end + + describe "#town_or_city" do + let(:attributes) { setup_section_params.merge({ field_19: "some town" }) } + + it "is correctly set" do + expect(parser.log.town_or_city).to eql("some town") + end + end + + describe "#county" do + let(:attributes) { setup_section_params.merge({ field_20: "some county" }) } + + it "is correctly set" do + expect(parser.log.county).to eql("some county") + end + end + + describe "#ethnic_group" do + context "when field_30 is 20" do + let(:attributes) { setup_section_params.merge({ field_30: "20" }) } + + it "is correctly set" do + expect(parser.log.ethnic_group).to be(0) + end + end + end + + describe "#ethnic_group2" do + let(:attributes) { setup_section_params.merge({ field_37: "1" }) } + + it "is correctly set" do + expect(parser.log.ethnic_group2).to be(0) + end + + context "when field_37 is 20" do + let(:attributes) { setup_section_params.merge({ field_37: "20" }) } + + it "is correctly set" do + expect(parser.log.ethnic_group2).to be(0) + end + end + end + + describe "#ethnicbuy2" do + let(:attributes) { setup_section_params.merge({ field_37: "1" }) } + + it "is correctly set" do + expect(parser.log.ethnicbuy2).to be(1) + end + end + + describe "#nationality_all" do + context "when field_31 is a 3 digit nationality code" do + let(:attributes) { setup_section_params.merge({ field_31: "036" }) } + + it "is correctly set" do + expect(parser.log.nationality_all).to be(36) + expect(parser.log.nationality_all_group).to be(12) + end + end + + context "when field_31 is a nationality code without the trailing 0s" do + let(:attributes) { setup_section_params.merge({ field_31: "36" }) } + + it "is correctly set" do + expect(parser.log.nationality_all).to be(36) + expect(parser.log.nationality_all_group).to be(12) + end + end + + context "when field_31 is a nationality code with trailing 0s" do + let(:attributes) { setup_section_params.merge({ field_31: "0036" }) } + + it "is correctly set" do + expect(parser.log.nationality_all).to be(36) + expect(parser.log.nationality_all_group).to be(12) + end + end + + context "when field_31 is 0" do + let(:attributes) { setup_section_params.merge({ field_31: "0" }) } + + it "is correctly set" do + expect(parser.log.nationality_all).to be(0) + expect(parser.log.nationality_all_group).to be(0) + end + end + + context "when field_31 is 000" do + let(:attributes) { setup_section_params.merge({ field_31: "000" }) } + + it "is correctly set" do + expect(parser.log.nationality_all).to be(0) + expect(parser.log.nationality_all_group).to be(0) + end + end + + context "when field_31 is 0000" do + let(:attributes) { setup_section_params.merge({ field_31: "0000" }) } + + it "is correctly set" do + expect(parser.log.nationality_all).to be(0) + expect(parser.log.nationality_all_group).to be(0) + end + end + + context "when field_31 is 826" do + let(:attributes) { setup_section_params.merge({ field_31: "826" }) } + + it "is correctly set" do + expect(parser.log.nationality_all).to be(826) + expect(parser.log.nationality_all_group).to be(826) + end + end + + context "when field_31 is 826 with trailing 0s" do + let(:attributes) { setup_section_params.merge({ field_31: "0826" }) } + + it "is correctly set" do + expect(parser.log.nationality_all).to be(826) + expect(parser.log.nationality_all_group).to be(826) + end + end + + context "when field_31 is not a valid option" do + let(:attributes) { setup_section_params.merge({ field_31: "123123" }) } + + it "is correctly set" do + parser.valid? + expect(parser.log.nationality_all).to be(nil) + expect(parser.log.nationality_all_group).to be(nil) + expect(parser.errors["field_31"]).to include(I18n.t("validations.sales.2025.bulk_upload.nationality.invalid")) + end + end + end + + describe "#nationality_all_buyer2" do + context "when field_38 is a 3 digit nationality code" do + let(:attributes) { setup_section_params.merge({ field_38: "036" }) } + + it "is correctly set" do + expect(parser.log.nationality_all_buyer2).to be(36) + expect(parser.log.nationality_all_buyer2_group).to be(12) + end + end + + context "when field_38 is a nationality code without the trailing 0s" do + let(:attributes) { setup_section_params.merge({ field_38: "36" }) } + + it "is correctly set" do + expect(parser.log.nationality_all_buyer2).to be(36) + expect(parser.log.nationality_all_buyer2_group).to be(12) + end + end + + context "when field_38 is a nationality code with trailing 0s" do + let(:attributes) { setup_section_params.merge({ field_38: "0036" }) } + + it "is correctly set" do + expect(parser.log.nationality_all_buyer2).to be(36) + expect(parser.log.nationality_all_buyer2_group).to be(12) + end + end + + context "when field_38 is 0" do + let(:attributes) { setup_section_params.merge({ field_38: "0" }) } + + it "is correctly set" do + expect(parser.log.nationality_all_buyer2).to be(0) + expect(parser.log.nationality_all_buyer2_group).to be(0) + end + end + + context "when field_38 is 000" do + let(:attributes) { setup_section_params.merge({ field_38: "000" }) } + + it "is correctly set" do + expect(parser.log.nationality_all_buyer2).to be(0) + expect(parser.log.nationality_all_buyer2_group).to be(0) + end + end + + context "when field_38 is 0000" do + let(:attributes) { setup_section_params.merge({ field_38: "0000" }) } + + it "is correctly set" do + expect(parser.log.nationality_all_buyer2).to be(0) + expect(parser.log.nationality_all_buyer2_group).to be(0) + end + end + + context "when field_38 is 826" do + let(:attributes) { setup_section_params.merge({ field_38: "826" }) } + + it "is correctly set" do + expect(parser.log.nationality_all_buyer2).to be(826) + expect(parser.log.nationality_all_buyer2_group).to be(826) + end + end + + context "when field_38 is 826 with trailing 0s" do + let(:attributes) { setup_section_params.merge({ field_38: "0826" }) } + + it "is correctly set" do + expect(parser.log.nationality_all_buyer2).to be(826) + expect(parser.log.nationality_all_buyer2_group).to be(826) + end + end + + context "when field_38 is not a valid option" do + let(:attributes) { setup_section_params.merge({ field_38: "123123" }) } + + it "is correctly set" do + parser.valid? + expect(parser.log.nationality_all_buyer2).to be(nil) + expect(parser.log.nationality_all_buyer2_group).to be(nil) + expect(parser.errors["field_38"]).to include(I18n.t("validations.sales.2025.bulk_upload.nationality.invalid")) + end + end + end + + describe "#buy2living" do + let(:attributes) { setup_section_params.merge({ field_63: "1" }) } + + it "is correctly set" do + expect(parser.log.buy2living).to be(1) + end + end + + describe "#prevtenbuy2" do + let(:attributes) { setup_section_params.merge({ field_64: "R" }) } + + it "is correctly set" do + expect(parser.log.prevtenbuy2).to be(0) + end + end + + describe "#hhregres" do + let(:attributes) { setup_section_params.merge({ field_65: "1" }) } + + it "is correctly set" do + expect(parser.log.hhregres).to be(1) + end + end + + describe "#hhregresstill" do + let(:attributes) { setup_section_params.merge({ field_66: "4" }) } + + it "is correctly set" do + expect(parser.log.hhregresstill).to be(4) + end + end + + describe "#prevshared" do + let(:attributes) { setup_section_params.merge({ field_77: "3" }) } + + it "is correctly set" do + expect(parser.log.prevshared).to be(3) + end + end + + describe "#staircasesale" do + let(:attributes) { setup_section_params.merge({ field_98: "1" }) } + + it "is correctly set" do + expect(parser.log.staircasesale).to be(1) + end + end + + describe "#soctenant" do + context "when discounted ownership" do + let(:attributes) { valid_attributes.merge({ field_8: "2" }) } + + 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_58: "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_58: "3", field_64: "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_58: "3", field_64: "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_58: "3", field_64: nil }) } + + it "is set to no" do + expect(parser.log.soctenant).to be(2) + end + end + end + end + end + + describe "with living before purchase years for shared ownership more than 0" do + let(:attributes) { setup_section_params.merge({ field_8: "1", field_79: "1" }) } + + it "is sets living before purchase asked to yes and sets the correct living before purchase years" do + expect(parser.log.proplen_asked).to be(0) + expect(parser.log.proplen).to be(1) + end + end + + describe "with living before purchase years for discounted ownership more than 0" do + let(:attributes) { setup_section_params.merge({ field_8: "2", field_112: "1" }) } + + it "is sets living before purchase asked to yes and sets the correct living before purchase years" do + expect(parser.log.proplen_asked).to be(0) + expect(parser.log.proplen).to be(1) + end + end + + describe "with living before purchase years for shared ownership set to 0" do + let(:attributes) { setup_section_params.merge({ field_8: "1", field_79: "0" }) } + + it "is sets living before purchase asked to no" do + expect(parser.log.proplen_asked).to be(1) + expect(parser.log.proplen).to be_nil + end + end + + describe "with living before purchase 0 years for discounted ownership set to 0" do + let(:attributes) { setup_section_params.merge({ field_8: "2", field_112: "0" }) } + + it "is sets living before purchase asked to no" do + expect(parser.log.proplen_asked).to be(1) + expect(parser.log.proplen).to be_nil + end + end + + context "when mscharge is given, but is set to 0 for shared ownership" do + let(:attributes) { valid_attributes.merge(field_94: "0") } + + it "does not override variables correctly" do + log = parser.log + expect(log["has_mscharge"]).to eq(0) # no + expect(log["mscharge"]).to be_nil + end + end + + context "when mscharge is given, but is set to 0 for discounted ownership" do + let(:attributes) { valid_attributes.merge(field_8: "2", field_121: "0") } + + it "does not override variables correctly" do + log = parser.log + expect(log["has_mscharge"]).to eq(0) # no + expect(log["mscharge"]).to be_nil + end + end + + describe "shared ownership sale type" do + context "when 32 is selected for shared ownership type" do + let(:attributes) { valid_attributes.merge(field_9: "32") } + + it "sets the value correctly" do + log = parser.log + expect(log.type).to eq(32) + end + end + end + + describe "#managing_organisation_id" do + let(:attributes) { setup_section_params } + + context "when user is part of the owning organisation" do + it "sets managing organisation to the correct organisation" do + parser.valid? + expect(parser.log.owning_organisation_id).to be(owning_org.id) + expect(parser.log.managing_organisation_id).to be(managing_org.id) + end + end + + context "when blank" do + let(:attributes) { { bulk_upload:, field_5: "", field_3: "not blank" } } + + it "is not permitted as setup error" do + parser.valid? + setup_errors = parser.errors.select { |e| e.options[:category] == :setup } + + expect(setup_errors.find { |e| e.attribute == :field_5 }.message).to eql(I18n.t("validations.not_answered", question: "reported by.")) + end + + it "blocks log creation" do + parser.valid? + expect(parser).to be_block_log_creation + end + end + + context "when cannot find managing org" do + let(:attributes) { { bulk_upload:, field_5: "donotexist" } } + + it "is not permitted as setup error" do + parser.valid? + setup_errors = parser.errors.select { |e| e.options[:category] == :setup } + + expect(setup_errors.find { |e| e.attribute == :field_5 }.message).to eql(I18n.t("validations.not_answered", question: "reported by.")) + end + + it "blocks log creation" do + parser.valid? + expect(parser).to be_block_log_creation + end + end + + context "when not affiliated with managing org" do + let(:unaffiliated_org) { create(:organisation, :with_old_visible_id) } + + let(:attributes) { { bulk_upload:, field_4: owning_org.old_visible_id, field_5: unaffiliated_org.old_visible_id } } + + it "is not permitted as setup error" do + parser.valid? + setup_errors = parser.errors.select { |e| e.options[:category] == :setup } + + expect(setup_errors.find { |e| e.attribute == :field_5 }.message).to eql(I18n.t("validations.sales.2025.bulk_upload.assigned_to.managing_organisation_not_related")) + end + + it "blocks log creation" do + parser.valid? + expect(parser).to be_block_log_creation + end + end + end + end + + describe "#owning_organisation_id" do + let(:attributes) { setup_section_params } + + context "when owning organisation does not own stock" do + let(:owning_org) { create(:organisation, :with_old_visible_id, holds_own_stock: false) } + let(:attributes) { setup_section_params } + + it "is not permitted as setup error" do + parser.valid? + setup_errors = parser.errors.select { |e| e.options[:category] == :setup } + + expect(setup_errors.find { |e| e.attribute == :field_4 }.message).to eql(I18n.t("validations.sales.2025.bulk_upload.owning_organisation.not_stock_owner")) + end + + it "blocks log creation" do + parser.valid? + expect(parser).to be_block_log_creation + end + end + end + + describe "#spreadsheet_duplicate_hash" do + it "returns a hash" do + expect(parser.spreadsheet_duplicate_hash).to be_a(Hash) + end + end + + describe "#add_duplicate_found_in_spreadsheet_errors" do + it "adds errors" do + expect { parser.add_duplicate_found_in_spreadsheet_errors }.to change(parser.errors, :size) + end + end +end