From a90066a0fcc4c11bcfc3a71378be5d8f72fe931a Mon Sep 17 00:00:00 2001
From: Kat <katrina@kosiak.co.uk>
Date: Thu, 25 May 2023 11:55:10 +0100
Subject: [PATCH] Reverse year check mathod

---
 app/services/bulk_upload/lettings/validator.rb           | 2 +-
 app/services/bulk_upload/lettings/year2022/csv_parser.rb | 4 ++--
 app/services/bulk_upload/lettings/year2023/csv_parser.rb | 6 +++---
 app/services/bulk_upload/sales/validator.rb              | 2 +-
 app/services/bulk_upload/sales/year2022/csv_parser.rb    | 4 ++--
 app/services/bulk_upload/sales/year2023/csv_parser.rb    | 6 +++---
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/app/services/bulk_upload/lettings/validator.rb b/app/services/bulk_upload/lettings/validator.rb
index 97261fd91..a7c20aa1b 100644
--- a/app/services/bulk_upload/lettings/validator.rb
+++ b/app/services/bulk_upload/lettings/validator.rb
@@ -162,7 +162,7 @@ private
   def validate_correct_template
     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
 
   def halt_validations!
diff --git a/app/services/bulk_upload/lettings/year2022/csv_parser.rb b/app/services/bulk_upload/lettings/year2022/csv_parser.rb
index 6b9378b6e..663964195 100644
--- a/app/services/bulk_upload/lettings/year2022/csv_parser.rb
+++ b/app/services/bulk_upload/lettings/year2022/csv_parser.rb
@@ -61,8 +61,8 @@ class BulkUpload::Lettings::Year2022::CsvParser
     max_columns_count > MAX_COLUMNS
   end
 
-  def correct_template_for_year?
-    true
+  def wrong_template_for_year?
+    false
   end
 
 private
diff --git a/app/services/bulk_upload/lettings/year2023/csv_parser.rb b/app/services/bulk_upload/lettings/year2023/csv_parser.rb
index 8787a5945..632e18329 100644
--- a/app/services/bulk_upload/lettings/year2023/csv_parser.rb
+++ b/app/services/bulk_upload/lettings/year2023/csv_parser.rb
@@ -64,10 +64,10 @@ class BulkUpload::Lettings::Year2023::CsvParser
     max_columns_count > MAX_COLUMNS
   end
 
-  def correct_template_for_year?
-    collection_start_year_for_date(first_record_start_date) == FORM_YEAR
+  def wrong_template_for_year?
+    collection_start_year_for_date(first_record_start_date) != FORM_YEAR
   rescue Date::Error
-    true
+    false
   end
 
 private
diff --git a/app/services/bulk_upload/sales/validator.rb b/app/services/bulk_upload/sales/validator.rb
index 30bd1fd2e..4508a5e96 100644
--- a/app/services/bulk_upload/sales/validator.rb
+++ b/app/services/bulk_upload/sales/validator.rb
@@ -137,7 +137,7 @@ private
   def validate_correct_template
     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
 
   def halt_validations!
diff --git a/app/services/bulk_upload/sales/year2022/csv_parser.rb b/app/services/bulk_upload/sales/year2022/csv_parser.rb
index c6cbd9c54..76604d5fe 100644
--- a/app/services/bulk_upload/sales/year2022/csv_parser.rb
+++ b/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]
   end
 
-  def correct_template_for_year?
-    true
+  def wrong_template_for_year?
+    false
   end
 
 private
diff --git a/app/services/bulk_upload/sales/year2023/csv_parser.rb b/app/services/bulk_upload/sales/year2023/csv_parser.rb
index e517feef6..6a1929b5c 100644
--- a/app/services/bulk_upload/sales/year2023/csv_parser.rb
+++ b/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]
   end
 
-  def correct_template_for_year?
-    collection_start_year_for_date(first_record_start_date) == FORM_YEAR
+  def wrong_template_for_year?
+    collection_start_year_for_date(first_record_start_date) != FORM_YEAR
   rescue Date::Error
-    true
+    false
   end
 
 private