validate radio options for bulk upload

app/models/validations/shared_validations.rb

@@ -77,19 +77,6 @@ module Validations::SharedValidations
     { scope: status, date: date&.to_formatted_s(:govuk_date), deactivation_date: closest_reactivation&.deactivation_date&.to_formatted_s(:govuk_date) }
   end
 
-  def validate_valid_radio_option(record)
-    return unless FeatureToggle.validate_valid_radio_options?
-
-    record.attributes.each do |question_id, _v|
-      question = record.form.get_question(question_id, record)
-
-      next unless question&.type == "radio"
-      next unless record[question_id].present? && !question.answer_options.key?(record[question_id].to_s) && question.page.routed_to?(record, nil)
-
-      record.errors.add(question_id, I18n.t("validations.invalid_option", question: question.check_answer_label&.downcase))
-    end
-  end
-
   def shared_validate_partner_count(record, max_people)
     partner_numbers = (2..max_people).select { |n| person_is_partner?(record["relat#{n}"]) }
     if partner_numbers.count > 1

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

@@ -329,6 +329,8 @@ class BulkUpload::Lettings::Year2022::RowParser
   validate :validate_created_by_related
   validate :validate_rent_type
 
+  validate :validate_valid_radio_option
+
   def self.question_for_field(field)
     QUESTIONS[field]
   end
@@ -386,6 +388,21 @@ class BulkUpload::Lettings::Year2022::RowParser
 
 private
 
+  def validate_valid_radio_option
+    log.attributes.each do |question_id, _v|
+      question = log.form.get_question(question_id, log)
+
+      next unless question&.type == "radio"
+      next if log[question_id].blank? || question.answer_options.key?(log[question_id].to_s) || !question.page.routed_to?(log, nil)
+
+      fields = field_mapping_for_errors[question_id.to_sym] || []
+
+      fields.each do |field|
+        errors.add(field, I18n.t("validations.invalid_option", question: QUESTIONS[field]))
+      end
+    end
+  end
+
   def validate_created_by_exists
     return if field_112.blank?
 

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

@@ -331,6 +331,8 @@ class BulkUpload::Lettings::Year2023::RowParser
   validate :validate_created_by_exists
   validate :validate_created_by_related
 
+  validate :validate_valid_radio_option
+
   def self.question_for_field(field)
     QUESTIONS[field]
   end
@@ -388,6 +390,21 @@ class BulkUpload::Lettings::Year2023::RowParser
 
 private
 
+  def validate_valid_radio_option
+    log.attributes.each do |question_id, _v|
+      question = log.form.get_question(question_id, log)
+
+      next unless question&.type == "radio"
+      next if log[question_id].blank? || question.answer_options.key?(log[question_id].to_s) || !question.page.routed_to?(log, nil)
+
+      fields = field_mapping_for_errors[question_id.to_sym] || []
+
+      fields.each do |field|
+        errors.add(field, I18n.t("validations.invalid_option", question: QUESTIONS[field]))
+      end
+    end
+  end
+
   def validate_created_by_exists
     return if field_3.blank?
 

config/initializers/feature_toggle.rb

@@ -50,10 +50,6 @@ class FeatureToggle
     !Rails.env.production?
   end
 
-  def self.validate_valid_radio_options?
-    !(Rails.env.production? || Rails.env.staging?)
-  end
-
   def self.collection_2023_2024_year_enabled?
     true
   end

spec/models/validations/shared_validations_spec.rb

@@ -113,34 +113,4 @@ RSpec.describe Validations::SharedValidations do
       end
     end
   end
-
-  describe "radio options validations" do
-    it "allows only possible values" do
-      record.needstype = 1
-      shared_validator.validate_valid_radio_option(record)
-
-      expect(record.errors["needstype"]).to be_empty
-    end
-
-    it "denies impossible values" do
-      record.needstype = 3
-      shared_validator.validate_valid_radio_option(record)
-
-      expect(record.errors["needstype"]).to be_present
-      expect(record.errors["needstype"]).to eql(["Enter a valid value for needs type"])
-    end
-
-    context "when feature is toggled off" do
-      before do
-        allow(FeatureToggle).to receive(:validate_valid_radio_options?).and_return(false)
-      end
-
-      it "allows any values" do
-        record.needstype = 3
-        shared_validator.validate_valid_radio_option(record)
-
-        expect(record.errors["needstype"]).to be_empty
-      end
-    end
-  end
 end

spec/services/bulk_upload/lettings/year2023/row_parser_spec.rb

@@ -3,7 +3,7 @@ require "rails_helper"
 RSpec.describe BulkUpload::Lettings::Year2023::RowParser do
   subject(:parser) { described_class.new(attributes) }
 
-  let(:now) { Time.zone.parse("01/03/2023") }
+  let(:now) { Time.zone.now.beginning_of_day }
 
   let(:attributes) { { bulk_upload: } }
   let(:bulk_upload) { create(:bulk_upload, :lettings, user:, needstype: nil) }
@@ -504,6 +504,14 @@ RSpec.describe BulkUpload::Lettings::Year2023::RowParser do
           end
         end
       end
+
+      context "when no longer a valid option from previous year" do
+        let(:attributes) { setup_section_params.merge({ field_102: "7" }) }
+
+        it "returns an error" do
+          expect(parser.errors[:field_102]).to be_present
+        end
+      end
     end
 
     describe "#field_83, #field_84, #field_85" do
@@ -790,6 +798,16 @@ RSpec.describe BulkUpload::Lettings::Year2023::RowParser do
       end
     end
 
+    describe "#field_26" do # unitletas
+      context "when no longer a valid option from previous year" do
+        let(:attributes) { setup_section_params.merge({ field_26: "4" }) }
+
+        it "returns an error" do
+          expect(parser.errors[:field_26]).to be_present
+        end
+      end
+    end
+
     describe "#field_30" do
       context "when null" do
         let(:attributes) { setup_section_params.merge({ field_30: nil }) }