junte/Model
1
0
Fork 0
mirror of https://github.com/Hestia-Homes/Model.git synced 2026-06-08 11:17:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

corrections to get data into s3

Browse source
This commit is contained in:
Daniel Roth 2026-03-26 17:16:08 +00:00
parent 4a4099901f
commit a989700c9e
2 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
backend/app/config.py
View file

@ -65,6 +65,15 @@ class Settings(BaseSettings):
ORDNANCE_SURVEY_API_KEY: str = "changeme" 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) # Optional AWS creds (only required in local)
AWS_ACCESS_KEY_ID: Optional[str] = None AWS_ACCESS_KEY_ID: Optional[str] = None
AWS_SECRET_KEY_ID: Optional[str] = None AWS_SECRET_KEY_ID: Optional[str] = None

9
backend/pashub_fetcher/handler/handler.py
View file

@ -3,7 +3,6 @@ import re
from typing import Any, Dict, List, Mapping, Optional from typing import Any, Dict, List, Mapping, Optional
from openpyxl import load_workbook from openpyxl import load_workbook
from backend.app.config import get_settings
from backend.pashub_fetcher.job import Job from backend.pashub_fetcher.job import Job
from backend.pashub_fetcher.pashub_client import PashubClient, UnauthorizedError from backend.pashub_fetcher.pashub_client import PashubClient, UnauthorizedError
from backend.pashub_fetcher.sharepoint_subfolders import SharepointSubfolders 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: 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: for file_path in job_files:
filename = os.path.basename(file_path) 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) 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: if uprn:
logger.info("Uploading files to s3")
upload_job_to_s3(job_files, uprn) upload_job_to_s3(job_files, uprn)
upload_job_to_sharepoint(sharepoint_client, base_path, job, job_files)
return job_files return job_files