diff --git a/app/helpers/bulk_upload/sales_log_to_csv.rb b/app/helpers/bulk_upload/sales_log_to_csv.rb index cb31d9365..1171f481f 100644 --- a/app/helpers/bulk_upload/sales_log_to_csv.rb +++ b/app/helpers/bulk_upload/sales_log_to_csv.rb @@ -70,7 +70,7 @@ class BulkUpload::SalesLogToCsv when 2025 (1..121).to_a when 2026 - (1..BulkUpload::Lettings::Year2026::CsvParser::FIELDS).to_a + (1..BulkUpload::Sales::Year2026::CsvParser::FIELDS).to_a else raise NotImplementedError "No mapping function implemented for year #{year}" end diff --git a/docs/Gemfile.lock b/docs/Gemfile.lock index 174ecda02..5412cb0be 100644 --- a/docs/Gemfile.lock +++ b/docs/Gemfile.lock @@ -24,10 +24,12 @@ GEM ffi (>= 1.15.0) eventmachine (1.2.7) execjs (2.8.1) - faraday (2.7.4) - faraday-net_http (>= 2.0, < 3.1) - ruby2_keywords (>= 0.0.4) - faraday-net_http (3.0.2) + faraday (2.14.1) + faraday-net_http (>= 2.0, < 3.5) + json + logger + faraday-net_http (3.4.2) + net-http (~> 0.5) ffi (1.15.5) forwardable-extended (2.6.0) gemoji (3.0.1) @@ -196,6 +198,7 @@ GEM gemoji (~> 3.0) html-pipeline (~> 2.2) jekyll (>= 3.0, < 5.0) + json (2.18.1) kramdown (2.3.2) rexml kramdown-parser-gfm (1.1.0) @@ -204,12 +207,15 @@ GEM listen (3.8.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) + logger (1.7.0) mercenary (0.3.6) minima (2.5.1) jekyll (>= 3.5, < 5.0) jekyll-feed (~> 0.9) jekyll-seo-tag (~> 2.1) minitest (5.19.0) + net-http (0.9.1) + uri (>= 0.11.1) nokogiri (1.18.9-arm64-darwin) racc (~> 1.4) nokogiri (1.18.9-x86_64-darwin) @@ -228,7 +234,6 @@ GEM ffi (~> 1.0) rexml (3.4.2) rouge (3.26.0) - ruby2_keywords (0.0.5) rubyzip (2.3.2) safe_yaml (1.0.5) sass (3.7.4) @@ -251,6 +256,7 @@ GEM unf_ext unf_ext (0.0.8.2) unicode-display_width (1.8.0) + uri (1.1.1) webrick (1.8.2) PLATFORMS diff --git a/spec/fixtures/variable_definitions/sales_download_26_27.csv b/spec/fixtures/variable_definitions/sales_download_26_27.csv index cf5641921..6d981a0c0 100644 --- a/spec/fixtures/variable_definitions/sales_download_26_27.csv +++ b/spec/fixtures/variable_definitions/sales_download_26_27.csv @@ -279,3 +279,9 @@ has_mscharge,Does the property have any monthly leasehold charges? mscharge,What are the total monthly leasehold charges for the property? discount,What was the percentage discount? grant,What was the amount of any loan, grant, discount or subsidy given? +sexrab1,What was buyer 1's sex at birth?,,, +sexrab2,What was buyer/person 2's sex at birth?,,, +sexrab3,What was person 3's sex at birth?,,, +sexrab4,What was person 4's sex at birth?,,, +sexrab5,What was person 5's sex at birth?,,, +sexrab6,What was person 6's sex at birth?,,, diff --git a/spec/lib/tasks/log_variable_definitions_spec.rb b/spec/lib/tasks/log_variable_definitions_spec.rb index af9976362..92ebaf78a 100644 --- a/spec/lib/tasks/log_variable_definitions_spec.rb +++ b/spec/lib/tasks/log_variable_definitions_spec.rb @@ -6,7 +6,7 @@ RSpec.describe "log_variable_definitions" do subject(:task) { Rake::Task["data_import:add_variable_definitions"] } let(:path) { "spec/fixtures/variable_definitions" } - let(:total_variable_definitions_count) { 425 } + let(:total_variable_definitions_count) { 427 } before do Rake.application.rake_require("tasks/log_variable_definitions") diff --git a/spec/services/bulk_upload/sales/year2026/csv_parser_spec.rb b/spec/services/bulk_upload/sales/year2026/csv_parser_spec.rb index 41ed9e91a..ea97dfac7 100644 --- a/spec/services/bulk_upload/sales/year2026/csv_parser_spec.rb +++ b/spec/services/bulk_upload/sales/year2026/csv_parser_spec.rb @@ -15,8 +15,8 @@ RSpec.describe BulkUpload::Sales::Year2026::CsvParser do 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(BulkUpload::SalesLogToCsv.new(log:).default_field_numbers_row_for_year(2026)) + file.write(BulkUpload::SalesLogToCsv.new(log:).to_year_csv_row(2026)) file.write("\n") file.rewind end @@ -81,8 +81,8 @@ RSpec.describe BulkUpload::Sales::Year2026::CsvParser do 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.write(BulkUpload::SalesLogToCsv.new(log:).default_field_numbers_row_for_year(2026, seed:)) + file.write(BulkUpload::SalesLogToCsv.new(log:).to_year_csv_row(2026, seed:)) file.rewind end