Fix REST hook deletion (#2893)

* Fix REST hook deletion

* Fix hook deletion better

* Add API DELETE test

ee/api/hooks.py

@@ -24,8 +24,7 @@ class HookViewSet(StructuredViewSetMixin, viewsets.ModelViewSet):
     Retrieve, create, update or destroy webhooks.
     """
 
-    queryset = Hook.objects.none()
-    serializer_class = HookSerializer
+    queryset = Hook.objects.all()
     ordering = "-created_at"
     permission_classes = [IsAuthenticated, OrganizationMemberPermissions]
     serializer_class = HookSerializer

ee/api/test/test_hooks.py

@@ -46,3 +46,9 @@ def test_create_hook_with_resource_id(self):
             },
             cast(dict, response.data),
         )
+
+    def test_delete_hook(self):
+        hook_id = "abc123"
+        Hook.objects.create(id=hook_id, user=self.user, team=self.team, resource_id=20)
+        response = self.client.delete(f"/api/projects/{self.team.id}/hooks/{hook_id}")
+        self.assertEqual(response.status_code, 204)

ee/tasks/hooks.py

@@ -1,10 +1,8 @@
 import json
-from typing import Optional
 
 import requests
 from celery.task import Task
 from django.core.serializers.json import DjangoJSONEncoder
-from rest_hooks.utils import get_hook_model
 
 
 class DeliverHook(Task):
@@ -20,7 +18,8 @@ def run(self, target: str, payload: dict, hook_id: str) -> None:
             )
             if response.status_code == 410 and hook_id:
                 # Delete hook on our side if it's gone on Zapier's
-                Hook = get_hook_model()
+                from ee.models.hook import Hook
+
                 Hook.objects.filter(id=hook_id).delete()
                 return
             if response.status_code >= 500: