From f1be77a0788fc35b557a4ee6432c2e725ceab0ab Mon Sep 17 00:00:00 2001
From: Iain McNulty <iain.mcnulty@education.gov.uk>
Date: Mon, 7 Oct 2024 14:16:41 +0100
Subject: [PATCH 1/2] Ignore the international column on
 application_qualifications

  This column is scheduled for removal
---
 app/models/application_qualification.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/models/application_qualification.rb b/app/models/application_qualification.rb
index ec4fdc2ea2a..7795d6ca5b3 100644
--- a/app/models/application_qualification.rb
+++ b/app/models/application_qualification.rb
@@ -1,6 +1,7 @@
 class ApplicationQualification < ApplicationRecord
   include TouchApplicationChoices
   include TouchApplicationFormState
+  self.ignored_columns += [:international]
 
   EXPECTED_DEGREE_DATA = %i[
     qualification_type

From 468d014578741f6f180edd5357bac13e0595cf73 Mon Sep 17 00:00:00 2001
From: Iain McNulty <iain.mcnulty@education.gov.uk>
Date: Mon, 7 Oct 2024 14:20:50 +0100
Subject: [PATCH 2/2] Regenerate analytics blocklist

---
 config/analytics.yml           |  1 -
 config/analytics_blocklist.yml | 47 ++++++++++++++++------------------
 2 files changed, 22 insertions(+), 26 deletions(-)

diff --git a/config/analytics.yml b/config/analytics.yml
index 6513c171140..6ca87a98ff1 100644
--- a/config/analytics.yml
+++ b/config/analytics.yml
@@ -168,7 +168,6 @@ shared:
     - institution_country
     - institution_hesa_code
     - institution_name
-    - international
     - level
     - not_completed_explanation
     - non_uk_qualification_type
diff --git a/config/analytics_blocklist.yml b/config/analytics_blocklist.yml
index a485a9956a3..594800805cb 100644
--- a/config/analytics_blocklist.yml
+++ b/config/analytics_blocklist.yml
@@ -16,28 +16,6 @@
   - remote_address
   - request_uuid
   - created_at
-  :active_storage_variant_records:
-  - id
-  - blob_id
-  - variation_digest
-  - created_at
-  :active_storage_blobs:
-  - id
-  - key
-  - filename
-  - content_type
-  - metadata
-  - service_name
-  - byte_size
-  - checksum
-  - created_at
-  :active_storage_attachments:
-  - id
-  - name
-  - record_type
-  - record_id
-  - blob_id
-  - created_at
   :blazer_queries:
   - id
   - creator_id
@@ -81,6 +59,28 @@
   - statement
   - data_source
   - created_at
+  :active_storage_variant_records:
+  - id
+  - blob_id
+  - variation_digest
+  - created_at
+  :active_storage_attachments:
+  - id
+  - name
+  - record_type
+  - record_id
+  - blob_id
+  - created_at
+  :active_storage_blobs:
+  - id
+  - key
+  - filename
+  - content_type
+  - metadata
+  - service_name
+  - byte_size
+  - checksum
+  - created_at
   :monthly_statistics_reports:
   - id
   - created_at
@@ -175,7 +175,6 @@
   :data_exports:
   - id
   - name
-  - data
   - completed_at
   - initiator_type
   - initiator_id
@@ -216,8 +215,6 @@
   :application_choices:
   - provider_ids
   - current_recruitment_cycle_year
-  - decline_by_default_at
-  - decline_by_default_days
   :site_settings:
   - id
   - name