Merge pull request #707 from DEFRA/fix/area-identifier-validation

refactoring identifier validation rules
DEFRA · Sep 28, 2023 · 99c59f0 · 99c59f0
2 parents c5d507b + 0b39cc1
commit 99c59f0
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/app/models/pafs_core/area.rb b/app/models/pafs_core/area.rb
@@ -14,8 +14,8 @@ class Area < ApplicationRecord
 
     validates :name, :area_type, presence: true
     validates :name, uniqueness: true
-    validates :identifier, presence: true, if: :rma? || :authority?, unless: :skip_identifier_validation
-    validates :identifier, uniqueness: true, if: :rma? || :authority?, unless: :skip_identifier_validation
+    validates :identifier, presence: true, if: -> { rma? || authority? }, unless: :skip_identifier_validation
+    validates :identifier, uniqueness: true, if: -> { rma? || authority? }, unless: :skip_identifier_validation
     validate :parentage
     validates :area_type, inclusion: { in: AREA_TYPES }
     validates :sub_type, presence: true, if: :rma?