Webhook job no longer duplicates

owlchester · Apr 10, 2024 · 47bb985 · 47bb985
1 parent 336cf30
commit 47bb985
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/app/Observers/EntityObserver.php b/app/Observers/EntityObserver.php
@@ -14,6 +14,7 @@
 use App\Services\ImageService;
 use App\Services\PermissionService;
 use App\Facades\Domain;
+use Carbon\Carbon;
 
 class EntityObserver
 {
@@ -189,7 +190,7 @@ public function created(Entity $entity)
         if (!request()->has('attr_name')) {
             $this->attributeService->applyEntityTemplates($entity);
         }
-        EntityWebhookJob::dispatch($entity, auth()->user(), WebhookAction::NEW);
+        EntityWebhookJob::dispatch($entity, auth()->user(), WebhookAction::NEW->value);
     }
 
     /**
@@ -200,7 +201,15 @@ public function updated(Entity $entity)
 
         // Queue job when an entity was updated
         EntityUpdatedJob::dispatch($entity);
-        EntityWebhookJob::dispatch($entity, auth()->user(), WebhookAction::EDITED);
+    }
+
+    /**
+     */
+    public function updating(Entity $entity)
+    {
+        if ($entity->getOriginal('updated_at')->diffInSeconds(Carbon::now()) > 15) {
+            EntityWebhookJob::dispatch($entity, auth()->user(), WebhookAction::EDITED->value);
+        }
     }
 
     /**
@@ -243,7 +252,7 @@ public function saveBoosted(Entity $entity): void
 
     public function deleting(Entity $entity)
     {
-        EntityWebhookJob::dispatch($entity, auth()->user(), WebhookAction::DELETED);
+        EntityWebhookJob::dispatch($entity, auth()->user(), WebhookAction::DELETED->value);
     }
 
     /**