From a989700c9e7aeb869f607d296ddea73a457449f2 Mon Sep 17 00:00:00 2001
From: Daniel Roth <daniel_roth@hotmail.co.uk>
Date: Thu, 26 Mar 2026 17:16:08 +0000
Subject: [PATCH] corrections to get data into s3

---
 backend/app/config.py                     | 9 +++++++++
 backend/pashub_fetcher/handler/handler.py | 9 +++++----
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/backend/app/config.py b/backend/app/config.py
index 6604fec9..8a9260c0 100644
--- a/backend/app/config.py
+++ b/backend/app/config.py
@@ -65,6 +65,15 @@ class Settings(BaseSettings):
 
     ORDNANCE_SURVEY_API_KEY: str = "changeme"
 
+    # Sharepoint
+    SHAREPOINT_CLIENT_ID: str = "changeme"
+    SHAREPOINT_CLIENT_SECRET: str = "changeme"
+    SHAREPOINT_TENANT_ID: str = "changeme"
+    DOMNA_SHAREPOINT_ID: str = "changeme"
+    OSMOSIS_ACD_SHAREPOINT_ID: str = "changeme"
+    PRIVATE_PAY_SHAREPOINT_ID: str = "changeme"
+    SOCIAL_HOUSING_WAVE_3_SHAREPOINT_ID: str = "changeme"
+
     # Optional AWS creds (only required in local)
     AWS_ACCESS_KEY_ID: Optional[str] = None
     AWS_SECRET_KEY_ID: Optional[str] = None
diff --git a/backend/pashub_fetcher/handler/handler.py b/backend/pashub_fetcher/handler/handler.py
index 45ca74e3..6fa2a909 100644
--- a/backend/pashub_fetcher/handler/handler.py
+++ b/backend/pashub_fetcher/handler/handler.py
@@ -3,7 +3,6 @@ import re
 from typing import Any, Dict, List, Mapping, Optional
 from openpyxl import load_workbook
 
-from backend.app.config import get_settings
 from backend.pashub_fetcher.job import Job
 from backend.pashub_fetcher.pashub_client import PashubClient, UnauthorizedError
 from backend.pashub_fetcher.sharepoint_subfolders import SharepointSubfolders
@@ -90,9 +89,9 @@ def upload_job_to_sharepoint(
 
 
 def upload_job_to_s3(job_files: List[str], uprn: str) -> None:
-    bucket = get_settings().DATA_BUCKET
+    bucket = "retrofit-energy-assessments-dev"  # TODO: create new bucket
 
-    base_path = f"uprn/{uprn}"
+    base_path = f"documents/uprn/{uprn}"
 
     for file_path in job_files:
         filename = os.path.basename(file_path)
@@ -119,10 +118,12 @@ def process_job(
 
     job_files: List[str] = pashub_client.get_core_evidence_files_by_job_id(job_id)
 
-    upload_job_to_sharepoint(sharepoint_client, base_path, job, job_files)
     if uprn:
+        logger.info("Uploading files to s3")
         upload_job_to_s3(job_files, uprn)
 
+    upload_job_to_sharepoint(sharepoint_client, base_path, job, job_files)
+
     return job_files