Fix webhook assets 2

Author: JobDoesburg

landolfio/inventory/resource_types.py

@@ -42,18 +42,34 @@ def process_webhook_event(
         data: dict,
         event: WebhookEvent,
     ):
-        logger.info(f"Processing {event} for {cls.entity_type_name} {resource_id}")
+        logger.info(
+            f"Processing {event.value} for {cls.entity_type_name} {resource_id}"
+        )
 
+        # If no data, the asset was deleted
         if not data:
             return cls.delete_from_moneybird(resource_id)
 
+        # Check if asset already exists locally
         try:
             asset = cls.get_queryset().get(moneybird_asset_id=resource_id)
-            logger.info(f"Asset {resource_id} already exists locally, refreshing")
+            logger.info(
+                f"Asset {resource_id} already exists locally, refreshing from Moneybird"
+            )
             asset.refresh_from_moneybird()
-            asset.update_on_moneybird()
+
+            # If this is a created event and the name doesn't match, update Moneybird
+            if event.value == "company_assets_asset_created":
+                moneybird_name = data.get("name", "")
+                if moneybird_name and moneybird_name != asset.name:
+                    logger.info(
+                        f"Asset name mismatch: Moneybird has '{moneybird_name}', local has '{asset.name}'. Updating Moneybird."
+                    )
+                    asset.update_on_moneybird()
+
             return asset
         except cls.model.DoesNotExist:
+            # Asset doesn't exist locally - try to find by name and link
             asset_name = data.get("name", "")
             if asset_name:
                 try:
@@ -64,7 +80,15 @@ def process_webhook_event(
                         f"Found existing asset with name '{asset_name}', linking to Moneybird asset {resource_id}"
                     )
                     asset.moneybird_asset_id = resource_id
-                    asset._refresh_from_moneybird(data)
+                    asset.refresh_from_moneybird()
+
+                    # Check if name needs updating on Moneybird
+                    if asset_name != asset.name:
+                        logger.info(
+                            f"Linked asset name differs from Moneybird name. Updating Moneybird from '{asset_name}' to '{asset.name}'."
+                        )
+                        asset.update_on_moneybird()
+
                     return asset
                 except cls.model.DoesNotExist:
                     logger.info(

landolfio/moneybird/webhooks/processing.py

@@ -38,11 +38,22 @@ def process_webhook_payload(payload: MoneybirdResource) -> None:
     # Try to get exact entity type match first
     resource_type = get_moneybird_resource_type_for_entity(entity_type)
 
-    # If not found and entity_type starts with company_assets_, route to asset resource type
-    if resource_type is None and entity_type.startswith("company_assets_"):
+    # If not found and entity_type starts with CompanyAssets::, route to asset resource type
+    if resource_type is None and entity_type.startswith("CompanyAssets::"):
         resource_type = get_moneybird_resource_type_for_entity("company_assets_asset")
         if resource_type:
-            logging.info(f"Routing {entity_type} webhook to AssetResourceType")
+            logging.info(
+                f"Routing {entity_type} webhook (event: {event.value}, entity_id: {entity_id}) to AssetResourceType"
+            )
+            # For CompanyAssets sub-entities (disposal, source, value_change), extract asset_id from entity_data
+            if (
+                entity_type != "CompanyAssets::Asset"
+                and entity_data
+                and "asset_id" in entity_data
+            ):
+                asset_id = entity_data["asset_id"]
+                logging.info(f"Extracted asset_id {asset_id} from {entity_type} entity")
+                entity_id = asset_id
 
     if resource_type is None:
         logging.warning(

landolfio/website/settings/common.py

@@ -141,7 +141,13 @@
 MONEYBIRD_WEBHOOK_EVENTS = [
     "contact",
     "subscription",
-    "company_assets",  # Matches all company_assets_* events
+    "company_assets_asset_created",
+    "company_assets_asset_updated",
+    "company_assets_asset_destroyed",
+    "company_assets_disposal",
+    "company_assets_source",
+    "company_assets_value_changes",
+    "company_assets_value_change_plan",
 ]
 MONEYBIRD_WEBHOOK_ID = os.environ.get("MONEYBIRD_WEBHOOK_ID")
 MONEYBIRD_WEBHOOK_TOKEN = os.environ.get("MONEYBIRD_WEBHOOK_TOKEN")