improvements

app/models/validations/tenancy_validations.rb

@@ -34,8 +34,11 @@ module Validations::TenancyValidations
   end
 
   def validate_joint_tenancy(record)
-    if record.hhmemb == 1 && record.joint != 2 && record.collection_start_year == 2022
-      record.errors.add :joint, I18n.t("validations.tenancy.not_joint")
+    if !record.collection_start_year.blank?
+      if record.hhmemb == 1 && record.joint != 2 && record.collection_start_year >= 2022
+        record.errors.add :joint, I18n.t("validations.tenancy.not_joint")
+        record.errors.add :hhmemb, I18n.t("validations.tenancy.not_joint")
+      end
     end
   end
 end

spec/models/validations/tenancy_validations_spec.rb

@@ -157,6 +157,7 @@ RSpec.describe Validations::TenancyValidations do
         record.joint = 1
         tenancy_validator.validate_joint_tenancy(record)
         expect(record.errors["joint"]).to include(match(expected_error))
+        expect(record.errors["hhmemb"]).to include(match(expected_error))
       end
 
       it "does not display an error if the data inputter says the letting is not a joint tenancy" do