fix(hubspot): restore logic for updating orgid_unique property (#6044)

Author: matthewelwell

api/integrations/lead_tracking/hubspot/client.py

@@ -222,12 +222,15 @@ def update_company(
         hubspot_company_id: str,
         name: str | None = None,
         active_subscription: str | None = None,
+        flagsmith_organisation_id: int | None = None,
     ) -> dict[str, Any]:
         properties = {}
         if name is not None:
             properties["name"] = name
         if active_subscription is not None:
             properties["active_subscription"] = active_subscription
+        if flagsmith_organisation_id is not None:
+            properties["orgid_unique"] = str(flagsmith_organisation_id)
 
         simple_public_object_input = SimplePublicObjectInput(properties=properties)
 

api/integrations/lead_tracking/hubspot/lead_tracker.py

@@ -162,13 +162,13 @@ def _get_organisation_hubspot_id(
             return None
         org_hubspot_id: str = company["id"]
 
-        properties = company.get("properties", {})
-        existing_name = properties.get("name")
-        if existing_name != organisation.name:
-            self.client.update_company(
-                name=organisation.name,
-                hubspot_company_id=org_hubspot_id,
-            )
+        # Update the company in Hubspot with the name of the created
+        # organisation in Flagsmith, and its numeric ID.
+        self.client.update_company(
+            name=organisation.name,
+            hubspot_company_id=org_hubspot_id,
+            flagsmith_organisation_id=organisation.id,
+        )
 
         # Store the organisation data in the database since we are
         # unable to look them up via a unique identifier.

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

@@ -286,13 +286,34 @@ def test_associate_contact_to_company_succeeds(hubspot_client: HubspotClient) ->
 @pytest.mark.parametrize(
     "kwargs, expected_properties",
     [
-        ({"name": "Test Organisation"}, {"name": "Test Organisation"}),
         (
-            {"name": "Test Organisation", "active_subscription": "scaleup"},
-            {"name": "Test Organisation", "active_subscription": "scaleup"},
+            {"name": "Test Organisation", "flagsmith_organisation_id": 1},
+            {"name": "Test Organisation", "orgid_unique": "1"},
+        ),
+        (
+            {
+                "name": "Test Organisation",
+                "active_subscription": "scaleup",
+                "flagsmith_organisation_id": 1,
+            },
+            {
+                "name": "Test Organisation",
+                "active_subscription": "scaleup",
+                "orgid_unique": "1",
+            },
+        ),
+        (
+            {"active_subscription": "scaleup", "flagsmith_organisation_id": 1},
+            {"active_subscription": "scaleup", "orgid_unique": "1"},
+        ),
+        (
+            {
+                "name": None,
+                "active_subscription": None,
+                "flagsmith_organisation_id": None,
+            },
+            {},
         ),
-        ({"active_subscription": "scaleup"}, {"active_subscription": "scaleup"}),
-        ({"name": None, "active_subscription": None}, {}),
     ],
 )
 def test_update_company_calls_hubspot_api(