junte/Model
1
0
Fork 0
mirror of https://github.com/Hestia-Homes/Model.git synced 2026-06-30 13:10:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'main' into feature/hubspot-trigger-orchestrator

Browse source
This commit is contained in:
Daniel Roth 2026-04-09 10:37:37 +00:00
commit ba0e82da0d
5 changed files with 17 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
backend/address2UPRN/README.md
View file

@ -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 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", "s3_uri": "s3://retrofit-data-dev/ara_raw_inputs/eon/beyond_housing/Book(Sheet1).csv",
"task_id": "a7b70a02-4df4-45b5-a50b-196e095910bb", "task_id": "ccdec0d1-ebf3-484f-b2ae-397200dd25da",
"sub_task_id": "567cf73b-1210-4909-9ecc-36ae7e23420e" "sub_task_id": "569d41f6-45cd-4e64-a586-eb8c2097375d"
} }

1
backend/app/db/models/organisation.py
View file

@ -38,6 +38,7 @@ class HubspotDealData(SQLModel, table=True):
major_condition_issue_evidence_s3_url: Optional[str] = Field(default=None) major_condition_issue_evidence_s3_url: Optional[str] = Field(default=None)
coordination_status: 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) design_status: Optional[str] = Field(default=None)
listing_id: Optional[str] = Field(default=None) listing_id: Optional[str] = Field(default=None)

1
etl/hubspot/hubspotClient.py
View file

@ -246,6 +246,7 @@ class HubspotClient:
"major_condition_issue_description", "major_condition_issue_description",
"major_condition_issue_photos", "major_condition_issue_photos",
"coordination_status__stage_1_", "coordination_status__stage_1_",
"coordination_comments",
"retrofit_design_status", "retrofit_design_status",
"pashub_link", "pashub_link",
"sharepoint_link", "sharepoint_link",

9
etl/hubspot/hubspotDataTodB.py
View file

@ -2,7 +2,7 @@ from backend.app.db.connection import db_read_session
from backend.app.db.models.organisation import Organisation, HubspotDealData from backend.app.db.models.organisation import Organisation, HubspotDealData
from sqlmodel import select from sqlmodel import select
from datetime import datetime, timezone 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.company_data import CompanyData
from etl.hubspot.hubspotClient import HubspotClient from etl.hubspot.hubspotClient import HubspotClient
from etl.hubspot.s3_uploader import S3Uploader from etl.hubspot.s3_uploader import S3Uploader
@ -250,6 +250,11 @@ class HubspotDataToDb:
== hs_deal.get("coordination_status__stage_1_"), == hs_deal.get("coordination_status__stage_1_"),
"coordination stage 1 status mismatch", "coordination stage 1 status mismatch",
), ),
soft_assert(
deal_in_db.coordination_comments
== hs_deal.get("coordination_comments"),
"coordination_comments mismatch",
),
soft_assert( soft_assert(
deal_in_db.design_status == hs_deal.get("retrofit_design_status"), deal_in_db.design_status == hs_deal.get("retrofit_design_status"),
"retrofit design mismatch", "retrofit design mismatch",
@ -404,6 +409,7 @@ class HubspotDataToDb:
), ),
"coordination_status": deal_data.get("coordination_status__stage_1_"), "coordination_status": deal_data.get("coordination_status__stage_1_"),
"design_status": deal_data.get("retrofit_design_status"), "design_status": deal_data.get("retrofit_design_status"),
"coordination_comments": deal_data.get("coordination_comments"),
"pashub_link": deal_data.get("pashub_link"), "pashub_link": deal_data.get("pashub_link"),
"sharepoint_link": deal_data.get("sharepoint_link"), "sharepoint_link": deal_data.get("sharepoint_link"),
"dampmould_growth": deal_data.get("dampmould_growth"), "dampmould_growth": deal_data.get("dampmould_growth"),
@ -474,6 +480,7 @@ class HubspotDataToDb:
major_condition_issue_photos=deal_data.get("major_condition_issue_photos"), major_condition_issue_photos=deal_data.get("major_condition_issue_photos"),
coordination_status=deal_data.get("coordination_status__stage_1_"), coordination_status=deal_data.get("coordination_status__stage_1_"),
design_status=deal_data.get("retrofit_design_status"), design_status=deal_data.get("retrofit_design_status"),
coordination_comments=deal_data.get("coordination_comments"),
pashub_link=deal_data.get("pashub_link"), pashub_link=deal_data.get("pashub_link"),
sharepoint_link=deal_data.get("sharepoint_link"), sharepoint_link=deal_data.get("sharepoint_link"),
dampmould_growth=deal_data.get("dampmould_growth"), dampmould_growth=deal_data.get("dampmould_growth"),

8
sfr/principal_pitch/2_export_data.py
View file

@ -26,13 +26,13 @@ from backend.app.db.functions.materials_functions import get_materials
from collections import defaultdict from collections import defaultdict
from sqlalchemy import func from sqlalchemy import func
PORTFOLIO_ID = 656 PORTFOLIO_ID = 632
SCENARIOS = [1177] SCENARIOS = [1144]
scenario_names = { 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): def get_data(portfolio_id, scenario_ids):