From e1972e4349d86db57eca6ad5230bcc900a10935a Mon Sep 17 00:00:00 2001
From: Daniel Roth <daniel_roth@hotmail.co.uk>
Date: Fri, 8 May 2026 14:23:32 +0000
Subject: [PATCH] =?UTF-8?q?Upload=20gzip-compressed=20MagicPlan=20JSON=20t?=
 =?UTF-8?q?o=20S3=20=F0=9F=9F=AA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/magic_plan/magic_plan_service.py | 47 +++++++++++++++---------
 1 file changed, 30 insertions(+), 17 deletions(-)

diff --git a/backend/magic_plan/magic_plan_service.py b/backend/magic_plan/magic_plan_service.py
index 7860fec9..9ac17e55 100644
--- a/backend/magic_plan/magic_plan_service.py
+++ b/backend/magic_plan/magic_plan_service.py
@@ -50,25 +50,38 @@ class MagicPlanService:
         raw_bytes: bytes = self._client.get_plan_raw(matched.id)
         plan: Plan = map_plan(magic_plan)
 
-        compressed = gzip.compress(raw_bytes)
-        if uprn is not None:
-            s3_key = f"documents/uprn/{uprn}/magic_plan_{matched.id}.json.gz"
-        else:
-            s3_key = f"documents/hubspot_deal_id/{request.hubspot_deal_id}/magic_plan_{matched.id}.json.gz"
-        save_data_to_s3(compressed, self._s3_bucket, s3_key)
+        uploaded_file = self._upload_raw_plan_json(
+            plan_id=matched.id,
+            raw_bytes=raw_bytes,
+            uprn=uprn,
+            hubspot_deal_id=request.hubspot_deal_id,
+        )
 
         with db_session() as session:
             save_plan(session, plan)
-            session.add(
-                UploadedFile(
-                    s3_file_bucket=self._s3_bucket,
-                    s3_file_key=s3_key,
-                    s3_upload_timestamp=datetime.now(timezone.utc),
-                    uprn=int(uprn) if uprn is not None else None,
-                    hubspot_deal_id=request.hubspot_deal_id,
-                    file_source=FileSourceEnum.MAGIC_PLAN.value,
-                    file_type=FileTypeEnum.MAGIC_PLAN_JSON.value,
-                )
-            )
+            session.add(uploaded_file)
 
         return plan
+
+    def _upload_raw_plan_json(
+        self,
+        plan_id: str,
+        raw_bytes: bytes,
+        uprn: Optional[str],
+        hubspot_deal_id: str,
+    ) -> UploadedFile:
+        compressed = gzip.compress(raw_bytes)
+        if uprn is not None:
+            s3_key = f"documents/uprn/{uprn}/magic_plan_{plan_id}.json.gz"
+        else:
+            s3_key = f"documents/hubspot_deal_id/{hubspot_deal_id}/magic_plan_{plan_id}.json.gz"
+        save_data_to_s3(compressed, self._s3_bucket, s3_key)
+        return UploadedFile(
+            s3_file_bucket=self._s3_bucket,
+            s3_file_key=s3_key,
+            s3_upload_timestamp=datetime.now(timezone.utc),
+            uprn=int(uprn) if uprn is not None else None,
+            hubspot_deal_id=hubspot_deal_id,
+            file_source=FileSourceEnum.MAGIC_PLAN.value,
+            file_type=FileTypeEnum.MAGIC_PLAN_JSON.value,
+        )