Prevent already deleted tasks from being called again

Author: marickvantuil

.gitignore

@@ -2,3 +2,4 @@
 composer.lock
 .idea/
 .phpunit.result.cache
+.phpunit.cache

src/CloudTasksApi.php

@@ -13,7 +13,7 @@
  * @method static Task createTask(string $queueName, Task $task)
  * @method static void deleteTask(string $taskName)
  * @method static Task getTask(string $taskName)
- * @method static int|null getRetryUntilTimestamp(string $taskName)
+ * @method static int|null getRetryUntilTimestamp(Task $task)
  */
 class CloudTasksApi extends Facade
 {

src/CloudTasksApiConcrete.php

@@ -50,10 +50,8 @@ public function getTask(string $taskName): Task
         return $this->client->getTask($taskName);
     }
 
-    public function getRetryUntilTimestamp(string $taskName): ?int
+    public function getRetryUntilTimestamp(Task $task): ?int
     {
-        $task = $this->getTask($taskName);
-
         $attempt = $task->getFirstAttempt();
 
         if (!$attempt instanceof Attempt) {

src/CloudTasksApiContract.php

@@ -13,5 +13,5 @@ public function getRetryConfig(string $queueName): RetryConfig;
     public function createTask(string $queueName, Task $task): Task;
     public function deleteTask(string $taskName): void;
     public function getTask(string $taskName): Task;
-    public function getRetryUntilTimestamp(string $taskName): ?int;
+    public function getRetryUntilTimestamp(Task $task): ?int;
 }

src/CloudTasksApiFake.php

@@ -49,7 +49,7 @@ public function getTask(string $taskName): Task
     }
 
 
-    public function getRetryUntilTimestamp(string $taskName): ?int
+    public function getRetryUntilTimestamp(Task $task): ?int
     {
         return null;
     }

src/TaskHandler.php

@@ -2,6 +2,7 @@
 
 namespace Stackkit\LaravelGoogleCloudTasksQueue;
 
+use Google\ApiCore\ApiException;
 use Google\Cloud\Tasks\V2\CloudTasksClient;
 use Google\Cloud\Tasks\V2\RetryConfig;
 use Illuminate\Bus\Queueable;
@@ -122,6 +123,24 @@ private function handleTask(array $task): void
 
         $this->loadQueueRetryConfig($job);
 
+        $taskName = request()->header('X-Cloudtasks-Taskname');
+        $fullTaskName = $this->client->taskName(
+            $this->config['project'],
+            $this->config['location'],
+            $job->getQueue() ?: $this->config['queue'],
+            $taskName,
+        );
+
+        try {
+            $apiTask = CloudTasksApi::getTask($fullTaskName);
+        } catch (ApiException $e) {
+            if (in_array($e->getStatus(), ['NOT_FOUND', 'PRECONDITION_FAILED'])) {
+                abort(404);
+            }
+
+            throw $e;
+        }
+
         // If the task has a [X-CloudTasks-TaskRetryCount] header higher than 0, then
         // we know the job was created using an earlier version of the package. This
         // job does not have the attempts tracked internally yet.
@@ -138,20 +157,7 @@ private function handleTask(array $task): void
         // max retry duration has been set. If that duration
         // has passed, it should stop trying altogether.
         if ($job->attempts() > 0) {
-            $taskName = request()->header('X-Cloudtasks-Taskname');
-
-            if (!is_string($taskName)) {
-                throw new UnexpectedValueException('Expected task name to be a string.');
-            }
-
-            $fullTaskName = $this->client->taskName(
-                $this->config['project'],
-                $this->config['location'],
-                $job->getQueue() ?: $this->config['queue'],
-                $taskName,
-            );
-
-            $job->setRetryUntil(CloudTasksApi::getRetryUntilTimestamp($fullTaskName));
+            $job->setRetryUntil(CloudTasksApi::getRetryUntilTimestamp($apiTask));
         }
 
         $job->setAttempts($job->attempts() + 1);

tests/CloudTasksApiTest.php

@@ -184,7 +184,7 @@ public function test_get_retry_until_timestamp()
         // The queue max retry duration is 5 seconds. The max retry until timestamp is calculated from the
         // first attempt, so we expect it to be [timestamp first attempt] + 5 seconds.
         $expected = $createdTask->getFirstAttempt()->getDispatchTime()->getSeconds() + 5;
-        $actual = CloudTasksApi::getRetryUntilTimestamp($createdTask->getName());
+        $actual = CloudTasksApi::getRetryUntilTimestamp($createdTask);
         $this->assertSame($expected, $actual);
     }
 }