Added support for withoutOverlapping, before- and afterCallbacks

Author: marickvantuil

src/TaskHandler.php

@@ -2,6 +2,9 @@
 
 namespace Stackkit\LaravelGoogleCloudScheduler;
 
+use Illuminate\Console\Scheduling\Schedule;
+use Illuminate\Container\Container;
+use Illuminate\Contracts\Console\Kernel;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Artisan;
 
@@ -10,12 +13,24 @@ class TaskHandler
     private $command;
     private $request;
     private $openId;
+    private $kernel;
+    private $schedule;
+    private $container;
 
-    public function __construct(Command $command, Request $request, OpenIdVerificator $openId)
-    {
+    public function __construct(
+        Command $command,
+        Request $request,
+        OpenIdVerificator $openId,
+        Kernel $kernel,
+        Schedule $schedule,
+        Container $container
+    ) {
         $this->command = $command;
         $this->request = $request;
         $this->openId = $openId;
+        $this->kernel = $kernel;
+        $this->schedule = $schedule;
+        $this->container = $container;
     }
 
     /**
@@ -27,9 +42,7 @@ public function handle()
 
         set_time_limit(0);
 
-        Artisan::call($this->command->captureWithoutArtisan());
-
-        $output = Artisan::output();
+        $output = $this->runCommand($this->command->captureWithoutArtisan());
 
         return $this->cleanOutput($output);
     }
@@ -50,6 +63,54 @@ private function authorizeRequest()
         $this->openId->guardAgainstInvalidOpenIdToken($decodedToken);
     }
 
+    private function runCommand($command)
+    {
+        if ($this->isScheduledCommand($command)) {
+            $scheduledCommand = $this->getScheduledCommand($command);
+
+            if ($scheduledCommand->withoutOverlapping && ! $scheduledCommand->mutex->create($scheduledCommand)) {
+                return null;
+            }
+
+            $scheduledCommand->callBeforeCallbacks($this->container);
+
+            Artisan::call($command);
+
+            $scheduledCommand->callAfterCallbacks($this->container);
+        } else {
+            Artisan::call($command);
+        }
+
+        return Artisan::output();
+    }
+
+    private function isScheduledCommand($command)
+    {
+        return !is_null($this->getScheduledCommand($command));
+    }
+
+    private function getScheduledCommand($command)
+    {
+        $events = $this->schedule->events();
+
+        foreach ($events as $event) {
+            $eventCommand = $this->commandWithoutArtisan($event->command);
+
+            if ($command === $eventCommand) {
+                return $event;
+            }
+        }
+
+        return null;
+    }
+
+    private function commandWithoutArtisan($command)
+    {
+        $parts = explode('artisan', $command);
+
+        return substr($parts[1], 2, strlen($parts[1]));
+    }
+
     private function cleanOutput($output)
     {
         return trim($output);

tests/TaskHandlerTest.php

@@ -4,6 +4,8 @@
 
 use Firebase\JWT\JWT;
 use Illuminate\Console\Scheduling\Schedule;
+use Illuminate\Container\Container;
+use Illuminate\Contracts\Console\Kernel;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Log;
 use Stackkit\LaravelGoogleCloudScheduler\CloudSchedulerException;
@@ -35,7 +37,9 @@ public function setUp(): void
             $this->fakeCommand,
             $this->request,
             $this->openId,
-            app(JWT::class)
+            app(Kernel::class),
+            app(Schedule::class),
+            Container::getInstance()
         );
     }