[BUGFIX] Extract warmup request id from query parameters

eliashaeussler · Aug 11, 2023 · 8ab88f5 · 8ab88f5
1 parent d1d248c
commit 8ab88f5
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 10 deletions.
diff --git a/Classes/ValueObject/Request/WarmupRequest.php b/Classes/ValueObject/Request/WarmupRequest.php
@@ -32,28 +32,24 @@
 final class WarmupRequest
 {
     /**
-     * @var non-empty-string
-     */
-    private readonly string $id;
-
-    /**
+     * @param non-empty-string $requestId
      * @param list<SiteWarmupRequest> $sites
      * @param list<PageWarmupRequest> $pages
      */
     public function __construct(
+        private readonly string $requestId,
         private readonly array $sites = [],
         private readonly array $pages = [],
         private readonly RequestConfiguration $configuration = new RequestConfiguration(),
     ) {
-        $this->id = uniqid('_', true);
     }
 
     /**
      * @return non-empty-string
      */
     public function getId(): string
     {
-        return $this->id;
+        return $this->requestId;
     }
 
     /**

diff --git a/Tests/Functional/Http/Message/Event/WarmupFinishedEventTest.php b/Tests/Functional/Http/Message/Event/WarmupFinishedEventTest.php
@@ -73,6 +73,7 @@ protected function setUp(): void
         );
         $this->subject = new Src\Http\Message\Event\WarmupFinishedEvent(
             new Src\ValueObject\Request\WarmupRequest(
+                'foo',
                 [
                     new Src\ValueObject\Request\SiteWarmupRequest($site, [0, 1]),
                 ],
@@ -158,7 +159,7 @@ public function getDataIncludesEmptyMessageIfNoSitesOrPagesWereRequested(): void
         $message = Src\Configuration\Localization::translate('notification.message.empty');
 
         $subject = new Src\Http\Message\Event\WarmupFinishedEvent(
-            new Src\ValueObject\Request\WarmupRequest(),
+            new Src\ValueObject\Request\WarmupRequest('foo'),
             $this->cacheWarmupResult,
         );
 
@@ -172,6 +173,7 @@ public function getDataThrowsExceptionIfRequestedPageDoesNotExist(): void
     {
         $subject = new Src\Http\Message\Event\WarmupFinishedEvent(
             new Src\ValueObject\Request\WarmupRequest(
+                'foo',
                 pages: [
                     new Src\ValueObject\Request\PageWarmupRequest(99),
                 ],

diff --git a/Tests/Unit/ValueObject/Request/WarmupRequestTest.php b/Tests/Unit/ValueObject/Request/WarmupRequestTest.php
@@ -52,13 +52,18 @@ protected function setUp(): void
         );
         $this->page = new Src\ValueObject\Request\PageWarmupRequest(7);
         $this->configuration = new Src\ValueObject\Request\RequestConfiguration(50, 'foo');
-        $this->subject = new Src\ValueObject\Request\WarmupRequest([$this->site], [$this->page], $this->configuration);
+        $this->subject = new Src\ValueObject\Request\WarmupRequest(
+            'foo',
+            [$this->site],
+            [$this->page],
+            $this->configuration,
+        );
     }
 
     #[Framework\Attributes\Test]
     public function getIdReturnsId(): void
     {
-        self::assertNotEmpty($this->subject->getId());
+        self::assertSame('foo', $this->subject->getId());
     }
 
     #[Framework\Attributes\Test]