diff --git a/backend/pashub_fetcher/The_Guinness_Partnership_AtkinsR_alis_Coordination_Design_Board_1774881298.xlsx b/backend/pashub_fetcher/The_Guinness_Partnership_AtkinsR_alis_Coordination_Design_Board_1774881298.xlsx new file mode 100644 index 00000000..a6478e3b Binary files /dev/null and b/backend/pashub_fetcher/The_Guinness_Partnership_AtkinsR_alis_Coordination_Design_Board_1774881298.xlsx differ diff --git a/backend/pashub_fetcher/handler/handler.py b/backend/pashub_fetcher/handler/handler.py index be8131bf..a27f49bc 100644 --- a/backend/pashub_fetcher/handler/handler.py +++ b/backend/pashub_fetcher/handler/handler.py @@ -26,7 +26,8 @@ logger = setup_logger() def extract_jobs(filepath: str) -> List[Job]: wb = load_workbook(filepath, data_only=True) - ws = wb["watford warm homes (wave 3) mai"] + # ws = wb["watford warm homes (wave 3) mai"] + ws = wb["filtered"] HEADER_ROW = 3 @@ -37,7 +38,8 @@ def extract_jobs(filepath: str) -> List[Job]: headers[value.strip()] = col name_col = headers["Name"] - link_col = headers["Pashub Link"] + # link_col = headers["Pashub Link"] + link_col = headers["PasHub Link"] jobs: List[Job] = [] @@ -148,8 +150,6 @@ def process_job( logger.info("Uploading files to s3") upload_job_to_s3_and_update_db(job_files, uprn) - # add record of new file in db - upload_job_to_sharepoint(sharepoint_client, base_path, job, job_files) return job_files @@ -159,7 +159,11 @@ def handler(event: Mapping[str, Any], context: Any) -> None: settings = get_settings() BASE_DIR = os.path.dirname(os.path.dirname(__file__)) - filepath = os.path.join(BASE_DIR, "Watford_Warm_Homes_Wave_3_RA Downloads .xlsx") + # filepath = os.path.join(BASE_DIR, "Watford_Warm_Homes_Wave_3_RA Downloads .xlsx") + filepath = os.path.join( + BASE_DIR, + "The_Guinness_Partnership_AtkinsR_alis_Coordination_Design_Board_1774881298.xlsx", + ) jobs: List[Job] = extract_jobs(filepath) logger.info("Successfully loaded jobs from spreadsheet") diff --git a/backend/pashub_fetcher/pashub_to_ara_trigger_request.py b/backend/pashub_fetcher/pashub_to_ara_trigger_request.py index ae165158..2e4f8380 100644 --- a/backend/pashub_fetcher/pashub_to_ara_trigger_request.py +++ b/backend/pashub_fetcher/pashub_to_ara_trigger_request.py @@ -1,5 +1,4 @@ from typing import Optional - from pydantic import BaseModel