fix: rely-solely-on-hubspot-to-create-organisations (#5739)

Co-authored-by: Evandro Myller <22429+emyller@users.noreply.github.com>

Author: Zaimwa9

api/integrations/lead_tracking/hubspot/lead_tracker.py

@@ -95,7 +95,7 @@ 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_or_create_organisation_hubspot_id(user, organisation)
+        hubspot_org_id = self._get_organisation_hubspot_id(user, organisation)
         if not hubspot_org_id:
             return
 
@@ -134,7 +134,7 @@ def _get_or_create_user_hubspot_id(self, user: FFAdminUser) -> str | None:
 
         return hubspot_contact_id
 
-    def _get_or_create_organisation_hubspot_id(
+    def _get_organisation_hubspot_id(
         self,
         user: FFAdminUser,
         organisation: Organisation,
@@ -154,10 +154,12 @@ def _get_or_create_organisation_hubspot_id(
         company_kwargs["organisation_id"] = organisation.id
         company_kwargs["active_subscription"] = organisation.subscription.plan
 
-        # As Hubspot creates/associates companies based on contact domain
+        # 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_or_create_hubspot_company(**company_kwargs)
+        company = self._get_hubspot_company_by_domain(domain)
+        if not company:
+            return None
         org_hubspot_id: str = company["id"]
 
         properties = company.get("properties", {})
@@ -177,21 +179,11 @@ def _get_or_create_organisation_hubspot_id(
 
         return org_hubspot_id
 
-    def _get_or_create_hubspot_company(
+    def _get_hubspot_company_by_domain(
         self,
         domain: str,
-        organisation_id: int,
-        name: str,
-        active_subscription: str | None = None,
     ) -> dict[str, Any]:
         company = self.client.get_company_by_domain(domain)
-        if not company:
-            company = self.client.create_company(
-                name=name,
-                domain=domain,
-                organisation_id=organisation_id,
-                active_subscription=active_subscription,
-            )
 
         return company  # type: ignore[no-any-return]
 

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

@@ -176,7 +176,7 @@ def test_hubspot_user_org_hook_creates_hubspot_user_and_organisation_association
     mock_client_existing_contact.get_contact.assert_called_once_with(user)
 
 
-def test_create_organisation_lead_creates_contact_when_not_found(
+def test_create_organisation_lead_creates_contact_when_not_found_but_not_company(
     organisation: Organisation,
     mocker: MockerFixture,
 ) -> None:
@@ -209,16 +209,8 @@ def test_create_organisation_lead_creates_contact_when_not_found(
 
     assert mock_client.get_contact.call_count == 2
     mock_client.create_lead_form.assert_called_once_with(user=user)
-    mock_client.create_company.assert_called_once_with(
-        name=organisation.name,
-        active_subscription="free",
-        organisation_id=organisation.id,
-        domain="example.com",
-    )
-    mock_client.associate_contact_to_company.assert_called_once_with(
-        contact_id=HUBSPOT_USER_ID,
-        company_id=HUBSPOT_COMPANY_ID,
-    )
+    mock_client.create_company.assert_not_called()  # We rely on Hubspot creating contacts
+    mock_client.associate_contact_to_company.assert_not_called()
 
 
 def test_create_organisation_lead_creates_contact_for_existing_org(
@@ -413,7 +405,7 @@ def test_create_leads_skips_association_on_missing_ids(
         tracker, "_get_or_create_user_hubspot_id", return_value=hubspot_contact_id
     )
     mocker.patch.object(
-        tracker, "_get_or_create_organisation_hubspot_id", return_value=hubspot_org_id
+        tracker, "_get_organisation_hubspot_id", return_value=hubspot_org_id
     )
 
     # When