Merge branch 'main' into RemoveCloudfoundry

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

@@ -383,6 +383,7 @@ class BulkUpload::Lettings::Year2024::RowParser
 
   validate :validate_incomplete_soft_validations, on: :after_log
   validate :validate_all_charges_given, on: :after_log, if: proc { is_carehome.zero? }
+  validate :validate_nationality, on: :after_log
 
   def self.question_for_field(field)
     QUESTIONS[field]
@@ -557,6 +558,12 @@ private
     end
   end
 
+  def validate_nationality
+    if field_45.present? && !valid_nationality_options.include?(field_45.to_s)
+      errors.add(:field_45, I18n.t("validations.household.nationality"))
+    end
+  end
+
   def duplicate_check_fields
     [
       "startdate",
@@ -914,6 +921,7 @@ private
       ethnic_group: %i[field_44],
       ethnic: %i[field_44],
       nationality_all: %i[field_45],
+      nationality_all_group: %i[field_45],
 
       relat2: %i[field_47],
       relat3: %i[field_51],
@@ -1087,7 +1095,7 @@ private
 
     attributes["ethnic_group"] = ethnic_group_from_ethnic
     attributes["ethnic"] = field_44
-    attributes["nationality_all"] = field_45
+    attributes["nationality_all"] = field_45 if field_45.present? && valid_nationality_options.include?(field_45.to_s)
     attributes["nationality_all_group"] = nationality_group(attributes["nationality_all"])
 
     attributes["relat2"] = field_47
@@ -1486,6 +1494,10 @@ private
     end
   end
 
+  def valid_nationality_options
+    %w[0] + GlobalConstants::COUNTRIES_ANSWER_OPTIONS.keys # 0 is "Prefers not to say"
+  end
+
   def nationality_group(nationality_value)
     return unless nationality_value
     return 0 if nationality_value.zero?

app/services/bulk_upload/sales/year2024/row_parser.rb

@@ -469,6 +469,8 @@ class BulkUpload::Sales::Year2024::RowParser
   validate :validate_if_log_already_exists, on: :after_log, if: -> { FeatureToggle.bulk_upload_duplicate_log_check_enabled? }
 
   validate :validate_buyers_organisations, on: :after_log
+  validate :validate_nationality, on: :after_log
+  validate :validate_buyer_2_nationality, on: :after_log
 
   def self.question_for_field(field)
     QUESTIONS[field]
@@ -834,7 +836,7 @@ private
 
     attributes["ethnic_group"] = ethnic_group_from_ethnic
     attributes["ethnic"] = field_33
-    attributes["nationality_all"] = field_34
+    attributes["nationality_all"] = field_34 if field_34.present? && valid_nationality_options.include?(field_34.to_s)
     attributes["nationality_all_group"] = nationality_group(attributes["nationality_all"])
 
     attributes["income1nk"] = field_77 == "R" ? 1 : 0
@@ -942,7 +944,7 @@ private
 
     attributes["ethnic_group2"] = infer_buyer2_ethnic_group_from_ethnic
     attributes["ethnicbuy2"] = field_40
-    attributes["nationality_all_buyer2"] = field_41
+    attributes["nationality_all_buyer2"] = field_41 if field_41.present? && valid_nationality_options.include?(field_41.to_s)
     attributes["nationality_all_buyer2_group"] = nationality_group(attributes["nationality_all_buyer2"])
 
     attributes["buy2living"] = field_70
@@ -1341,4 +1343,20 @@ private
       errors.add(:field_35, "Buyer 1 cannot be a child under 16")
     end
   end
+
+  def validate_nationality
+    if field_34.present? && !valid_nationality_options.include?(field_34.to_s)
+      errors.add(:field_34, I18n.t("validations.household.nationality"))
+    end
+  end
+
+  def validate_buyer_2_nationality
+    if field_41.present? && !valid_nationality_options.include?(field_41.to_s)
+      errors.add(:field_41, I18n.t("validations.household.nationality"))
+    end
+  end
+
+  def valid_nationality_options
+    %w[0] + GlobalConstants::COUNTRIES_ANSWER_OPTIONS.keys # 0 is "Prefers not to say"
+  end
 end

config/locales/en.yml

@@ -552,6 +552,7 @@ en:
       buylivein:
         buyers_will_live_in_property_values_inconsistent_setup: "You have already told us that both buyer 1 and buyer 2 will not live in the property"
         buyers_will_live_in_property_values_inconsistent: "You have already told us that the buyers will live in the property. Either buyer 1 or buyer 2 must live in the property"
+      nationality: "Select a valid nationality"
 
     tenancy:
       length:

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

@@ -149,7 +149,7 @@ RSpec.describe BulkUpload::Lettings::Year2024::RowParser do
             field_73: "M",
 
             field_44: "17",
-            field_45: "18",
+            field_45: "826",
 
             field_47: "P",
             field_51: "C",
@@ -1594,6 +1594,17 @@ RSpec.describe BulkUpload::Lettings::Year2024::RowParser do
           expect(parser.log.nationality_all_group).to be(826)
         end
       end
+
+      context "when field_45 is not a valid option" do
+        let(:attributes) { setup_section_params.merge({ field_45: "123123" }) }
+
+        it "is correctly set" do
+          parser.log.save!
+          expect(parser.log.nationality_all).to be(nil)
+          expect(parser.log.nationality_all_group).to be(nil)
+          expect(parser.errors["field_45"]).to include("Select a valid nationality")
+        end
+      end
     end
 
     describe "soft validations" do

spec/services/bulk_upload/sales/year2024/row_parser_spec.rb

@@ -57,14 +57,14 @@ RSpec.describe BulkUpload::Sales::Year2024::RowParser do
       field_31: "32",
       field_32: "M",
       field_33: "12",
-      field_34: "18",
+      field_34: "28",
       field_35: "1",
       field_36: "1",
       field_37: "R",
       field_38: "32",
       field_39: "F",
       field_40: "17",
-      field_41: "13",
+      field_41: "28",
       field_42: "2",
       field_43: "1",
       field_44: "0",
@@ -1208,6 +1208,17 @@ RSpec.describe BulkUpload::Sales::Year2024::RowParser do
           expect(parser.log.nationality_all_group).to be(826)
         end
       end
+
+      context "when field_34 is not a valid option" do
+        let(:attributes) { setup_section_params.merge({ field_34: "123123" }) }
+
+        it "is correctly set" do
+          parser.valid?
+          expect(parser.log.nationality_all).to be(nil)
+          expect(parser.log.nationality_all_group).to be(nil)
+          expect(parser.errors["field_34"]).to include("Select a valid nationality")
+        end
+      end
     end
 
     describe "#nationality_all_buyer2" do
@@ -1282,6 +1293,17 @@ RSpec.describe BulkUpload::Sales::Year2024::RowParser do
           expect(parser.log.nationality_all_buyer2_group).to be(826)
         end
       end
+
+      context "when field_41 is not a valid option" do
+        let(:attributes) { setup_section_params.merge({ field_41: "123123" }) }
+
+        it "is correctly set" do
+          parser.valid?
+          expect(parser.log.nationality_all_buyer2).to be(nil)
+          expect(parser.log.nationality_all_buyer2_group).to be(nil)
+          expect(parser.errors["field_41"]).to include("Select a valid nationality")
+        end
+      end
     end
 
     describe "#buy2living" do

spec/services/merge/merge_organisations_service_spec.rb

@@ -221,19 +221,21 @@ RSpec.describe Merge::MergeOrganisationsService do
               expect(absorbed_scheme.locations.count).to eq(1)
               absorbed_location = absorbed_scheme.locations.first
 
-              expect(absorbed_scheme.startdate).to eq(Time.zone.today + 1.month)
-              expect(absorbed_location.startdate).to eq(Time.zone.today + 1.month)
+              expected_date = Time.zone.today + 1.month
+              expect(absorbed_scheme.startdate).to eq(expected_date.in_time_zone)
+              expect(absorbed_location.startdate).to eq(expected_date.in_time_zone)
             end
 
             it "deactivates schemes and locations on the merged organisation on the startdate" do
               merge_organisations_service.call
 
+              expected_date = Time.zone.today + 1.month
               expect(scheme.owning_organisation).to eq(merging_organisation)
               expect(location.scheme).to eq(scheme)
               expect(scheme.scheme_deactivation_periods.count).to eq(1)
-              expect(scheme.scheme_deactivation_periods.first.deactivation_date).to eq(Time.zone.today + 1.month)
+              expect(scheme.scheme_deactivation_periods.first.deactivation_date).to eq(expected_date.in_time_zone)
               expect(location.location_deactivation_periods.count).to eq(1)
-              expect(location.location_deactivation_periods.first.deactivation_date).to eq(Time.zone.today + 1.month)
+              expect(location.location_deactivation_periods.first.deactivation_date).to eq(expected_date.in_time_zone)
             end
           end
         end
@@ -376,15 +378,16 @@ RSpec.describe Merge::MergeOrganisationsService do
               expect(absorbed_scheme.locations.count).to eq(1)
               absorbed_location = absorbed_scheme.locations.first
 
+              expected_reactivation_date = Time.zone.today + 1.month
               expect(absorbed_scheme.startdate).to eq(Time.zone.today)
               expect(absorbed_scheme.scheme_deactivation_periods.count).to eq(1)
               expect(absorbed_scheme.scheme_deactivation_periods.first.deactivation_date).to eq(Time.zone.today)
-              expect(absorbed_scheme.scheme_deactivation_periods.first.reactivation_date).to eq(Time.zone.today + 1.month)
+              expect(absorbed_scheme.scheme_deactivation_periods.first.reactivation_date).to eq(expected_reactivation_date.in_time_zone)
 
               expect(absorbed_location.startdate).to eq(Time.zone.today)
               expect(absorbed_location.location_deactivation_periods.count).to eq(1)
               expect(absorbed_location.location_deactivation_periods.first.deactivation_date).to eq(Time.zone.today)
-              expect(absorbed_location.location_deactivation_periods.first.reactivation_date).to eq(Time.zone.today + 1.month)
+              expect(absorbed_location.location_deactivation_periods.first.reactivation_date).to eq(expected_reactivation_date.in_time_zone)
             end
 
             it "deactivates schemes and locations on the merged organisation" do