diff --git a/backend/app/bulk_uploads/router.py b/backend/app/bulk_uploads/router.py index ca1e7b79..8f0c751f 100644 --- a/backend/app/bulk_uploads/router.py +++ b/backend/app/bulk_uploads/router.py @@ -8,7 +8,6 @@ from backend.app.config import get_settings from backend.app.db.connection import get_db_session from backend.app.db.models.bulk_address_uploads import BulkAddressUpload from backend.app.bulk_uploads.schema import PostcodeSplitterTriggerRequest -from utils.s3 import parse_s3_uri, read_csv_from_s3 router = APIRouter( diff --git a/etl/hubspot/hubspot_deal_differ.py b/etl/hubspot/hubspot_deal_differ.py index 80c1fe04..fa5bbe42 100644 --- a/etl/hubspot/hubspot_deal_differ.py +++ b/etl/hubspot/hubspot_deal_differ.py @@ -166,7 +166,7 @@ class HubspotDealDiffer: @staticmethod def _design_completed(new_deal: Dict[str, str], old_deal: HubspotDealData) -> bool: - new_status: str = new_deal.get("coordination_status") or "" + new_status: str = new_deal.get("design_status") or "" return ( new_status != "" and new_status.lower() == HubspotDealDiffer.RETROFIT_DESIGN_COMPLETE @@ -177,7 +177,7 @@ class HubspotDealDiffer: def _lodgement_completed( new_deal: Dict[str, str], old_deal: HubspotDealData ) -> bool: - new_status: str = new_deal.get("coordination_status") or "" + new_status: str = new_deal.get("lodgement_status") or "" return ( new_status != "" and new_status.lower() in HubspotDealDiffer.LODGEMENT_COMPLETE diff --git a/etl/hubspot/tests/test_hubspot_deal_differ.py b/etl/hubspot/tests/test_hubspot_deal_differ.py index 69f7668b..0523c982 100644 --- a/etl/hubspot/tests/test_hubspot_deal_differ.py +++ b/etl/hubspot/tests/test_hubspot_deal_differ.py @@ -90,8 +90,8 @@ def test_pashub_trigger__pashub_link_changed__returns_true( @pytest.mark.parametrize( "coordination_status,expected", [ - ("v1 ioe/mtp complete", True), - ("v2 ioe/mtp complete", True), + ("(v1) ioe/mtp complete", True), + ("(v2) ioe/mtp complete", True), ], ) def test_pashub_trigger__coordination_completed_and_pashub_link_set__returns_true(