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 pull request #981 from Hestia-Homes/feature/pashub-to-ara

Browse source 
PasHub to Ara: trigger on new deal with pashub_link, and decorate with task handler
This commit is contained in:
Daniel Roth 2026-04-14 11:16:37 +01:00 • committed by GitHub
commit 098dc56298
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 32 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -20,6 +20,7 @@ from backend.pashub_fetcher.pashub_to_ara_trigger_request import (
) )
from backend.pashub_fetcher.sharepoint_subfolders import SharepointSubfolders from backend.pashub_fetcher.sharepoint_subfolders import SharepointSubfolders
from backend.pashub_fetcher.token_getter import get_token_from_local_storage from backend.pashub_fetcher.token_getter import get_token_from_local_storage
from backend.utils.subtasks import task_handler
from utils.logger import setup_logger from utils.logger import setup_logger
from utils.s3 import upload_file_to_s3 from utils.s3 import upload_file_to_s3
from utils.sharepoint.domna_sharepoint_client import DomnaSharepointClient from utils.sharepoint.domna_sharepoint_client import DomnaSharepointClient
@ -165,6 +166,7 @@ def process_job(
return job_files return job_files
@task_handler()
def handler(event: Mapping[str, Any], context: Any) -> None: def handler(event: Mapping[str, Any], context: Any) -> None:
logger.info("Received message") logger.info("Received message")
logger.info(f"Number of events: {len(event.get('Records', []))}") logger.info(f"Number of events: {len(event.get('Records', []))}")

48
etl/hubspot/scripts/scraper/main.py
View file

@ -22,7 +22,6 @@ def handler(body: dict[str, Any], context: Any) -> None:
hubspot_client = HubspotClient() hubspot_client = HubspotClient()
sqs_client = boto3.client("sqs") sqs_client = boto3.client("sqs")
PASHUB_TRIGGER_QUEUE_URL = get_settings().PASHUB_TO_ARA_SQS_URL
payload = HubspotTriggerOrchestratorTriggerRequest.model_validate(body) payload = HubspotTriggerOrchestratorTriggerRequest.model_validate(body)
hubspot_deal_id: str = payload.hubspot_deal_id hubspot_deal_id: str = payload.hubspot_deal_id
@ -41,7 +40,6 @@ def handler(body: dict[str, Any], context: Any) -> None:
deal_changed = False deal_changed = False
if not db_deal: if not db_deal:
# New hubspot deal, no diffing to do
logger.info(f"New HubSpot deal of ID {hubspot_deal_id}. Loading to database...") logger.info(f"New HubSpot deal of ID {hubspot_deal_id}. Loading to database...")
if company: if company:
company_data: CompanyData = hubspot_client.get_company_information(company) company_data: CompanyData = hubspot_client.get_company_information(company)
@ -49,6 +47,15 @@ def handler(body: dict[str, Any], context: Any) -> None:
db_client.upsert_organisation(company_data) db_client.upsert_organisation(company_data)
db_client.upsert_deal(hubspot_deal, company, listing, hubspot_client) db_client.upsert_deal(hubspot_deal, company, listing, hubspot_client)
# ==============================
# Orchestration of other lambdas
# ==============================
if hubspot_deal["pashub_link"]:
logger.info(
f"Triggering Pas Hub file fetcher for HubSpot deal ID {hubspot_deal_id}"
)
_trigger_pashub_fetcher(sqs_client, hubspot_deal)
else: else:
# Deal already in db, check whether anything has changed # Deal already in db, check whether anything has changed
logger.info( logger.info(
@ -84,22 +91,7 @@ def handler(body: dict[str, Any], context: Any) -> None:
logger.info( logger.info(
f"Triggering Pas Hub file fetcher for HubSpot deal ID {hubspot_deal_id}" f"Triggering Pas Hub file fetcher for HubSpot deal ID {hubspot_deal_id}"
) )
message_body: Dict[str, Optional[str]] = { _trigger_pashub_fetcher(sqs_client, hubspot_deal)
"pashub_link": hubspot_deal["pashub_link"],
"address": None, # potentially available from Listing, leave as None for now
"sharepoint_link": hubspot_deal["sharepoint_link"],
"uprn": hubspot_deal["national_uprn"],
"landlord_property_id": hubspot_deal["owner_property_id"],
"deal_stage": hubspot_deal["deal_stage"],
}
response = sqs_client.send_message(
QueueUrl=PASHUB_TRIGGER_QUEUE_URL, MessageBody=json.dumps(message_body)
)
logger.info(
f"Sent message to Pashub To Ara queue. MessageId: {response['MessageId']}"
)
else: else:
logger.info( logger.info(
f"Not Triggering PasHub file fetcher for HubSpot deal ID {hubspot_deal_id}" f"Not Triggering PasHub file fetcher for HubSpot deal ID {hubspot_deal_id}"
@ -108,6 +100,26 @@ def handler(body: dict[str, Any], context: Any) -> None:
print("done") print("done")
def _trigger_pashub_fetcher(sqs_client: Any, hubspot_deal: Dict[str, str]) -> None:
message_body: Dict[str, Optional[str]] = {
"pashub_link": hubspot_deal["pashub_link"],
"address": None, # potentially available from Listing, leave as None for now
"sharepoint_link": hubspot_deal["sharepoint_link"],
"uprn": hubspot_deal["national_uprn"],
"landlord_property_id": hubspot_deal["owner_property_id"],
"deal_stage": hubspot_deal["deal_stage"],
}
response = sqs_client.send_message(
QueueUrl=get_settings().PASHUB_TO_ARA_SQS_URL,
MessageBody=json.dumps(message_body),
)
logger.info(
f"Sent message to Pashub To Ara queue. MessageId: {response['MessageId']}"
)
if __name__ == "__main__": if __name__ == "__main__":
handler({"hubspot_deal_id": "371470706915"}, "") handler({"hubspot_deal_id": "371470706915"}, "")
print("beep") print("beep")