From e916ffda0b530d0aac2b585bf3ef5401ace37f76 Mon Sep 17 00:00:00 2001 From: Phil Lee Date: Mon, 30 Jan 2023 16:15:42 +0000 Subject: [PATCH] refactor with extract method --- app/services/bulk_upload/lettings/validator.rb | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/app/services/bulk_upload/lettings/validator.rb b/app/services/bulk_upload/lettings/validator.rb index 30d232133..90da6efb3 100644 --- a/app/services/bulk_upload/lettings/validator.rb +++ b/app/services/bulk_upload/lettings/validator.rb @@ -174,8 +174,8 @@ class BulkUpload::Lettings::Validator end def create_logs? - return false if row_parsers.any? { |row_parser| row_parser.log.form.setup_sections[0].subsections[0].is_incomplete?(row_parser.log) } - return false if over_percent_column_error_threshold? + return false if any_setup_sections_incomplete? + return false if over_column_error_threshold? row_parsers.all? { |row_parser| row_parser.log.valid? } end @@ -186,7 +186,11 @@ class BulkUpload::Lettings::Validator private - def over_percent_column_error_threshold? + def any_setup_sections_incomplete? + row_parsers.any? { |row_parser| row_parser.log.form.setup_sections[0].subsections[0].is_incomplete?(row_parser.log) } + end + + def over_column_error_threshold? fields = ("field_1".."field_134").to_a percentage_threshold = (row_parsers.size * COLUMN_PERCENTAGE_ERROR_THRESHOLD).ceil