refactor

app/services/bulk_upload/lettings/year2022/row_parser.rb

@@ -853,7 +853,7 @@ private
     if log_already_exists?
       error_message = "This is a duplicate log"
 
-      errors.add(:field_5, error_message) unless bulk_upload.needstype == 1 # location
+      errors.add(:field_5, error_message) if bulk_upload.needstype != 1 # location
       errors.add(:field_7, error_message) # tenancycode
       errors.add(:field_12, error_message) # age1
       errors.add(:field_20, error_message) # sex1
@@ -863,8 +863,8 @@ private
       errors.add(:field_97, error_message) # startdate
       errors.add(:field_98, error_message) # startdate
       errors.add(:field_100, error_message) # propcode
-      errors.add(:field_108, error_message) unless bulk_upload.needstype == 2  # postcode_full
-      errors.add(:field_109, error_message) unless bulk_upload.needstype == 2  # postcode_full
+      errors.add(:field_108, error_message) if bulk_upload.needstype != 2  # postcode_full
+      errors.add(:field_109, error_message) if bulk_upload.needstype != 2  # postcode_full
       errors.add(:field_111, error_message) # owning_organisation
     end
   end

app/services/bulk_upload/lettings/year2023/row_parser.rb

@@ -857,10 +857,10 @@ private
       errors.add(:field_9, error_message) # startdate
       errors.add(:field_13, error_message) # tenancycode
       errors.add(:field_14, error_message) # propcode
-      errors.add(:field_17, error_message) unless field_4 == 1 # location
-      errors.add(:field_23, error_message) unless field_4 == 2 # postcode_full
-      errors.add(:field_24, error_message) unless field_4 == 2 # postcode_full
-      errors.add(:field_25, error_message) unless field_4 == 2 # la
+      errors.add(:field_17, error_message) if field_4 != 1 # location
+      errors.add(:field_23, error_message) if field_4 != 2 # postcode_full
+      errors.add(:field_24, error_message) if field_4 != 2 # postcode_full
+      errors.add(:field_25, error_message) if field_4 != 2 # la
       errors.add(:field_46, error_message) # age1
       errors.add(:field_47, error_message) # sex1
       errors.add(:field_50, error_message) # ecstat1