From fb07faaac59ed9dd6bae46ee2abb6f90c9819969 Mon Sep 17 00:00:00 2001
From: Manny Dinssa <44172848+Dinssa@users.noreply.github.com>
Date: Wed, 26 Feb 2025 08:40:45 +0000
Subject: [PATCH] Update validations

---
 app/models/form/lettings/subsections/household_situation.rb | 2 +-
 app/models/validations/household_validations.rb             | 3 +++
 app/models/validations/property_validations.rb              | 1 +
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/models/form/lettings/subsections/household_situation.rb b/app/models/form/lettings/subsections/household_situation.rb
index 3eb4e7691..bb49c876b 100644
--- a/app/models/form/lettings/subsections/household_situation.rb
+++ b/app/models/form/lettings/subsections/household_situation.rb
@@ -22,6 +22,7 @@ class Form::Lettings::Subsections::HouseholdSituation < ::Form::Subsection
       Form::Lettings::Pages::ReasonablePreferenceReason.new(nil, nil, self),
       Form::Lettings::Pages::AllocationSystem.new("allocation_system", nil, self),
       referral_questions,
+      Form::Lettings::Pages::ReferralValueCheck.new(nil, nil, self),
     ].flatten.compact
   end
 
@@ -41,7 +42,6 @@ class Form::Lettings::Subsections::HouseholdSituation < ::Form::Subsection
         Form::Lettings::Pages::ReferralGeneralNeeds.new(nil, nil, self),
         Form::Lettings::Pages::ReferralSupportedHousing.new(nil, nil, self),
         Form::Lettings::Pages::ReferralSupportedHousingPrp.new(nil, nil, self),
-        Form::Lettings::Pages::ReferralValueCheck.new(nil, nil, self),
       ]
     end
   end
diff --git a/app/models/validations/household_validations.rb b/app/models/validations/household_validations.rb
index 63da6d628..723ab30b6 100644
--- a/app/models/validations/household_validations.rb
+++ b/app/models/validations/household_validations.rb
@@ -32,6 +32,7 @@ module Validations::HouseholdValidations
 
     if record.is_reason_permanently_decanted? && record.referral.present? && !record.is_internal_transfer?
       record.errors.add :referral, I18n.t("validations.lettings.household.referral.leaving_last_settled_home.reason_permanently_decanted")
+      record.errors.add :referral_type, I18n.t("validations.lettings.household.referral.leaving_last_settled_home.reason_permanently_decanted")
       record.errors.add :reason, I18n.t("validations.lettings.household.reason.leaving_last_settled_home.not_internal_transfer")
     end
 
@@ -171,6 +172,7 @@ module Validations::HouseholdValidations
       label = record.form.get_question("prevten", record).present? ? record.form.get_question("prevten", record).label_from_value(record.prevten) : ""
       record.errors.add :prevten, :internal_transfer_non_social_housing, message: I18n.t("validations.lettings.household.prevten.internal_transfer", prevten: label)
       record.errors.add :referral, :internal_transfer_non_social_housing, message: I18n.t("validations.lettings.household.referral.prevten_invalid", prevten: label)
+      record.errors.add :referral_type, :internal_transfer_non_social_housing, message: I18n.t("validations.lettings.household.referral.prevten_invalid", prevten: label)
     end
   end
 
@@ -180,6 +182,7 @@ module Validations::HouseholdValidations
     if record.is_internal_transfer? && record.owning_organisation.provider_type == "PRP" && record.is_prevten_la_general_needs?
       record.errors.add :prevten, :internal_transfer_fixed_or_lifetime, message: I18n.t("validations.lettings.household.prevten.la_general_needs.internal_transfer")
       record.errors.add :referral, :internal_transfer_fixed_or_lifetime, message: I18n.t("validations.lettings.household.referral.la_general_needs.internal_transfer")
+      record.errors.add :referral_type, :internal_transfer_fixed_or_lifetime, message: I18n.t("validations.lettings.household.referral.la_general_needs.internal_transfer")
     end
   end
 
diff --git a/app/models/validations/property_validations.rb b/app/models/validations/property_validations.rb
index 1cf710857..364cfe732 100644
--- a/app/models/validations/property_validations.rb
+++ b/app/models/validations/property_validations.rb
@@ -11,6 +11,7 @@ module Validations::PropertyValidations
     if record.is_relet_to_temp_tenant? && REFERRAL_INVALID_TMP.include?(record.referral)
       record.errors.add :rsnvac, I18n.t("validations.lettings.property.rsnvac.referral_invalid")
       record.errors.add :referral, :referral_invalid, message: I18n.t("validations.lettings.property.referral.rsnvac_non_temp")
+      record.errors.add :referral_type, :referral_invalid, message: I18n.t("validations.lettings.property.referral.rsnvac_non_temp")
     end
 
     if record.renewal.present? && record.renewal.zero? && record.rsnvac == 14