Fix webhook assets

Author: JobDoesburg

landolfio/inventory/resource_types.py

@@ -42,73 +42,66 @@ def process_webhook_event(
         data: dict,
         event: WebhookEvent,
     ):
-        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 from Moneybird"
-            )
             asset.refresh_from_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."
+                        f"Updating Moneybird asset name from '{moneybird_name}' to '{asset.name}'"
                     )
                     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:
-                    asset = cls.get_queryset().get(
-                        name=asset_name, moneybird_asset_id__isnull=True
-                    )
-                    logger.info(
-                        f"Found existing asset with name '{asset_name}', linking to Moneybird asset {resource_id}"
-                    )
-                    asset.moneybird_asset_id = resource_id
-                    asset.refresh_from_moneybird()
+            moneybird_name = data.get("name", "")
+            if not moneybird_name:
+                logger.warning(f"Asset {resource_id} has no name, cannot match")
+                return None
 
-                    # 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()
+            # Try to find exact match (case-insensitive)
+            try:
+                asset = cls.get_queryset().get(
+                    name__iexact=moneybird_name, moneybird_asset_id__isnull=True
+                )
+                logger.info(
+                    f"Linking local asset '{asset.name}' to Moneybird asset {resource_id}"
+                )
+                asset.moneybird_asset_id = resource_id
+                asset.save(update_fields=["moneybird_asset_id"])
+                asset.refresh_from_moneybird()
 
-                    return asset
-                except cls.model.DoesNotExist:
+                # Update Moneybird if names differ in case
+                if moneybird_name != asset.name:
                     logger.info(
-                        f"No existing asset found with name '{asset_name}' to link"
-                    )
-                except cls.model.MultipleObjectsReturned:
-                    logger.warning(
-                        f"Multiple assets found with name '{asset_name}', cannot auto-link"
+                        f"Updating Moneybird asset name from '{moneybird_name}' to '{asset.name}'"
                     )
-            else:
-                logger.warning(f"Asset {resource_id} has no name, cannot match")
-            return None
+                    asset.update_on_moneybird()
+
+                return asset
+            except cls.model.DoesNotExist:
+                return None
+            except cls.model.MultipleObjectsReturned:
+                logger.warning(
+                    f"Multiple assets found with name '{moneybird_name}', cannot auto-link"
+                )
+                return None
 
     @classmethod
     def delete_from_moneybird(cls, resource_id: str):
-        logger.info(f"Asset {resource_id} deleted on Moneybird")
         try:
             asset = cls.get_queryset().get(moneybird_asset_id=resource_id)
             logger.info(
-                f"Unlinking local asset {asset.id} from Moneybird asset {resource_id}"
+                f"Unlinking local asset '{asset.name}' from deleted Moneybird asset"
             )
             asset.moneybird_asset_id = None
             asset.moneybird_data = None
@@ -123,4 +116,4 @@ def delete_from_moneybird(cls, resource_id: str):
                 ]
             )
         except cls.model.DoesNotExist:
-            logger.info(f"Asset {resource_id} not found locally, nothing to unlink")
+            pass

landolfio/moneybird/webhooks/processing.py

@@ -10,25 +10,25 @@
 
 def process_webhook_payload(payload: MoneybirdResource) -> None:
     if payload["action"] == "test_webhook":
-        logging.info(f"Received test webhook from Moneybird: {payload}")
+        logging.info(f"Received test webhook from Moneybird")
         return
 
     if payload["webhook_id"] != settings.MONEYBIRD_WEBHOOK_ID:
-        logging.error("Received webhook with wrong id")
+        logging.error(f"Received webhook with wrong id")
         return
 
     if payload["webhook_token"] != settings.MONEYBIRD_WEBHOOK_TOKEN:
         logging.error("Received webhook with wrong token")
         return
 
     if int(payload["administration_id"]) != settings.MONEYBIRD_ADMINISTRATION_ID:
-        logging.error("Received webhook for wrong administration")
+        logging.error(f"Received webhook for wrong administration")
         return
 
     try:
         event = WebhookEvent(payload["action"])
     except ValueError:
-        logging.error("Received webhook with invalid event")
+        logging.error(f"Received webhook with invalid event: {payload['action']}")
         return
 
     entity_type = payload["entity_type"]
@@ -42,17 +42,13 @@ def process_webhook_payload(payload: MoneybirdResource) -> None:
     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 (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:

landolfio/moneybird/webhooks/views.py

@@ -29,12 +29,20 @@ def __contains__(self, item):
 @require_POST
 @non_atomic_requests
 def webhook_receive(request):
+    import logging
+
+    logger = logging.getLogger(__name__)
+
     idempotency_key = request.headers.get("Idempotency-Key")
     if idempotency_key in webhook_cache:
         return HttpResponse("Webhook already processed.", content_type="text/plain")
 
     payload = json.loads(request.body)
-    process_webhook_payload(payload)
+
+    try:
+        process_webhook_payload(payload)
+    except Exception as e:
+        logger.error(f"Error processing webhook: {e}", exc_info=True)
 
     webhook_cache.add(idempotency_key)