From 6647ce8c6c7dc6d441a28bc458ecd472cc9c65a9 Mon Sep 17 00:00:00 2001
From: Lee Overy <me@leeovery.com>
Date: Sun, 9 Feb 2020 10:43:16 +0000
Subject: [PATCH] WIP

---
 resources/views/app/webhooks/index.blade.php   |  6 ++++++
 routes/web.php                                 | 18 +++++++++---------
 .../{ => Clients}/ClientIndexController.php    |  2 +-
 .../{ => Clients}/CreateClientController.php   |  2 +-
 .../{ => Clients}/DestroyClientController.php  |  2 +-
 .../ActivateWebhookController.php              |  2 +-
 .../{ => Webhooks}/CreateWebhookController.php |  2 +-
 .../DeactivateWebhookController.php            |  2 +-
 .../DestroyWebhookController.php               |  2 +-
 .../{ => Webhooks}/EditWebhookController.php   |  2 +-
 .../{ => Webhooks}/WebhookIndexController.php  |  2 +-
 src/MailcoachApiServiceProvider.php            |  2 +-
 src/Support/Triggers.php                       | 15 ++++-----------
 13 files changed, 29 insertions(+), 30 deletions(-)
 rename src/Http/App/Controllers/{ => Clients}/ClientIndexController.php (84%)
 rename src/Http/App/Controllers/{ => Clients}/CreateClientController.php (88%)
 rename src/Http/App/Controllers/{ => Clients}/DestroyClientController.php (86%)
 rename src/Http/App/Controllers/{ => Webhooks}/ActivateWebhookController.php (82%)
 rename src/Http/App/Controllers/{ => Webhooks}/CreateWebhookController.php (87%)
 rename src/Http/App/Controllers/{ => Webhooks}/DeactivateWebhookController.php (82%)
 rename src/Http/App/Controllers/{ => Webhooks}/DestroyWebhookController.php (82%)
 rename src/Http/App/Controllers/{ => Webhooks}/EditWebhookController.php (93%)
 rename src/Http/App/Controllers/{ => Webhooks}/WebhookIndexController.php (86%)

diff --git a/resources/views/app/webhooks/index.blade.php b/resources/views/app/webhooks/index.blade.php
index aaa19b3..8a3c859 100644
--- a/resources/views/app/webhooks/index.blade.php
+++ b/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>
diff --git a/routes/web.php b/routes/web.php
index 1b03bc4..16dcb5a 100644
--- a/routes/web.php
+++ b/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 () {
 
diff --git a/src/Http/App/Controllers/ClientIndexController.php b/src/Http/App/Controllers/Clients/ClientIndexController.php
similarity index 84%
rename from src/Http/App/Controllers/ClientIndexController.php
rename to src/Http/App/Controllers/Clients/ClientIndexController.php
index df2df69..44f4e8f 100644
--- a/src/Http/App/Controllers/ClientIndexController.php
+++ b/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;
 
diff --git a/src/Http/App/Controllers/CreateClientController.php b/src/Http/App/Controllers/Clients/CreateClientController.php
similarity index 88%
rename from src/Http/App/Controllers/CreateClientController.php
rename to src/Http/App/Controllers/Clients/CreateClientController.php
index 0551307..3d1241c 100644
--- a/src/Http/App/Controllers/CreateClientController.php
+++ b/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;
diff --git a/src/Http/App/Controllers/DestroyClientController.php b/src/Http/App/Controllers/Clients/DestroyClientController.php
similarity index 86%
rename from src/Http/App/Controllers/DestroyClientController.php
rename to src/Http/App/Controllers/Clients/DestroyClientController.php
index 9968cb6..5ff9aba 100644
--- a/src/Http/App/Controllers/DestroyClientController.php
+++ b/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;
diff --git a/src/Http/App/Controllers/ActivateWebhookController.php b/src/Http/App/Controllers/Webhooks/ActivateWebhookController.php
similarity index 82%
rename from src/Http/App/Controllers/ActivateWebhookController.php
rename to src/Http/App/Controllers/Webhooks/ActivateWebhookController.php
index b06050b..e1d3aff 100644
--- a/src/Http/App/Controllers/ActivateWebhookController.php
+++ b/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;
 
diff --git a/src/Http/App/Controllers/CreateWebhookController.php b/src/Http/App/Controllers/Webhooks/CreateWebhookController.php
similarity index 87%
rename from src/Http/App/Controllers/CreateWebhookController.php
rename to src/Http/App/Controllers/Webhooks/CreateWebhookController.php
index 70773d5..09765fe 100644
--- a/src/Http/App/Controllers/CreateWebhookController.php
+++ b/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;
diff --git a/src/Http/App/Controllers/DeactivateWebhookController.php b/src/Http/App/Controllers/Webhooks/DeactivateWebhookController.php
similarity index 82%
rename from src/Http/App/Controllers/DeactivateWebhookController.php
rename to src/Http/App/Controllers/Webhooks/DeactivateWebhookController.php
index d53e13f..4f7e4d7 100644
--- a/src/Http/App/Controllers/DeactivateWebhookController.php
+++ b/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;
 
diff --git a/src/Http/App/Controllers/DestroyWebhookController.php b/src/Http/App/Controllers/Webhooks/DestroyWebhookController.php
similarity index 82%
rename from src/Http/App/Controllers/DestroyWebhookController.php
rename to src/Http/App/Controllers/Webhooks/DestroyWebhookController.php
index 77e3195..6a95b43 100644
--- a/src/Http/App/Controllers/DestroyWebhookController.php
+++ b/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;
 
diff --git a/src/Http/App/Controllers/EditWebhookController.php b/src/Http/App/Controllers/Webhooks/EditWebhookController.php
similarity index 93%
rename from src/Http/App/Controllers/EditWebhookController.php
rename to src/Http/App/Controllers/Webhooks/EditWebhookController.php
index dfed1f9..3d5ecb8 100644
--- a/src/Http/App/Controllers/EditWebhookController.php
+++ b/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;
diff --git a/src/Http/App/Controllers/WebhookIndexController.php b/src/Http/App/Controllers/Webhooks/WebhookIndexController.php
similarity index 86%
rename from src/Http/App/Controllers/WebhookIndexController.php
rename to src/Http/App/Controllers/Webhooks/WebhookIndexController.php
index fde4e00..1c7b64a 100644
--- a/src/Http/App/Controllers/WebhookIndexController.php
+++ b/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;
diff --git a/src/MailcoachApiServiceProvider.php b/src/MailcoachApiServiceProvider.php
index 1bf6346..267573e 100644
--- a/src/MailcoachApiServiceProvider.php
+++ b/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);
diff --git a/src/Support/Triggers.php b/src/Support/Triggers.php
index 9624b98..75e824a 100644
--- a/src/Support/Triggers.php
+++ b/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);
     }
 }
\ No newline at end of file