From ab60a66552bf6ded4f37298c7d76e54e1a5dde0e Mon Sep 17 00:00:00 2001
From: Richard Pattinson <richie.pattinson@googlemail.com>
Date: Fri, 13 Sep 2024 12:45:31 +0100
Subject: [PATCH] Move pii fields to hidden_pii.yml

---
 Gemfile                         |  2 +-
 Gemfile.lock                    | 12 ++++++---
 config/analytics_hidden_pii.yml | 47 +++++++++++++++++++++++++++++++++
 config/analytics_pii.yml        | 47 +--------------------------------
 4 files changed, 57 insertions(+), 51 deletions(-)
 create mode 100644 config/analytics_hidden_pii.yml

diff --git a/Gemfile b/Gemfile
index 20a8cd155..91671f6d2 100644
--- a/Gemfile
+++ b/Gemfile
@@ -8,7 +8,7 @@ gem "bootsnap", require: false
 gem "cssbundling-rails"
 gem "devise"
 gem "devise_invitable"
-gem "dfe-analytics", github: "DFE-Digital/dfe-analytics"
+gem "dfe-analytics", github: "DFE-Digital/dfe-analytics", tag: "v1.14.2"
 gem "govuk-components"
 gem "govuk_design_system_formbuilder"
 gem "govuk_feature_flags",
diff --git a/Gemfile.lock b/Gemfile.lock
index 53c8303c3..4ce179e25 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,8 +1,9 @@
 GIT
   remote: https://github.com/DFE-Digital/dfe-analytics.git
-  revision: 79378cc466a40c6a6cba317e232cbf48ec79ab7d
+  revision: 706595e52fed211cee53ad99ceaeaabb47a059cc
+  tag: v1.14.2
   specs:
-    dfe-analytics (1.14.1)
+    dfe-analytics (1.14.2)
       google-cloud-bigquery (~> 1.38)
       httparty (~> 0.21)
       multi_xml (~> 0.6.0)
@@ -200,7 +201,7 @@ GEM
       raabro (~> 1.4)
     globalid (1.2.1)
       activesupport (>= 6.1)
-    google-apis-bigquery_v2 (0.76.0)
+    google-apis-bigquery_v2 (0.78.0)
       google-apis-core (>= 0.15.0, < 2.a)
     google-apis-core (0.15.1)
       addressable (~> 2.5, >= 2.5.1)
@@ -221,7 +222,7 @@ GEM
     google-cloud-core (1.7.1)
       google-cloud-env (>= 1.0, < 3.a)
       google-cloud-errors (~> 1.0)
-    google-cloud-env (2.1.1)
+    google-cloud-env (2.2.0)
       faraday (>= 1.0, < 3.a)
     google-cloud-errors (1.4.0)
     googleauth (1.11.0)
@@ -313,6 +314,8 @@ GEM
     nio4r (2.7.0)
     nokogiri (1.16.7-arm64-darwin)
       racc (~> 1.4)
+    nokogiri (1.16.7-x86_64-darwin)
+      racc (~> 1.4)
     nokogiri (1.16.7-x86_64-linux)
       racc (~> 1.4)
     notifications-ruby-client (5.4.0)
@@ -556,6 +559,7 @@ GEM
 
 PLATFORMS
   arm64-darwin-24
+  x86_64-darwin-23
   x86_64-linux
 
 DEPENDENCIES
diff --git a/config/analytics_hidden_pii.yml b/config/analytics_hidden_pii.yml
new file mode 100644
index 000000000..7dde5c6bc
--- /dev/null
+++ b/config/analytics_hidden_pii.yml
@@ -0,0 +1,47 @@
+---
+:shared:
+  :active_storage_blobs:
+    - filename
+  :active_storage_attachments:
+    - name
+  :referrers:
+    - first_name
+    - phone
+    - last_name
+  :referrals:
+    - first_name
+    - last_name
+    - previous_name
+    - date_of_birth
+    - email_address
+    - trn
+    - address_line_1
+    - address_line_2
+    - town_or_city
+    - postcode
+    - country
+    - phone_number
+    - ni_number
+    - work_location_known
+    - work_organisation_name
+    - work_address_line_1
+    - work_address_line_2
+    - work_town_or_city
+    - work_postcode
+    - organisation_address_known
+    - organisation_name
+    - organisation_address_line_1
+    - organisation_address_line_2
+    - organisation_town_or_city
+    - organisation_postcode
+    - allegation_details
+    - allegation_consideration_details
+    - previous_misconduct_details
+    - duties_details
+  :users:
+    - email
+  :staff:
+    - email
+  :feedbacks:
+    - email
+    - improvement_suggestion
diff --git a/config/analytics_pii.yml b/config/analytics_pii.yml
index 7dde5c6bc..3a42532a1 100644
--- a/config/analytics_pii.yml
+++ b/config/analytics_pii.yml
@@ -1,47 +1,2 @@
 ---
-:shared:
-  :active_storage_blobs:
-    - filename
-  :active_storage_attachments:
-    - name
-  :referrers:
-    - first_name
-    - phone
-    - last_name
-  :referrals:
-    - first_name
-    - last_name
-    - previous_name
-    - date_of_birth
-    - email_address
-    - trn
-    - address_line_1
-    - address_line_2
-    - town_or_city
-    - postcode
-    - country
-    - phone_number
-    - ni_number
-    - work_location_known
-    - work_organisation_name
-    - work_address_line_1
-    - work_address_line_2
-    - work_town_or_city
-    - work_postcode
-    - organisation_address_known
-    - organisation_name
-    - organisation_address_line_1
-    - organisation_address_line_2
-    - organisation_town_or_city
-    - organisation_postcode
-    - allegation_details
-    - allegation_consideration_details
-    - previous_misconduct_details
-    - duties_details
-  :users:
-    - email
-  :staff:
-    - email
-  :feedbacks:
-    - email
-    - improvement_suggestion
+shared: {}