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

added additional deal properties

Browse source
This commit is contained in:
Jun-te Kim 2026-04-20 15:23:38 +00:00
parent 2aa2e50c74
commit 42ea70e60f
4 changed files with 32 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
backend/app/db/models/hubspot_deal_data.py
View file

@ -38,6 +38,10 @@ class HubspotDealData(SQLModel, table=True):
dampmould_growth: Optional[str] = Field(default=None) dampmould_growth: Optional[str] = Field(default=None)
damp_mould_and_repairs_comments: Optional[str] = Field(default=None) damp_mould_and_repairs_comments: Optional[str] = Field(default=None)
pre_sap: Optional[str] = Field(default=None) pre_sap: Optional[str] = Field(default=None)
batch: Optional[str] = Field(default=None)
block_reference: Optional[str] = Field(default=None)
epc_prn: Optional[str] = Field(default=None)
potential_post_sap_score_dropdown: Optional[str] = Field(default=None)
coordinator: Optional[str] = Field(default=None) coordinator: Optional[str] = Field(default=None)
mtp_completion_date: Optional[datetime] = Field(default=None) mtp_completion_date: Optional[datetime] = Field(default=None)
mtp_re_model_completion_date: Optional[datetime] = Field(default=None) mtp_re_model_completion_date: Optional[datetime] = Field(default=None)

8
etl/hubspot/hubspotClient.py
View file

@ -254,12 +254,12 @@ class HubspotClient:
"sharepoint_link", "sharepoint_link",
"dampmould_growth", "dampmould_growth",
"damp_mould_and_repairs_comments", "damp_mould_and_repairs_comments",
"pre_sap", "pre_sap_score_dropdown",
"coordinator", "coordinator",
"mtp_completion_date", "mtp_completion_date",
"mtp_re_model_completion_date", "mtp_re_model_completion_date",
"ioe_v3_completion_date", "ioe_v3_completion_date",
"proposed_measures", "proposed_measures_dropdown",
"approved_package", "approved_package",
"designer", "designer",
"design_completion_date", "design_completion_date",
@ -275,6 +275,10 @@ class HubspotClient:
"confirmed_survey_time", "confirmed_survey_time",
"surveyed_date", "surveyed_date",
"design_type", "design_type",
"batch",
"block_reference",
"epc_prn",
"potential_post_sap_score_dropdown",
], ],
) )
) )

20
etl/hubspot/hubspotDataTodB.py
View file

@ -159,7 +159,13 @@ class HubspotDataToDb:
"damp_mould_and_repairs_comments": deal_data.get( "damp_mould_and_repairs_comments": deal_data.get(
"damp_mould_and_repairs_comments" "damp_mould_and_repairs_comments"
), ),
"pre_sap": deal_data.get("pre_sap"), "pre_sap": deal_data.get("pre_sap_score_dropdown"),
"batch": deal_data.get("batch"),
"block_reference": deal_data.get("block_reference"),
"epc_prn": deal_data.get("epc_prn"),
"potential_post_sap_score_dropdown": deal_data.get(
"potential_post_sap_score_dropdown"
),
"coordinator": deal_data.get("coordinator"), "coordinator": deal_data.get("coordinator"),
"mtp_completion_date": parse_hs_date(deal_data.get("mtp_completion_date")), "mtp_completion_date": parse_hs_date(deal_data.get("mtp_completion_date")),
"mtp_re_model_completion_date": parse_hs_date( "mtp_re_model_completion_date": parse_hs_date(
@ -168,7 +174,7 @@ class HubspotDataToDb:
"ioe_v3_completion_date": parse_hs_date( "ioe_v3_completion_date": parse_hs_date(
deal_data.get("ioe_v3_completion_date") deal_data.get("ioe_v3_completion_date")
), ),
"proposed_measures": deal_data.get("proposed_measures"), "proposed_measures": deal_data.get("proposed_measures_dropdown"),
"approved_package": deal_data.get("approved_package"), "approved_package": deal_data.get("approved_package"),
"designer": deal_data.get("designer"), "designer": deal_data.get("designer"),
"design_completion_date": parse_hs_date( "design_completion_date": parse_hs_date(
@ -228,7 +234,13 @@ class HubspotDataToDb:
damp_mould_and_repairs_comments=deal_data.get( damp_mould_and_repairs_comments=deal_data.get(
"damp_mould_and_repairs_comments" "damp_mould_and_repairs_comments"
), ),
pre_sap=deal_data.get("pre_sap"), pre_sap=deal_data.get("pre_sap_score_dropdown"),
batch=deal_data.get("batch"),
block_reference=deal_data.get("block_reference"),
epc_prn=deal_data.get("epc_prn"),
potential_post_sap_score_dropdown=deal_data.get(
"potential_post_sap_score_dropdown"
),
coordinator=deal_data.get("coordinator"), coordinator=deal_data.get("coordinator"),
mtp_completion_date=parse_hs_date(deal_data.get("mtp_completion_date")), mtp_completion_date=parse_hs_date(deal_data.get("mtp_completion_date")),
mtp_re_model_completion_date=parse_hs_date( mtp_re_model_completion_date=parse_hs_date(
@ -237,7 +249,7 @@ class HubspotDataToDb:
ioe_v3_completion_date=parse_hs_date( ioe_v3_completion_date=parse_hs_date(
deal_data.get("ioe_v3_completion_date") deal_data.get("ioe_v3_completion_date")
), ),
proposed_measures=deal_data.get("proposed_measures"), proposed_measures=deal_data.get("proposed_measures_dropdown"),
approved_package=deal_data.get("approved_package"), approved_package=deal_data.get("approved_package"),
designer=deal_data.get("designer"), designer=deal_data.get("designer"),
design_completion_date=parse_hs_date( design_completion_date=parse_hs_date(

8
etl/hubspot/hubspot_deal_differ.py
View file

@ -62,9 +62,13 @@ class HubspotDealDiffer:
"sharepoint_link": "sharepoint_link", "sharepoint_link": "sharepoint_link",
"dampmould_growth": "dampmould_growth", "dampmould_growth": "dampmould_growth",
"damp_mould_and_repairs_comments": "damp_mould_and_repairs_comments", "damp_mould_and_repairs_comments": "damp_mould_and_repairs_comments",
"pre_sap": "pre_sap", "pre_sap_score_dropdown": "pre_sap",
"batch": "batch",
"block_reference": "block_reference",
"epc_prn": "epc_prn",
"potential_post_sap_score_dropdown": "potential_post_sap_score_dropdown",
"coordinator": "coordinator", "coordinator": "coordinator",
"proposed_measures": "proposed_measures", "proposed_measures_dropdown": "proposed_measures",
"approved_package": "approved_package", "approved_package": "approved_package",
"designer": "designer", "designer": "designer",
"actual_measures_installed": "actual_measures_installed", "actual_measures_installed": "actual_measures_installed",