UserQueued event (#8)

* Added UserQueued event * Added tests * Removed incorrect emit
jorbascrumps · Sep 5, 2024 · 564f97c · 564f97c
1 parent 947c22c
commit 564f97c
Show file tree

Hide file tree

Showing 5 changed files with 58 additions and 0 deletions.
diff --git a/src/Events/UserQueued.php b/src/Events/UserQueued.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace Jorbascrumps\QueueIt\Events;
+
+use QueueIT\KnownUserV3\SDK\RequestValidationResult;
+
+class UserQueued
+{
+    public RequestValidationResult $requestValidationResult;
+
+    /**
+     * Create a new event instance.
+     */
+    public function __construct(RequestValidationResult $requestValidationResult)
+    {
+        $this->requestValidationResult = $requestValidationResult;
+    }
+}
diff --git a/src/Http/Middleware/InlineQueue.php b/src/Http/Middleware/InlineQueue.php
@@ -4,6 +4,7 @@
 
 use Closure;
 use Illuminate\Http\Request;
+use Jorbascrumps\QueueIt\Events\UserQueued;
 use QueueIT\KnownUserV3\SDK\ActionTypes;
 use QueueIT\KnownUserV3\SDK\KnownUser;
 use QueueIT\KnownUserV3\SDK\KnownUserException;
@@ -73,6 +74,8 @@ public function handle(Request $request, Closure $next, ...$eventConfigParams)
         );
 
         if ($result->doRedirect()) {
+            event(new UserQueued($result));
+
             return redirect($result->redirectUrl)->setCache($cacheHeaders);
         }
 

diff --git a/src/Http/Middleware/KnownUserQueue.php b/src/Http/Middleware/KnownUserQueue.php
@@ -5,6 +5,7 @@
 use Closure;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Storage;
+use Jorbascrumps\QueueIt\Events\UserQueued;
 use QueueIT\KnownUserV3\SDK\ActionTypes;
 use QueueIT\KnownUserV3\SDK\KnownUser;
 use QueueIT\KnownUserV3\SDK\KnownUserException;
@@ -41,6 +42,8 @@ public function handle(Request $request, Closure $next)
         );
 
         if ($result->doRedirect()) {
+            event(new UserQueued($result));
+
             return redirect($result->redirectUrl)->setCache($cacheHeaders);
         }
 

diff --git a/tests/Http/Middleware/InlineQueueTest.php b/tests/Http/Middleware/InlineQueueTest.php
@@ -2,6 +2,8 @@
 
 namespace Jorbascrumps\QueueIt\Test\Http\Middleware;
 
+use Illuminate\Support\Facades\Event;
+use Jorbascrumps\QueueIt\Events\UserQueued;
 use Jorbascrumps\QueueIt\Http\Middleware\InlineQueue;
 use Jorbascrumps\QueueIt\Test\TestCase;
 use QueueIT\KnownUserV3\SDK\ActionTypes;
@@ -52,6 +54,20 @@ public function testIgnoresInvalidAction(): void
         $response->assertOk();
     }
 
+    public function testEmitsOnQueueRedirect(): void
+    {
+        Event::fake();
+
+        $userInQueueService = $this->mockQueueService();
+        $userInQueueService->validateQueueRequestResult = new RequestValidationResult(
+            ActionTypes::QueueAction, null, null, self::QUEUE_URL, null, null
+        );
+
+        $response = $this->get(self::PAGE_URL);
+
+        Event::assertDispatched(UserQueued::class);
+    }
+
     /**
      * @dataProvider aliasProvider
      */

diff --git a/tests/Http/Middleware/KnownUserQueueTest.php b/tests/Http/Middleware/KnownUserQueueTest.php
@@ -3,6 +3,8 @@
 namespace Jorbascrumps\QueueIt\Test\Http\Middleware;
 
 use Illuminate\Contracts\Filesystem\FileNotFoundException;
+use Illuminate\Support\Facades\Event;
+use Jorbascrumps\QueueIt\Events\UserQueued;
 use Jorbascrumps\QueueIt\Http\Middleware\KnownUserQueue;
 use Jorbascrumps\QueueIt\Test\TestCase;
 use QueueIT\KnownUserV3\SDK\ActionTypes;
@@ -75,4 +77,20 @@ public function testIgnoresInvalidAction(): void
 
         $response->assertOk();
     }
+
+    public function testEmitsOnQueueRedirect(): void
+    {
+        Event::fake();
+
+        $this->mockConfig();
+
+        $userInQueueService = $this->mockQueueService();
+        $userInQueueService->validateQueueRequestResult = new RequestValidationResult(
+            ActionTypes::QueueAction, null, null, self::QUEUE_URL, null, null
+        );
+
+        $response = $this->get(self::PAGE_URL);
+
+        Event::assertDispatched(UserQueued::class);
+    }
 }