Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cover edge cases for validations #146

Merged
merged 2 commits into from
Jul 1, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions lib/dfe/analytics/fields.rb
Original file line number Diff line number Diff line change
Expand Up @@ -68,19 +68,21 @@ 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.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
Expand Down