From d47c4bcdc442ab02e1421c3bb7afcfe1eda37c22 Mon Sep 17 00:00:00 2001 From: Phil Lee Date: Fri, 14 Apr 2023 10:04:31 +0100 Subject: [PATCH] speed up bulk upload with missing memoization (#1539) --- app/services/bulk_upload/lettings/year2022/row_parser.rb | 6 +++--- app/services/bulk_upload/lettings/year2023/row_parser.rb | 6 +++--- .../bulk_upload/lettings/year2023/row_parser_spec.rb | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app/services/bulk_upload/lettings/year2022/row_parser.rb b/app/services/bulk_upload/lettings/year2022/row_parser.rb index 255aabe97..998068792 100644 --- a/app/services/bulk_upload/lettings/year2022/row_parser.rb +++ b/app/services/bulk_upload/lettings/year2022/row_parser.rb @@ -340,10 +340,10 @@ class BulkUpload::Lettings::Year2022::RowParser return true if blank_row? - super - log.valid? + super + log.errors.each do |error| fields = field_mapping_for_errors[error.attribute] || [] @@ -650,7 +650,7 @@ private end def questions - log.form.subsections.flat_map { |ss| ss.applicable_questions(log) } + @questions ||= log.form.subsections.flat_map { |ss| ss.applicable_questions(log) } end def validate_nulls diff --git a/app/services/bulk_upload/lettings/year2023/row_parser.rb b/app/services/bulk_upload/lettings/year2023/row_parser.rb index 60b5477ce..175c13400 100644 --- a/app/services/bulk_upload/lettings/year2023/row_parser.rb +++ b/app/services/bulk_upload/lettings/year2023/row_parser.rb @@ -342,10 +342,10 @@ class BulkUpload::Lettings::Year2023::RowParser return true if blank_row? - super - log.valid? + super + log.errors.each do |error| fields = field_mapping_for_errors[error.attribute] || [] @@ -826,7 +826,7 @@ private end def questions - log.form.subsections.flat_map { |ss| ss.applicable_questions(log) } + @questions ||= log.form.subsections.flat_map { |ss| ss.applicable_questions(log) } end def attributes_for_log diff --git a/spec/services/bulk_upload/lettings/year2023/row_parser_spec.rb b/spec/services/bulk_upload/lettings/year2023/row_parser_spec.rb index b79ee9f88..8984d9663 100644 --- a/spec/services/bulk_upload/lettings/year2023/row_parser_spec.rb +++ b/spec/services/bulk_upload/lettings/year2023/row_parser_spec.rb @@ -844,12 +844,12 @@ RSpec.describe BulkUpload::Lettings::Year2023::RowParser do end end - describe "#field_56" do # age3 + describe "#field_52" do # age2 context "when null but gender given" do - let(:attributes) { setup_section_params.merge({ field_56: "", field_57: "F" }) } + let(:attributes) { setup_section_params.merge({ field_52: "", field_53: "F" }) } it "returns an error" do - expect(parser.errors[:field_56]).to be_present + expect(parser.errors[:field_52]).to be_present end end end