From 6ce81d735a7d91abb49dbe26db26fa9a06fed077 Mon Sep 17 00:00:00 2001
From: David Young <david@dcyoung.dev>
Date: Wed, 8 Jan 2025 09:28:43 +0000
Subject: [PATCH 1/3] Updated Analytics data fields

Moved `application_forms.first_name` from `blocklist` to `hidden_pii`
Moved `application_forms.last_name` from `blocklist` to `hidden_pii`
Moved `candidates.email_address` from `blocklist` to `hidden_pii`
---
 config/analytics_blocklist.yml  | 3 ---
 config/analytics_hidden_pii.yml | 3 +++
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/config/analytics_blocklist.yml b/config/analytics_blocklist.yml
index c29aabaa30b..f0d64a374f1 100644
--- a/config/analytics_blocklist.yml
+++ b/config/analytics_blocklist.yml
@@ -218,8 +218,6 @@
   - safeguarding_concerns
   - relationship_correction
   :application_forms:
-  - first_name
-  - last_name
   - phone_number
   - address_line1
   - address_line2
@@ -249,7 +247,6 @@
   - created_at
   - updated_at
   :candidates:
-  - email_address
   - magic_link_token
   - fraud_match_id
   - unsubscribed_from_emails
diff --git a/config/analytics_hidden_pii.yml b/config/analytics_hidden_pii.yml
index 8034e382dda..563b09bd18b 100644
--- a/config/analytics_hidden_pii.yml
+++ b/config/analytics_hidden_pii.yml
@@ -3,8 +3,11 @@ shared:
   application_forms:
     - support_reference
     - candidate_id
+    - first_name
+    - last_name
   candidates:
     - id
+    - email_address
   provider_users:
     - dfe_sign_in_uid
   validation_errors:

From 4892b8124b436e7eefd333afb6925cc5f51036a7 Mon Sep 17 00:00:00 2001
From: David Young <david@dcyoung.dev>
Date: Wed, 8 Jan 2025 09:57:53 +0000
Subject: [PATCH 2/3] Moved attributes to `analytics`

---
 config/analytics.yml            | 3 +++
 config/analytics_hidden_pii.yml | 3 ---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/config/analytics.yml b/config/analytics.yml
index 1c661b90467..1a7c2352cd9 100644
--- a/config/analytics.yml
+++ b/config/analytics.yml
@@ -10,6 +10,7 @@ shared:
     - magic_link_token_sent_at
     - sign_up_email_bounced
     - updated_at
+    - email_address
   one_login_auths:
     - id
     - candidate_id
@@ -91,6 +92,8 @@ shared:
     - path
     - updated_at
   application_forms:
+    - first_name
+    - last_name
     - adviser_status
     - becoming_a_teacher
     - becoming_a_teacher_completed
diff --git a/config/analytics_hidden_pii.yml b/config/analytics_hidden_pii.yml
index 563b09bd18b..8034e382dda 100644
--- a/config/analytics_hidden_pii.yml
+++ b/config/analytics_hidden_pii.yml
@@ -3,11 +3,8 @@ shared:
   application_forms:
     - support_reference
     - candidate_id
-    - first_name
-    - last_name
   candidates:
     - id
-    - email_address
   provider_users:
     - dfe_sign_in_uid
   validation_errors:

From 20a2d3f8ec991c8c683b63ff7f851730d345f02d Mon Sep 17 00:00:00 2001
From: David Young <david@dcyoung.dev>
Date: Wed, 8 Jan 2025 10:10:14 +0000
Subject: [PATCH 3/3] Adds the fields to hidden pii yml

---
 config/analytics_hidden_pii.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/config/analytics_hidden_pii.yml b/config/analytics_hidden_pii.yml
index 8034e382dda..563b09bd18b 100644
--- a/config/analytics_hidden_pii.yml
+++ b/config/analytics_hidden_pii.yml
@@ -3,8 +3,11 @@ shared:
   application_forms:
     - support_reference
     - candidate_id
+    - first_name
+    - last_name
   candidates:
     - id
+    - email_address
   provider_users:
     - dfe_sign_in_uid
   validation_errors: