wip

app/models/validations/date_validations.rb

@@ -61,11 +61,11 @@ module Validations::DateValidations
     end
 
     if record.location&.status_during(record.startdate) == :deactivated
-      record.errors.add :startdate, I18n.t("validations.setup.startdate.during_deactivated_location")
+      record.errors.add :startdate, I18n.t("validations.setup.startdate.during_deactivated_location", postcode: record.location.postcode, date: "")
     end
 
     if record.location&.status_during(record.startdate) == :reactivating_soon
-      record.errors.add :startdate, I18n.t("validations.setup.startdate.location_reactivating_soon")
+      record.errors.add :startdate, I18n.t("validations.setup.startdate.location_reactivating_soon", postcode: record.location.postcode, date: "")
     end
   end
 

spec/models/validations/date_validations_spec.rb

@@ -98,7 +98,7 @@ RSpec.describe Validations::DateValidations do
         record.location = location
         date_validator.validate_startdate(record)
         expect(record.errors["startdate"])
-        .to include(match I18n.t("validations.setup.startdate.during_deactivated_location"))
+        .to include(match I18n.t("validations.setup.startdate.during_deactivated_location", postcode: location.postcode, date: "6 April 2022"))
       end
 
       it "produces no error when tenancy start date is during an active location period" do
@@ -123,7 +123,7 @@ RSpec.describe Validations::DateValidations do
         record.location = location
         date_validator.validate_startdate(record)
         expect(record.errors["startdate"])
-        .to include(match I18n.t("validations.setup.startdate.location_reactivating_soon"))
+        .to include(match I18n.t("validations.setup.startdate.location_reactivating_soon", postcode: location.postcode, date: "4 August 2022"))
       end
 
       it "produces no error when tenancy start date is during an active location period" do
@@ -150,7 +150,7 @@ RSpec.describe Validations::DateValidations do
         record.location = location
         date_validator.validate_startdate(record)
         expect(record.errors["startdate"])
-        .to include(match I18n.t("validations.setup.startdate.location_reactivating_soon"))
+        .to include(match I18n.t("validations.setup.startdate.location_reactivating_soon", postcode: location.postcode, date: "15 September 2022"))
       end
     end
   end