fix(delete): dont queue deleting event (#112)

- dont queue deleting event so that a listener can bust cache immediately

resolves #95

Author: roshangautam

src/Events/BroadcastingEvent.php

@@ -7,7 +7,7 @@
 use Illuminate\Broadcasting\InteractsWithSockets;
 use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
 
-class BroadcastingEvent extends Event implements ShouldBroadcast
+class BroadcastingEvent extends TaskEvent implements ShouldBroadcast
 {
     use InteractsWithSockets;
 
@@ -29,7 +29,7 @@ public function __construct(Task $task)
     /**
      * Get the channels the event should broadcast on.
      *
-     * @return Channel|array
+     * @return \Illuminate\Broadcasting\Channel|\Illuminate\Broadcasting\Channel[]|PrivateChannel
      */
     public function broadcastOn()
     {

src/Events/Deleting.php

@@ -4,4 +4,15 @@
 
 class Deleting extends Event
 {
+    public $taskId;
+
+    /**
+     * Deleting constructor.
+     *
+     * @param $taskId
+     */
+    public function __construct($taskId)
+    {
+        $this->taskId = $taskId;
+    }
 }

src/Events/Event.php

@@ -2,26 +2,9 @@
 
 namespace Studio\Totem\Events;
 
-use Studio\Totem\Task;
-use Illuminate\Queue\SerializesModels;
 use Illuminate\Foundation\Events\Dispatchable;
 
 class Event
 {
-    use Dispatchable, SerializesModels;
-
-    /**
-     * @var Task
-     */
-    public $task;
-
-    /**
-     * Updated constructor.
-     *
-     * @param Task $task
-     */
-    public function __construct(Task $task)
-    {
-        $this->task = $task;
-    }
+    use Dispatchable;
 }

src/Events/TaskEvent.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace Studio\Totem\Events;
+
+use Studio\Totem\Task;
+use Illuminate\Queue\SerializesModels;
+use Illuminate\Foundation\Events\Dispatchable;
+
+class TaskEvent extends Event
+{
+    use Dispatchable, SerializesModels;
+
+    /**
+     * @var Task
+     */
+    public $task;
+
+    /**
+     * Constructor.
+     *
+     * @param Task $task
+     */
+    public function __construct(Task $task)
+    {
+        $this->task = $task;
+    }
+}

src/Listeners/BustCacheImmediately.php

@@ -0,0 +1,49 @@
+<?php
+
+namespace Studio\Totem\Listeners;
+
+use Studio\Totem\Events\Event;
+use Illuminate\Container\Container;
+
+class BustCacheImmediately
+{
+    /**
+     * @var Container
+     */
+    protected $app;
+
+    /**
+     * Create the event listener.
+     *
+     * @param Container $app
+     */
+    public function __construct(Container $app)
+    {
+        $this->app = $app;
+    }
+
+    /**
+     * Handle the event.
+     *
+     * @param  \Studio\Totem\Events\Event  $event
+     */
+    public function handle(Event $event)
+    {
+        $this->clear($event);
+    }
+
+    /**
+     * Clear Cache.
+     *
+     * @param Event $event
+     */
+    protected function clear(Event $event)
+    {
+        if ($event->taskId) {
+            $this->app['cache']->forget('totem.task.'.$event->taskId);
+        }
+
+        $this->app['cache']->forget('totem.tasks.all');
+        $this->app['cache']->forget('totem.tasks.active');
+    }
+}

src/Providers/TotemEventServiceProvider.php

@@ -11,6 +11,6 @@ class TotemEventServiceProvider extends EventServiceProvider
         'Studio\Totem\Events\Updated'     => ['Studio\Totem\Listeners\BustCache', 'Studio\Totem\Listeners\BuildCache'],
         'Studio\Totem\Events\Activated'   => ['Studio\Totem\Listeners\BustCache', 'Studio\Totem\Listeners\BuildCache'],
         'Studio\Totem\Events\Deactivated' => ['Studio\Totem\Listeners\BustCache', 'Studio\Totem\Listeners\BuildCache'],
-        'Studio\Totem\Events\Deleting'     => ['Studio\Totem\Listeners\BustCache'],
+        'Studio\Totem\Events\Deleting'    => ['Studio\Totem\Listeners\BustCacheImmediately'],
     ];
 }

src/Providers/TotemRouteServiceProvider.php

@@ -25,6 +25,7 @@ class TotemRouteServiceProvider extends RouteServiceProvider
     public function boot()
     {
         parent::boot();
+
         Route::bind('task', function ($value) {
             return cache()->rememberForever('totem.task.'.$value, function () use ($value) {
                 return Task::find($value) ?? abort(404);
@@ -42,8 +43,6 @@ public function map()
         $this->mapApiRoutes();
 
         $this->mapWebRoutes();
-
-        //
     }
 
     /**

src/Repositories/EloquentTaskRepository.php

@@ -124,7 +124,7 @@ public function destroy($id)
     {
         $task = $this->find($id);
 
-        if (Deleting::dispatch($task) === false) {
+        if (Deleting::dispatch($task->id) === false) {
             return false;
         }