fix(Integrations): Let HubSpot handle company creation and association

The HubSpot lead tracking integration was creating and updating
companies from Flagsmith org data, overwriting enriched company
names with user-entered org names. HubSpot already handles company
creation and contact association automatically from email domains.

Simplify create_lead to only create the contact. Remove domain
filtering from should_track since HubSpot handles that natively.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: Holmus

api/integrations/lead_tracking/hubspot/lead_tracker.py

@@ -17,35 +17,11 @@
 
 logger = logging.getLogger(__name__)
 
-try:
-    import re2 as re  # type: ignore[import-untyped]
-
-    logger.info("Using re2 library for regex.")
-except ImportError:
-    logger.warning("Unable to import re2. Falling back to re.")
-    import re
-
 
 class HubspotLeadTracker(LeadTracker):
     @staticmethod
     def should_track(user: FFAdminUser) -> bool:
-        if not settings.ENABLE_HUBSPOT_LEAD_TRACKING:
-            return False
-
-        domain = user.email_domain
-
-        if settings.HUBSPOT_IGNORE_DOMAINS_REGEX and re.match(
-            settings.HUBSPOT_IGNORE_DOMAINS_REGEX, domain
-        ):
-            return False
-
-        if (
-            settings.HUBSPOT_IGNORE_DOMAINS
-            and domain in settings.HUBSPOT_IGNORE_DOMAINS
-        ):
-            return False
-
-        return True
+        return settings.ENABLE_HUBSPOT_LEAD_TRACKING
 
     def update_company_active_subscription(
         self, subscription: Subscription
@@ -96,17 +72,9 @@ def create_user_hubspot_contact(self, user: FFAdminUser) -> str | None:
         return hubspot_contact_id
 
     def create_lead(self, user: FFAdminUser, organisation: Organisation) -> None:
-        hubspot_contact_id = self._get_or_create_user_hubspot_id(user)
-        if not hubspot_contact_id:
-            return
-        hubspot_org_id = self._get_organisation_hubspot_id(user, organisation)
-        if not hubspot_org_id:
-            return
-
-        self.client.associate_contact_to_company(
-            contact_id=hubspot_contact_id,
-            company_id=hubspot_org_id,
-        )
+        # Only create the contact. HubSpot handles company creation and
+        # association automatically from the contact's email domain.
+        self._get_or_create_user_hubspot_id(user)
 
     def _get_new_contact_with_retry(
         self, user: FFAdminUser, max_retries: int = 3
@@ -158,19 +126,18 @@ def _get_organisation_hubspot_id(
         company_kwargs["organisation_id"] = organisation.id
         company_kwargs["active_subscription"] = organisation.subscription.plan
 
-        # HubSpot auto-creates companies from contact email domains and may
-        # enrich them with the correct company name. We look up the company
-        # by domain and only set the name if HubSpot doesn't already have one,
-        # using the email domain as a fallback rather than the Flagsmith org
-        # name (which is often a placeholder like "test" or "ew").
+        # As Hubspot creates/associates companies automatically based on contact domain
+        # we need to get the hubspot id when this user creates the company for the first time
+        # and update the company name
         company = self._get_hubspot_company_by_domain(domain)
         if not company:
             return None
         org_hubspot_id: str = company["id"]
 
-        existing_name = company.get("properties", {}).get("name")
+        # Update the company in Hubspot with the name of the created
+        # organisation in Flagsmith, and its numeric ID.
         self.client.update_company(
-            name=domain if not existing_name else None,
+            name=organisation.name,
             hubspot_company_id=org_hubspot_id,
             flagsmith_organisation_id=organisation.id,
         )

api/tests/unit/integrations/lead_tracking/hubspot/test_unit_hubspot_lead_tracking.py

@@ -170,11 +170,7 @@ def test_track_hubspot_lead_v2__new_user_added_to_org__creates_associations(
     assert organisation.hubspot_organisation.hubspot_id == HUBSPOT_COMPANY_ID
 
     mock_client_existing_contact.create_company.assert_not_called()
-
-    mock_client_existing_contact.associate_contact_to_company.assert_called_once_with(
-        contact_id=HUBSPOT_USER_ID,
-        company_id=HUBSPOT_COMPANY_ID,
-    )
+    mock_client_existing_contact.associate_contact_to_company.assert_not_called()
     mock_client_existing_contact.create_lead_form.assert_not_called()
     mock_client_existing_contact.get_contact.assert_called_once_with(user)
 
@@ -253,38 +249,7 @@ def test_create_lead__existing_hubspot_org__creates_contact_and_associates(
     mock_client.create_lead_form.assert_called_once_with(
         user=user, form_id=HUBSPOT_FORM_ID_SAAS
     )
-    mock_client.associate_contact_to_company.assert_called_once_with(
-        contact_id=HUBSPOT_USER_ID,
-        company_id=HUBSPOT_COMPANY_ID,
-    )
-
-
-def test_create_lead__filtered_domain__skips_company_creation(
-    organisation: Organisation,
-    settings: SettingsWrapper,
-    mock_client_existing_contact: MagicMock,
-    enable_hubspot: None,
-    mocker: MockerFixture,
-) -> None:
-    # Given
-    settings.HUBSPOT_IGNORE_ORGANISATION_DOMAINS = ["example.com"]
-
-    user = FFAdminUser.objects.create(
-        email="new.user@example.com",
-        first_name="Frank",
-        last_name="Louis",
-        marketing_consent_given=True,
-    )
-
-    # When
-    tracker = HubspotLeadTracker()
-    tracker.create_lead(user=user, organisation=organisation)
-
-    # Then
-    assert HubspotLead.objects.filter(user=user, hubspot_id=HUBSPOT_USER_ID).exists()
-    mock_client_existing_contact.get_contact.assert_called_once_with(user)
-    mock_client_existing_contact.create_company.assert_not_called()
-    mock_client_existing_contact.associate_contact_to_company.assert_not_called()
+    mock_client.associate_contact_to_company.assert_not_called()
 
 
 def test_update_company_active_subscription__valid_subscription__calls_update_company(
@@ -390,38 +355,6 @@ def test_create_user_hubspot_contact__get_contact_retries__returns_expected_id(
     assert mock_client.get_contact.call_count == expected_call_count
 
 
-@pytest.mark.parametrize(
-    "hubspot_contact_id, hubspot_org_id",
-    [
-        (None, "org_123"),
-        ("contact_123", None),
-    ],
-)
-def test_create_lead__missing_contact_or_org_id__skips_association(
-    mocker: MockerFixture,
-    hubspot_contact_id: str | None,
-    hubspot_org_id: str | None,
-    staff_user: FFAdminUser,
-    organisation: Organisation,
-) -> None:
-    # Given
-    mock_client = mocker.MagicMock()
-    tracker = HubspotLeadTracker()
-
-    mocker.patch.object(
-        tracker, "_get_or_create_user_hubspot_id", return_value=hubspot_contact_id
-    )
-    mocker.patch.object(
-        tracker, "_get_organisation_hubspot_id", return_value=hubspot_org_id
-    )
-
-    # When
-    tracker.create_lead(staff_user, organisation)
-
-    # Then
-    mock_client.associate_contact_to_company.assert_not_called()
-
-
 def test_register_hubspot_tracker_and_track_user__no_explicit_user__falls_back_to_request_user(
     mocker: MockerFixture, staff_user: FFAdminUser, settings: SettingsWrapper
 ) -> None: