WIP

resources/views/app/webhooks/index.blade.php

@@ -30,6 +30,7 @@
                     <x-th sort-by="name" sort-default>Name</x-th>
                     <th>Url</th>
                     <th class="w-32 th-numeric">Triggers</th>
+                    <th class="w-32 th-numeric">Fired</th>
                     <x-th sort-by="-created_at" class="w-48 th-numeric hidden | md:table-cell">Created</x-th>
                     <th class="w-12"></th>
                 </tr>
@@ -57,6 +58,11 @@
                             </div>
                         </td>
                         <td class="td-numeric">{{ $webhook->trigger_list_count }}</td>
+                        <td class="td-numeric markup-links">
+                            <a href="{{ route('mailcoach-api.webhooks.event-log', $webhook) }}">
+                                {{ $webhook->webhookEvents()->count() }}
+                            </a>
+                        </td>
                         <td class="td-numeric hidden | md:table-cell">
                             {{ $webhook->created_at->toMailcoachFormat() }}
                         </td>

routes/web.php

@@ -1,16 +1,16 @@
 <?php
 
 use Illuminate\Support\Facades\Route;
-use Leeovery\MailcoachApi\Http\App\Controllers\ClientIndexController;
-use Leeovery\MailcoachApi\Http\App\Controllers\EditWebhookController;
-use Leeovery\MailcoachApi\Http\App\Controllers\CreateClientController;
-use Leeovery\MailcoachApi\Http\App\Controllers\WebhookIndexController;
-use Leeovery\MailcoachApi\Http\App\Controllers\DestroyClientController;
-use Leeovery\MailcoachApi\Http\App\Controllers\CreateWebhookController;
-use Leeovery\MailcoachApi\Http\App\Controllers\DestroyWebhookController;
-use Leeovery\MailcoachApi\Http\App\Controllers\ActivateWebhookController;
-use Leeovery\MailcoachApi\Http\App\Controllers\DeactivateWebhookController;
+use Leeovery\MailcoachApi\Http\App\Controllers\Clients\ClientIndexController;
+use Leeovery\MailcoachApi\Http\App\Controllers\Webhooks\EditWebhookController;
+use Leeovery\MailcoachApi\Http\App\Controllers\Clients\CreateClientController;
+use Leeovery\MailcoachApi\Http\App\Controllers\Webhooks\WebhookIndexController;
+use Leeovery\MailcoachApi\Http\App\Controllers\Clients\DestroyClientController;
+use Leeovery\MailcoachApi\Http\App\Controllers\Webhooks\CreateWebhookController;
+use Leeovery\MailcoachApi\Http\App\Controllers\Webhooks\DestroyWebhookController;
+use Leeovery\MailcoachApi\Http\App\Controllers\Webhooks\ActivateWebhookController;
 use Leeovery\MailcoachApi\Http\App\Controllers\Webhooks\WebhookEventLogController;
+use Leeovery\MailcoachApi\Http\App\Controllers\Webhooks\DeactivateWebhookController;
 
 Route::prefix('api')->group(function () {
 

src/Http/App/Controllers/ClientIndexController.php → src/Http/App/Controllers/Clients/ClientIndexController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Leeovery\MailcoachApi\Http\App\Controllers;
+namespace Leeovery\MailcoachApi\Http\App\Controllers\Clients;
 
 use Laravel\Passport\Client;
 

src/Http/App/Controllers/CreateClientController.php → src/Http/App/Controllers/Clients/CreateClientController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Leeovery\MailcoachApi\Http\App\Controllers;
+namespace Leeovery\MailcoachApi\Http\App\Controllers\Clients;
 
 use Laravel\Passport\ClientRepository;
 use Leeovery\MailcoachApi\Http\App\Requests\CreateApiClientRequest;

src/Http/App/Controllers/DestroyClientController.php → src/Http/App/Controllers/Clients/DestroyClientController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Leeovery\MailcoachApi\Http\App\Controllers;
+namespace Leeovery\MailcoachApi\Http\App\Controllers\Clients;
 
 use Laravel\Passport\Client;
 use Laravel\Passport\ClientRepository;

src/Http/App/Controllers/ActivateWebhookController.php → src/Http/App/Controllers/Webhooks/ActivateWebhookController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Leeovery\MailcoachApi\Http\App\Controllers;
+namespace Leeovery\MailcoachApi\Http\App\Controllers\Webhooks;
 
 use Leeovery\MailcoachApi\Models\Webhook;
 

src/Http/App/Controllers/CreateWebhookController.php → src/Http/App/Controllers/Webhooks/CreateWebhookController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Leeovery\MailcoachApi\Http\App\Controllers;
+namespace Leeovery\MailcoachApi\Http\App\Controllers\Webhooks;
 
 use Leeovery\MailcoachApi\Models\Webhook;
 use Leeovery\MailcoachApi\Http\App\Requests\CreateWebhookRequest;

src/Http/App/Controllers/DeactivateWebhookController.php → src/Http/App/Controllers/Webhooks/DeactivateWebhookController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Leeovery\MailcoachApi\Http\App\Controllers;
+namespace Leeovery\MailcoachApi\Http\App\Controllers\Webhooks;
 
 use Leeovery\MailcoachApi\Models\Webhook;
 

src/Http/App/Controllers/DestroyWebhookController.php → src/Http/App/Controllers/Webhooks/DestroyWebhookController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Leeovery\MailcoachApi\Http\App\Controllers;
+namespace Leeovery\MailcoachApi\Http\App\Controllers\Webhooks;
 
 use Leeovery\MailcoachApi\Models\Webhook;
 

src/Http/App/Controllers/EditWebhookController.php → src/Http/App/Controllers/Webhooks/EditWebhookController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Leeovery\MailcoachApi\Http\App\Controllers;
+namespace Leeovery\MailcoachApi\Http\App\Controllers\Webhooks;
 
 use Leeovery\MailcoachApi\Models\Webhook;
 use Leeovery\MailcoachApi\Support\Triggers;

src/Http/App/Controllers/WebhookIndexController.php → src/Http/App/Controllers/Webhooks/WebhookIndexController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Leeovery\MailcoachApi\Http\App\Controllers;
+namespace Leeovery\MailcoachApi\Http\App\Controllers\Webhooks;
 
 use Leeovery\MailcoachApi\Models\Webhook;
 use Leeovery\MailcoachApi\Http\App\Queries\WebhookQuery;

src/MailcoachApiServiceProvider.php

@@ -118,7 +118,7 @@ public function register()
         $this->mergeConfigFrom(__DIR__.'/../config/mailcoach-api.php', 'mailcoach-api');
 
         $this->app->singleton(Triggers::class, function () {
-            return new Triggers(collect($this->actionMap));
+            return new Triggers($this->actionMap);
         });
 
         Event::listen('Spatie\Mailcoach\Events\*', MailcoachEventListener::class);

src/Support/Triggers.php

@@ -4,27 +4,20 @@
 
 use Illuminate\Support\Collection;
 
-class Triggers
+class Triggers extends Collection
 {
-    private Collection $eventMap;
-
-    public function __construct(Collection $eventMap)
-    {
-        $this->eventMap = $eventMap;
-    }
-
     public function events()
     {
-        return $this->eventMap->values();
+        return $this->values();
     }
 
     public function hasEvent($event)
     {
-        return $this->eventMap->has($event);
+        return $this->has($event);
     }
 
     public function getTriggerKey($event)
     {
-        return $this->eventMap->get($event);
+        return $this->get($event);
     }
 }