diff --git a/backend/pashub_fetcher/pashub_client.py b/backend/pashub_fetcher/pashub_client.py index 7896664d..27342c25 100644 --- a/backend/pashub_fetcher/pashub_client.py +++ b/backend/pashub_fetcher/pashub_client.py @@ -74,6 +74,10 @@ class PashubClient: logger.info(f"Getting UPRN for job ID {job_id}") url = f"{self.base}/jobs/{job_id}" + logger.debug( + f"About to make API request with session headers: { self.session.headers}" + ) + r = self.session.get(url) if r.status_code == 401: raise UnauthorizedError("Token expired or invalid") @@ -82,7 +86,8 @@ class PashubClient: try: return r.json()["uprn"] - except Exception: + except Exception as e: + logger.warning(f"Failed to get UPRN for Job ID {job_id}", e) return None def _select_latest_core_files( diff --git a/backend/pashub_fetcher/pashub_to_ara_trigger_request.py b/backend/pashub_fetcher/pashub_to_ara_trigger_request.py index 2e077c2e..715a09f8 100644 --- a/backend/pashub_fetcher/pashub_to_ara_trigger_request.py +++ b/backend/pashub_fetcher/pashub_to_ara_trigger_request.py @@ -4,9 +4,7 @@ from pydantic import BaseModel class PashubToAraTriggerRequest(BaseModel): - pashub_link: ( - str # e.g. https://pashub.net/jobs/{id}/details, /jobs/{id}/evidence/view, /jobs/{id} - ) + pashub_link: str # e.g. https://pashub.net/jobs/{id}/details, /jobs/{id}/evidence/view, /jobs/{id} address: Optional[str] = None sharepoint_link: Optional[str] = None diff --git a/backend/pashub_fetcher/trigger_pashub_sqs_from_file.py b/backend/pashub_fetcher/trigger_pashub_sqs_from_file.py index 24a29781..f4c03afc 100644 --- a/backend/pashub_fetcher/trigger_pashub_sqs_from_file.py +++ b/backend/pashub_fetcher/trigger_pashub_sqs_from_file.py @@ -14,7 +14,36 @@ from backend.pashub_fetcher.pashub_to_ara_trigger_request import ( logging.basicConfig(level=logging.INFO, format="%(message)s") logger: logging.Logger = logging.getLogger(__name__) -DRY_RUN: bool = True +DRY_RUN: bool = False + +DEAL_ID_FILTER: frozenset[str] = frozenset( + { + "379452094688", + "379466504437", + "379660170452", + "380016925932", + "379848065216", + "379466504434", + "379452094690", + "379965924567", + "380016925923", + "379792072898", + "379654754502", + "379560262861", + "379969670369", + "379248717001", + "379971468493", + "379999888607", + "379606372580", + "379969603797", + "379967743213", + "379263155434", + "379855267025", + "379889899719", + "379071064307", + "379867925741", + } +) EXCEL_PATH: str = os.path.join( os.path.dirname(__file__), @@ -75,6 +104,11 @@ def _build_requests(excel_path: str) -> list[PashubToAraTriggerRequest]: def main() -> None: trigger_requests: list[PashubToAraTriggerRequest] = _build_requests(EXCEL_PATH) + if DEAL_ID_FILTER: + trigger_requests = [ + r for r in trigger_requests if r.hubspot_deal_id in DEAL_ID_FILTER + ] + sqs: Any = cast(Any, boto3.client("sqs")) # type: ignore[reportUnknownMemberType] queue_url: str = get_settings().PASHUB_TO_ARA_SQS_URL