From 53ddf4bc43ca0a514d8d5e542175d9459321a463 Mon Sep 17 00:00:00 2001 From: Erica Porter Date: Fri, 24 May 2024 09:57:20 +0100 Subject: [PATCH 1/2] Cover edge cases for validations --- lib/dfe/analytics/fields.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/dfe/analytics/fields.rb b/lib/dfe/analytics/fields.rb index b6a95f2f..bca59aaf 100644 --- a/lib/dfe/analytics/fields.rb +++ b/lib/dfe/analytics/fields.rb @@ -68,16 +68,18 @@ def self.allowlist end def self.hidden_pii - DfE::Analytics.hidden_pii + DfE::Analytics.hidden_pii || {} end def self.allowlist_pii - DfE::Analytics.allowlist_pii + DfE::Analytics.allowlist_pii || {} end def self.overlapping_pii_fields overlapping_fields = [] hidden_pii.each do |entity, fields| + next if fields.nil? || fields.empty? + if allowlist_pii[entity] overlapping = fields & allowlist_pii[entity] overlapping_fields.concat(overlapping) unless overlapping.empty? From b23cf35649806c2a7e6077202944cbb626cb3082 Mon Sep 17 00:00:00 2001 From: Erica Porter Date: Fri, 31 May 2024 11:33:40 +0100 Subject: [PATCH 2/2] Update to .blank? --- lib/dfe/analytics/fields.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/dfe/analytics/fields.rb b/lib/dfe/analytics/fields.rb index bca59aaf..f5eedecb 100644 --- a/lib/dfe/analytics/fields.rb +++ b/lib/dfe/analytics/fields.rb @@ -78,11 +78,11 @@ def self.allowlist_pii def self.overlapping_pii_fields overlapping_fields = [] hidden_pii.each do |entity, fields| - next if fields.nil? || fields.empty? + next if fields.blank? if allowlist_pii[entity] overlapping = fields & allowlist_pii[entity] - overlapping_fields.concat(overlapping) unless overlapping.empty? + overlapping_fields.concat(overlapping) unless overlapping.blank? end end overlapping_fields