Fix webhooks

Author: JobDoesburg

landolfio/inventory_frontend/views.py

@@ -360,19 +360,33 @@ def get_queryset(self):
                     )
                 elif warning_type == "missing_sources":
                     # Filter assets linked to Moneybird with no sources (financially unlinked)
-                    # Check for empty sources array or no moneybird_data
-                    warning_filters |= Q(moneybird_asset_id__isnull=False) & (
-                        Q(moneybird_data__isnull=True)
-                        | Q(moneybird_data__sources__isnull=True)
-                        | Q(moneybird_data__sources=[])
-                    )
+                    # SQLite uses json_array_length, PostgreSQL uses jsonb_array_length
+                    # For now, get all linked assets and filter in Python
+                    pass  # Will be handled after applying warning_filters
                 elif warning_type == "no_photos":
                     # Filter assets with no attachments (no photos)
                     warning_filters |= Q(attachments__isnull=True)
 
             if warning_filters:
                 queryset = queryset.filter(warning_filters)
 
+            # Handle missing_sources separately (requires Python-side filtering for JSON array)
+            if "missing_sources" in warnings:
+                # Only check assets that are linked to Moneybird
+                linked_assets = queryset.filter(moneybird_asset_id__isnull=False)
+                asset_ids_with_missing_sources = []
+
+                for asset in linked_assets:
+                    # Check if sources is missing, null, or empty array
+                    sources = asset.moneybird_data.get('sources') if asset.moneybird_data else None
+                    if not sources or len(sources) == 0:
+                        asset_ids_with_missing_sources.append(asset.id)
+
+                if asset_ids_with_missing_sources:
+                    queryset = queryset.filter(id__in=asset_ids_with_missing_sources)
+                else:
+                    queryset = queryset.none()
+
         # Apply property filters
         property_filters = self._get_property_filters()
         for property_filter in property_filters:

landolfio/moneybird/management/commands/deletemoneybirdwebhook.py

@@ -7,7 +7,7 @@ class Command(BaseCommand):
     help = "Delete webhook at Moneybird"
 
     def add_arguments(self, parser):
-        parser.add_argument("webhook_id", nargs="+", type=int)
+        parser.add_argument("webhook_id", type=int)
 
     def handle(self, *args, **options):
         webhook_id = options["webhook_id"]

landolfio/moneybird/webhooks/register.py

@@ -28,10 +28,11 @@ def create_webhook():
         logging.info("No events to register a webhook for.")
         return
 
-    events = [event.value for event in events]
+    # Convert enum values to strings if needed
+    events = [event.value if hasattr(event, 'value') else event for event in events]
 
     administration = get_moneybird_administration()
-    response = administration.post("webhooks", data={"url": url, "events": events})
+    response = administration.post("webhooks", data={"url": url, "enabled_events": events})
     logging.info(f"Registered webhook with id {response['id']}")
     return response
 

landolfio/website/settings/common.py

@@ -139,13 +139,9 @@
     "inventory.resource_types.AssetResourceType",
 ]
 MONEYBIRD_WEBHOOK_EVENTS = [
-    WebhookEvent.CONTACT,
-    WebhookEvent.SUBSCRIPTION_CANCELLED,
-    WebhookEvent.SUBSCRIPTION_CREATED,
-    WebhookEvent.SUBSCRIPTION_UPDATED,
-    WebhookEvent.SUBSCRIPTION_EDITED,
-    WebhookEvent.SUBSCRIPTION_DESTROYED,
-    WebhookEvent.COMPANY_ASSETS_ASSET,
+    "contact",
+    "subscription",
+    "company_assets",  # Matches all company_assets_* events
 ]
 MONEYBIRD_WEBHOOK_ID = os.environ.get("MONEYBIRD_WEBHOOK_ID")
 MONEYBIRD_WEBHOOK_TOKEN = os.environ.get("MONEYBIRD_WEBHOOK_TOKEN")