From 2b45333ded4f69d3737b7ccd5834d78d31aa1c13 Mon Sep 17 00:00:00 2001 From: natdeanlewissoftwire Date: Mon, 5 Dec 2022 16:05:11 +0000 Subject: [PATCH] refactor: use presence validation for postcode --- app/models/location.rb | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/app/models/location.rb b/app/models/location.rb index de838816e..b97e8f7fa 100644 --- a/app/models/location.rb +++ b/app/models/location.rb @@ -1,4 +1,5 @@ class Location < ApplicationRecord + validates :postcode, on: :postcode, presence: { message: I18n.t("validations.location.postcode_blank") } validate :validate_postcode, on: :postcode validate :validate_location_admin_district, on: :location_admin_district validates :name, on: :name, presence: { message: I18n.t("validations.location.name") } @@ -408,10 +409,7 @@ class Location < ApplicationRecord end def validate_postcode - if postcode.blank? - error_message = I18n.t("validations.location.postcode_blank") - errors.add :postcode, error_message - elsif !postcode&.match(POSTCODE_REGEXP) + if !postcode&.match(POSTCODE_REGEXP) error_message = I18n.t("validations.postcode") errors.add :postcode, error_message else