From 596784a8d9eb35bf378f5d5163fef609672946d5 Mon Sep 17 00:00:00 2001
From: Hugo Heneault <hugo@ownweb.fr>
Date: Mon, 24 Jan 2022 08:02:05 +0100
Subject: [PATCH] Add webhookId to Webhooks

---
 .gitignore                                 |  1 +
 src/Contracts/Objects/Values/WebhookId.php | 12 +++++++++++
 src/Contracts/WebhookJob.php               | 22 +++++++++++++++++++++
 src/Messaging/Jobs/AppUninstalledJob.php   | 23 +++++++++++++++-------
 src/Traits/WebhookController.php           |  1 +
 5 files changed, 52 insertions(+), 7 deletions(-)
 create mode 100644 src/Contracts/Objects/Values/WebhookId.php
 create mode 100644 src/Contracts/WebhookJob.php

diff --git a/.gitignore b/.gitignore
index bf29a8e0..da34317b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 composer.lock
 .php-cs-fixer.cache
 .phpunit.result.cache
+.idea
diff --git a/src/Contracts/Objects/Values/WebhookId.php b/src/Contracts/Objects/Values/WebhookId.php
new file mode 100644
index 00000000..89c3f350
--- /dev/null
+++ b/src/Contracts/Objects/Values/WebhookId.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace Osiset\ShopifyApp\Contracts\Objects\Values;
+
+use Funeralzone\ValueObjects\ValueObject;
+
+/**
+ * Webhook ID's value object.
+ */
+interface WebhookId extends ValueObject
+{
+}
diff --git a/src/Contracts/WebhookJob.php b/src/Contracts/WebhookJob.php
new file mode 100644
index 00000000..473cfee3
--- /dev/null
+++ b/src/Contracts/WebhookJob.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace Osiset\ShopifyApp\Contracts;
+
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Osiset\ShopifyApp\Contracts\Objects\Values\WebhookId;
+use Osiset\ShopifyApp\Objects\Values\ShopDomain;
+use stdClass;
+
+interface WebhookJob extends ShouldQueue
+{
+    /**
+     * Create a new job instance.
+     *
+     * @param ShopDomain|string $shopId    The shop Domain.
+     * @param WebhookId|string  $webhookId The webhooks ID.
+     * @param stdClass   $data      The webhook payload.
+     *
+     * @return void
+     */
+    public function __construct(string $shopId, string $webhookId, stdClass $data);
+}
diff --git a/src/Messaging/Jobs/AppUninstalledJob.php b/src/Messaging/Jobs/AppUninstalledJob.php
index c973e69c..34c2085a 100644
--- a/src/Messaging/Jobs/AppUninstalledJob.php
+++ b/src/Messaging/Jobs/AppUninstalledJob.php
@@ -9,7 +9,9 @@
 use Illuminate\Queue\SerializesModels;
 use Osiset\ShopifyApp\Actions\CancelCurrentPlan;
 use Osiset\ShopifyApp\Contracts\Commands\Shop as IShopCommand;
+use Osiset\ShopifyApp\Contracts\Objects\Values\WebhookId;
 use Osiset\ShopifyApp\Contracts\Queries\Shop as IShopQuery;
+use Osiset\ShopifyApp\Contracts\WebhookJob;
 use Osiset\ShopifyApp\Objects\Values\ShopDomain;
 use Osiset\ShopifyApp\Util;
 use stdClass;
@@ -17,7 +19,7 @@
 /**
  * Webhook job responsible for handling when the app is uninstalled.
  */
-class AppUninstalledJob implements ShouldQueue
+class AppUninstalledJob implements WebhookJob
 {
     use Dispatchable;
     use InteractsWithQueue;
@@ -30,26 +32,33 @@ class AppUninstalledJob implements ShouldQueue
      * @var ShopDomain|string
      */
     protected $domain;
-
     /**
      * The webhook data.
      *
      * @var object
      */
     protected $data;
+    /**
+     * The webhook id
+     *
+     * @var WebhookId|string
+     */
+    protected $webhookId;
 
     /**
      * Create a new job instance.
      *
-     * @param string   $domain The shop domain.
-     * @param stdClass $data   The webhook data (JSON decoded).
+     * @param ShopDomain|string $shopId    The shop Domain.
+     * @param WebhookId|string  $webhookId The webhooks ID.
+     * @param stdClass          $data      The webhook data (JSON decoded).
      *
      * @return void
      */
-    public function __construct(string $domain, stdClass $data)
+    public function __construct(string $domain, string $webhookId, stdClass $data)
     {
         $this->domain = $domain;
         $this->data = $data;
+        $this->webhookId = $webhookId;
     }
 
     /**
@@ -62,8 +71,8 @@ public function __construct(string $domain, stdClass $data)
      * @return bool
      */
     public function handle(
-        IShopCommand $shopCommand,
-        IShopQuery $shopQuery,
+        IShopCommand      $shopCommand,
+        IShopQuery        $shopQuery,
         CancelCurrentPlan $cancelCurrentPlanAction
     ): bool {
         // Convert the domain
diff --git a/src/Traits/WebhookController.php b/src/Traits/WebhookController.php
index 171307f5..28e04b82 100644
--- a/src/Traits/WebhookController.php
+++ b/src/Traits/WebhookController.php
@@ -28,6 +28,7 @@ public function handle(string $type, Request $request): ResponseResponse
 
         $jobClass::dispatch(
             $request->header('x-shopify-shop-domain'),
+            $request->header('x-shopify-webhook-id'),
             $jobData
         )->onQueue(Util::getShopifyConfig('job_queues')['webhooks']);