Browse Source

Reverse year check mathod

pull/1665/head
Kat 3 years ago
parent
commit
a90066a0fc
  1. 2
      app/services/bulk_upload/lettings/validator.rb
  2. 4
      app/services/bulk_upload/lettings/year2022/csv_parser.rb
  3. 6
      app/services/bulk_upload/lettings/year2023/csv_parser.rb
  4. 2
      app/services/bulk_upload/sales/validator.rb
  5. 4
      app/services/bulk_upload/sales/year2022/csv_parser.rb
  6. 6
      app/services/bulk_upload/sales/year2023/csv_parser.rb

2
app/services/bulk_upload/lettings/validator.rb

@ -162,7 +162,7 @@ private
def validate_correct_template def validate_correct_template
return if halt_validations? return if halt_validations?
errors.add(:base, :wrong_template) unless csv_parser.correct_template_for_year? errors.add(:base, :wrong_template) if csv_parser.wrong_template_for_year?
end end
def halt_validations! def halt_validations!

4
app/services/bulk_upload/lettings/year2022/csv_parser.rb

@ -61,8 +61,8 @@ class BulkUpload::Lettings::Year2022::CsvParser
max_columns_count > MAX_COLUMNS max_columns_count > MAX_COLUMNS
end end
def correct_template_for_year? def wrong_template_for_year?
true false
end end
private private

6
app/services/bulk_upload/lettings/year2023/csv_parser.rb

@ -64,10 +64,10 @@ class BulkUpload::Lettings::Year2023::CsvParser
max_columns_count > MAX_COLUMNS max_columns_count > MAX_COLUMNS
end end
def correct_template_for_year? def wrong_template_for_year?
collection_start_year_for_date(first_record_start_date) == FORM_YEAR collection_start_year_for_date(first_record_start_date) != FORM_YEAR
rescue Date::Error rescue Date::Error
true false
end end
private private

2
app/services/bulk_upload/sales/validator.rb

@ -137,7 +137,7 @@ private
def validate_correct_template def validate_correct_template
return if halt_validations? return if halt_validations?
errors.add(:base, :wrong_template) unless csv_parser.correct_template_for_year? errors.add(:base, :wrong_template) if csv_parser.wrong_template_for_year?
end end
def halt_validations! def halt_validations!

4
app/services/bulk_upload/sales/year2022/csv_parser.rb

@ -43,8 +43,8 @@ class BulkUpload::Sales::Year2022::CsvParser
cols[headers.find_index(field) + col_offset] cols[headers.find_index(field) + col_offset]
end end
def correct_template_for_year? def wrong_template_for_year?
true false
end end
private private

6
app/services/bulk_upload/sales/year2023/csv_parser.rb

@ -49,10 +49,10 @@ class BulkUpload::Sales::Year2023::CsvParser
cols[field_numbers.find_index(field) + col_offset] cols[field_numbers.find_index(field) + col_offset]
end end
def correct_template_for_year? def wrong_template_for_year?
collection_start_year_for_date(first_record_start_date) == FORM_YEAR collection_start_year_for_date(first_record_start_date) != FORM_YEAR
rescue Date::Error rescue Date::Error
true false
end end
private private

Loading…
Cancel
Save