Move cancel current plan action to handle function for uninstall job,…

… solves #427
gnikyt · Apr 2, 2020 · c518ef8 · c518ef8
1 parent a71853d
commit c518ef8
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 24 deletions.
diff --git a/src/ShopifyApp/Messaging/Jobs/AppUninstalledJob.php b/src/ShopifyApp/Messaging/Jobs/AppUninstalledJob.php
@@ -8,6 +8,7 @@
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
+use Osiset\ShopifyApp\Actions\CancelCurrentPlan;
 use Osiset\ShopifyApp\Contracts\Objects\Values\ShopDomain;
 use Osiset\ShopifyApp\Contracts\Queries\Shop as IShopQuery;
 use Osiset\ShopifyApp\Contracts\Commands\Shop as IShopCommand;
@@ -36,48 +37,40 @@ class AppUninstalledJob implements ShouldQueue
      */
     protected $data;
 
-    /**
-     * Action for cancelling current plan.
-     *
-     * @var callable
-     */
-    protected $cancelCurrentPlanAction;
-
     /**
      * Create a new job instance.
      *
-     * @param ShopDomain   $domain                  The shop domain.
-     * @param stdClass     $data                    The webhook data (JSON decoded).
-     * @param callable     $cancelCurrentPlanAction Action for cancelling current plan.
+     * @param ShopDomain $domain  The shop domain.
+     * @param stdClass   $data   The webhook data (JSON decoded).
      *
      * @return self
      */
-    public function __construct(
-        ShopDomain $domain,
-        stdClass $data,
-        callable $cancelCurrentPlanAction
-    ) {
+    public function __construct(ShopDomain $domain, stdClass $data)
+    {
         $this->domain = $domain;
         $this->data = $data;
-        $this->cancelCurrentPlanAction = $cancelCurrentPlanAction;
     }
 
     /**
      * Execute the job.
      *
-     * @param IShopCommand $shopCommand The commands for shops.
-     * @param IShopQuery   $shopQuery   The querier for shops.
+     * @param IShopCommand      $shopCommand             The commands for shops.
+     * @param IShopQuery        $shopQuery               The querier for shops.
+     * @param CancelCurrentPlan $cancelCurrentPlanAction The action for cancelling the current plan.
      *
      * @return bool
      */
-    public function handle(IShopCommand $shopCommand, IShopQuery $shopQuery): bool
-    {
+    public function handle(
+        IShopCommand $shopCommand,
+        IShopQuery $shopQuery,
+        CancelCurrentPlan $cancelCurrentPlanAction
+    ): bool {
         // Get the shop
         $shop = $shopQuery->getByDomain($this->domain);
         $shopId = $shop->getId();
 
         // Cancel the current plan
-        call_user_func($this->cancelCurrentPlanAction, $shopId);
+        $cancelCurrentPlanAction($shopId);
 
         // Purge shop of token, plan, etc.
         $shopCommand->clean($shopId);

diff --git a/src/ShopifyApp/resources/jobs/AppUninstalledJob.php b/src/ShopifyApp/resources/jobs/AppUninstalledJob.php
@@ -2,6 +2,6 @@
 
 namespace App\Jobs;
 
-class AppUninstalledJob extends \Osiset\ShopifyApp\Jobs\AppUninstalledJob
+class AppUninstalledJob extends \Osiset\ShopifyApp\Messaging\Jobs\AppUninstalledJob
 {
 }
diff --git a/tests/Messaging/Jobs/AppUninstalledTest.php b/tests/Messaging/Jobs/AppUninstalledTest.php
@@ -40,8 +40,7 @@ public function testJobSoftDeletesShopAndCharges()
         // Run the job
         AppUninstalledJob::dispatchNow(
             $shop->getDomain(),
-            json_decode(file_get_contents(__DIR__.'/../../fixtures/app_uninstalled.json')),
-            $this->app->make(CancelCurrentPlan::class)
+            json_decode(file_get_contents(__DIR__.'/../../fixtures/app_uninstalled.json'))
         );
 
         // Refresh both models to see the changes