diff --git a/backend/address2UPRN/README.md b/backend/address2UPRN/README.md index b17b36d1..6b0fc753 100644 --- a/backend/address2UPRN/README.md +++ b/backend/address2UPRN/README.md @@ -52,9 +52,9 @@ I uploaded the missing uprn here: s3://retrofit-data-dev/ara_raw_inputs/calico/m ordnance_survey sqs is => https://eu-west-2.console.aws.amazon.com/sqs/v3/home?region=eu-west-2#/queues/https%3A%2F%2Fsqs.eu-west-2.amazonaws.com%2F337213553626%2FordnanceSurvey-queue-dev { - "s3_uri": "s3://retrofit-data-dev/ara_raw_inputs/calico/missinguprn.csv", - "task_id": "a7b70a02-4df4-45b5-a50b-196e095910bb", - "sub_task_id": "567cf73b-1210-4909-9ecc-36ae7e23420e" + "s3_uri": "s3://retrofit-data-dev/ara_raw_inputs/eon/beyond_housing/Book(Sheet1).csv", + "task_id": "ccdec0d1-ebf3-484f-b2ae-397200dd25da", + "sub_task_id": "569d41f6-45cd-4e64-a586-eb8c2097375d" } diff --git a/backend/app/db/models/organisation.py b/backend/app/db/models/organisation.py index cc3ef2bc..784cc4ad 100644 --- a/backend/app/db/models/organisation.py +++ b/backend/app/db/models/organisation.py @@ -38,6 +38,7 @@ class HubspotDealData(SQLModel, table=True): major_condition_issue_evidence_s3_url: Optional[str] = Field(default=None) coordination_status: Optional[str] = Field(default=None) + coordination_comments: Optional[str] = Field(default=None) design_status: Optional[str] = Field(default=None) listing_id: Optional[str] = Field(default=None) diff --git a/etl/hubspot/hubspotClient.py b/etl/hubspot/hubspotClient.py index cedaa7f3..8053b41f 100644 --- a/etl/hubspot/hubspotClient.py +++ b/etl/hubspot/hubspotClient.py @@ -246,6 +246,7 @@ class HubspotClient: "major_condition_issue_description", "major_condition_issue_photos", "coordination_status__stage_1_", + "coordination_comments", "retrofit_design_status", "pashub_link", "sharepoint_link", diff --git a/etl/hubspot/hubspotDataTodB.py b/etl/hubspot/hubspotDataTodB.py index 1c4b6b54..3c017f0e 100644 --- a/etl/hubspot/hubspotDataTodB.py +++ b/etl/hubspot/hubspotDataTodB.py @@ -2,7 +2,7 @@ from backend.app.db.connection import db_read_session from backend.app.db.models.organisation import Organisation, HubspotDealData from sqlmodel import select from datetime import datetime, timezone -from typing import Dict, Optional, Tuple +from typing import Dict, Optional from etl.hubspot.company_data import CompanyData from etl.hubspot.hubspotClient import HubspotClient from etl.hubspot.s3_uploader import S3Uploader @@ -250,6 +250,11 @@ class HubspotDataToDb: == hs_deal.get("coordination_status__stage_1_"), "coordination stage 1 status mismatch", ), + soft_assert( + deal_in_db.coordination_comments + == hs_deal.get("coordination_comments"), + "coordination_comments mismatch", + ), soft_assert( deal_in_db.design_status == hs_deal.get("retrofit_design_status"), "retrofit design mismatch", @@ -404,6 +409,7 @@ class HubspotDataToDb: ), "coordination_status": deal_data.get("coordination_status__stage_1_"), "design_status": deal_data.get("retrofit_design_status"), + "coordination_comments": deal_data.get("coordination_comments"), "pashub_link": deal_data.get("pashub_link"), "sharepoint_link": deal_data.get("sharepoint_link"), "dampmould_growth": deal_data.get("dampmould_growth"), @@ -474,6 +480,7 @@ class HubspotDataToDb: major_condition_issue_photos=deal_data.get("major_condition_issue_photos"), coordination_status=deal_data.get("coordination_status__stage_1_"), design_status=deal_data.get("retrofit_design_status"), + coordination_comments=deal_data.get("coordination_comments"), pashub_link=deal_data.get("pashub_link"), sharepoint_link=deal_data.get("sharepoint_link"), dampmould_growth=deal_data.get("dampmould_growth"), diff --git a/sfr/principal_pitch/2_export_data.py b/sfr/principal_pitch/2_export_data.py index 3baa7a44..7c80f4dc 100644 --- a/sfr/principal_pitch/2_export_data.py +++ b/sfr/principal_pitch/2_export_data.py @@ -26,13 +26,13 @@ from backend.app.db.functions.materials_functions import get_materials from collections import defaultdict from sqlalchemy import func -PORTFOLIO_ID = 656 -SCENARIOS = [1177] +PORTFOLIO_ID = 632 +SCENARIOS = [1144] scenario_names = { - 1177: "EPC C; Proposed Measures", + 1144: "EPC C", } -project_name = "Walsall Council | WH:LG" +project_name = "Calico Project" def get_data(portfolio_id, scenario_ids):