fix(webhooks): fix order webhooks

src/App/Webhook/Hook/AbstractHook.php

@@ -29,20 +29,7 @@ public function handle(Request $request): void
      */
     public function validate(Request $request): bool
     {
-        return $this->eventMatches($request, $this->getHookEvent());
-    }
-
-    /**
-     * @param  \Symfony\Component\HttpFoundation\Request $request
-     * @param  string                                    $hook
-     *
-     * @return bool
-     */
-    protected function eventMatches(Request $request, string $hook): bool
-    {
-        $content = $this->getHookBody($request);
-
-        return $request->headers->get('x-myparcel-hook') === $hook && $content['event'] === $hook;
+        return true;
     }
 
     /**

src/App/Webhook/PdkWebhookManager.php

@@ -87,18 +87,31 @@ public function processWebhook(Request $request): void
 
                 if (! $hook->validate($request)) {
                     Logger::debug('Webhook skipped', $logContext);
+
                     continue;
                 }
 
-                $hook->handle($request);
-
-                Logger::debug('Webhook processed', $logContext);
+                $this->handleHook($hook, $request, $logContext);
             } catch (Throwable $exception) {
                 Logger::error('Webhook failed', $logContext);
             }
         }
     }
 
+    /**
+     * @param  \MyParcelNL\Pdk\App\Webhook\Contract\HookInterface $hook
+     * @param  \Symfony\Component\HttpFoundation\Request          $request
+     * @param  array                                              $logContext
+     *
+     * @return void
+     */
+    protected function handleHook(HookInterface $hook, Request $request, array $logContext): void
+    {
+        $hook->handle($request);
+
+        Logger::debug('Webhook processed', $logContext);
+    }
+
     /**
      * @param  string $event
      *
@@ -123,8 +136,14 @@ protected function resolveHook(string $event): HookInterface
      */
     private function getHooks(Request $request): array
     {
-        $body = json_decode($request->getContent(), true);
+        $myParcelHeader = $request->headers->get('x-myparcel-hook');
+        $body           = json_decode($request->getContent(), true);
+        $hooks          = $body['data']['hooks'] ?? [];
+
+        return array_map(static function ($hook) use ($myParcelHeader) {
+            $hook['event'] = $hook['event'] ?? $myParcelHeader;
 
-        return $body['data']['hooks'] ?? [];
+            return $hook;
+        }, $hooks);
     }
 }

tests/Bootstrap/MockPdkConfig.php

@@ -20,6 +20,7 @@
 use MyParcelNL\Pdk\App\Order\Contract\PdkProductRepositoryInterface;
 use MyParcelNL\Pdk\App\ShippingMethod\Contract\PdkShippingMethodRepositoryInterface;
 use MyParcelNL\Pdk\App\Tax\Contract\TaxServiceInterface;
+use MyParcelNL\Pdk\App\Webhook\Contract\PdkWebhookManagerInterface;
 use MyParcelNL\Pdk\App\Webhook\Contract\PdkWebhookServiceInterface;
 use MyParcelNL\Pdk\App\Webhook\Contract\PdkWebhooksRepositoryInterface;
 use MyParcelNL\Pdk\Base\Concern\PdkInterface;
@@ -93,6 +94,7 @@ private static function getDefaultConfig(): array
             PdkOrderRepositoryInterface::class          => get(MockPdkOrderRepository::class),
             PdkProductRepositoryInterface::class        => get(MockPdkProductRepository::class),
             PdkShippingMethodRepositoryInterface::class => get(MockPdkShippingMethodRepository::class),
+            PdkWebhookManagerInterface::class           => get(MockPdkWebhookManager::class),
             PdkWebhookServiceInterface::class           => get(MockPdkWebhookService::class),
             PdkWebhooksRepositoryInterface::class       => get(MockPdkWebhooksRepository::class),
             SettingsRepositoryInterface::class          => get(MockSettingsRepository::class),

tests/Bootstrap/MockPdkWebhookManager.php

@@ -0,0 +1,35 @@
+<?php
+
+declare(strict_types=1);
+
+namespace MyParcelNL\Pdk\Tests\Bootstrap;
+
+use MyParcelNL\Pdk\App\Webhook\Contract\HookInterface;
+use MyParcelNL\Pdk\App\Webhook\PdkWebhookManager;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Contracts\Service\ResetInterface;
+
+final class MockPdkWebhookManager extends PdkWebhookManager implements ResetInterface
+{
+    protected $calledHooks = [];
+
+    /**
+     * @return array
+     */
+    public function getCalledHooks(): array
+    {
+        return $this->calledHooks;
+    }
+
+    public function reset(): void
+    {
+        $this->calledHooks = [];
+    }
+
+    protected function handleHook(HookInterface $hook, Request $request, array $logContext): void
+    {
+        $this->calledHooks[] = $hook;
+
+        parent::handleHook($hook, $request, $logContext);
+    }
+}

tests/Bootstrap/TestCase.php

@@ -25,6 +25,7 @@ protected function getResetServices(): array
             MockMemoryCacheStorage::class,
             MockOrderStatusService::class,
             MockPdkActionsService::class,
+            MockPdkWebhookManager::class,
             MockPdkWebhooksRepository::class,
             SharedFactoryState::class,
         ];

tests/Unit/App/Webhook/PdkWebhookManagerTest.php

@@ -7,7 +7,15 @@
 
 use MyParcelNL\Pdk\App\Webhook\Contract\PdkWebhookManagerInterface;
 use MyParcelNL\Pdk\App\Webhook\Contract\PdkWebhooksRepositoryInterface;
+use MyParcelNL\Pdk\App\Webhook\Hook\OrderStatusChangeWebhook;
+use MyParcelNL\Pdk\App\Webhook\Hook\ShipmentLabelCreatedWebhook;
+use MyParcelNL\Pdk\App\Webhook\Hook\ShipmentStatusChangeWebhook;
+use MyParcelNL\Pdk\App\Webhook\Hook\ShopCarrierAccessibilityUpdatedWebhook;
+use MyParcelNL\Pdk\App\Webhook\Hook\ShopCarrierConfigurationUpdatedWebhook;
+use MyParcelNL\Pdk\App\Webhook\Hook\ShopUpdatedWebhook;
+use MyParcelNL\Pdk\App\Webhook\Hook\SubscriptionCreatedOrUpdatedWebhook;
 use MyParcelNL\Pdk\Base\Contract\CronServiceInterface;
+use MyParcelNL\Pdk\Base\Support\Arr;
 use MyParcelNL\Pdk\Facade\Pdk;
 use MyParcelNL\Pdk\Tests\Uses\UsesMockEachCron;
 use MyParcelNL\Pdk\Tests\Uses\UsesMockPdkInstance;
@@ -21,25 +29,44 @@
 
 usesShared(new UsesMockPdkInstance(), new UsesMockEachCron());
 
-it('dispatches incoming webhook', function (string $hook) {
-    /** @var PdkWebhooksRepositoryInterface $repository */
+it('dispatches and executes webhooks', function (string $hook, string $calledClass, bool $useHeader) {
+    /** @var \MyParcelNL\Pdk\App\Webhook\Contract\PdkWebhooksRepositoryInterface $repository */
     $repository = Pdk::get(PdkWebhooksRepositoryInterface::class);
-    /** @var PdkWebhookManagerInterface $webhookManager */
+    /** @var \MyParcelNL\Pdk\Tests\Bootstrap\MockPdkWebhookManager $webhookManager */
     $webhookManager = Pdk::get(PdkWebhookManagerInterface::class);
     /** @var \MyParcelNL\Pdk\Tests\Bootstrap\MockCronService $cronService */
     $cronService = Pdk::get(CronServiceInterface::class);
 
+    $repository->storeHashedUrl('https://example.com/hashed-url');
     $repository->store(new WebhookSubscriptionCollection([['hook' => $hook, 'url' => $repository->getHashedUrl()]]));
 
-    $time     = time();
-    $response = $webhookManager->call(new Request());
+    $time = time();
 
-    $scheduled = $cronService->getScheduledTasks();
+    $request = Request::create(
+        $repository->getHashedUrl(),
+        Request::METHOD_POST,
+        [],
+        [],
+        [],
+        ['HTTP_X_MYPARCEL_HOOK' => $hook],
+        json_encode([
+            'data' => [
+                'hooks' => [
+                    $useHeader ? [] : ['event' => $hook],
+                ],
+            ],
+        ])
+    );
+
+    $response = $webhookManager->call($request);
 
+    $scheduled = $cronService->getScheduledTasks();
     $timestamp = $scheduled->first()['timestamp'];
 
-    expect($response->getContent())
-        ->toBe('')
+    expect($response->getStatusCode())
+        ->toBe(Response::HTTP_ACCEPTED)
+        ->and($request->headers->get('x-myparcel-hook'))
+        ->toBe($hook)
         ->and($response->getStatusCode())
         ->toBe(Response::HTTP_ACCEPTED)
         ->and($scheduled->all())
@@ -48,5 +75,58 @@
         ->and($timestamp)
         ->toBeGreaterThanOrEqual($time - 10)
         ->and($timestamp)
-        ->toBeLessThanOrEqual($time + 10);
-})->with(WebhookSubscription::ALL);
+        ->toBeLessThanOrEqual($time + 10)
+        ->and($scheduled->first()['callback'])
+        ->toBe([$webhookManager, 'processWebhook'])
+        ->and($scheduled->first()['args'])
+        ->toBe([$request]);
+
+    $cronService->executeScheduledTask();
+
+    $calledHooks = $webhookManager->getCalledHooks();
+
+    expect($calledHooks)
+        ->toHaveLength(1)
+        ->and(Arr::first($calledHooks))
+        ->toBeInstanceOf($calledClass);
+})
+    ->with([
+        WebhookSubscription::SHIPMENT_STATUS_CHANGE => [
+            WebhookSubscription::SHIPMENT_STATUS_CHANGE,
+            ShipmentStatusChangeWebhook::class,
+        ],
+
+        WebhookSubscription::SHIPMENT_LABEL_CREATED => [
+            WebhookSubscription::SHIPMENT_LABEL_CREATED,
+            ShipmentLabelCreatedWebhook::class,
+        ],
+
+        WebhookSubscription::ORDER_STATUS_CHANGE => [
+            WebhookSubscription::ORDER_STATUS_CHANGE,
+            OrderStatusChangeWebhook::class,
+        ],
+
+        WebhookSubscription::SHOP_UPDATED => [
+            WebhookSubscription::SHOP_UPDATED,
+            ShopUpdatedWebhook::class,
+        ],
+
+        WebhookSubscription::SHOP_CARRIER_ACCESSIBILITY_UPDATED => [
+            WebhookSubscription::SHOP_CARRIER_ACCESSIBILITY_UPDATED,
+            ShopCarrierAccessibilityUpdatedWebhook::class,
+        ],
+
+        WebhookSubscription::SHOP_CARRIER_CONFIGURATION_UPDATED => [
+            WebhookSubscription::SHOP_CARRIER_CONFIGURATION_UPDATED,
+            ShopCarrierConfigurationUpdatedWebhook::class,
+        ],
+
+        WebhookSubscription::SUBSCRIPTION_CREATED_OR_UPDATED => [
+            WebhookSubscription::SUBSCRIPTION_CREATED_OR_UPDATED,
+            SubscriptionCreatedOrUpdatedWebhook::class,
+        ],
+    ])
+    ->with([
+        'no header' => [false],
+        'header'    => [true],
+    ]);