wip

Author: marickvantuil

src/CloudTasksQueue.php

@@ -111,41 +111,16 @@ protected function pushToCloudTasks($queue, $payload, $delay = 0)
 
         $payload = (array) json_decode($payload, true);
 
-        $task = new Task([
-            'name' => $this->taskName($queue, $payload),
-        ]);
+        $task = tap(new Task())->setName($this->taskName($queue, $payload));
 
-        $payload = $this->withAttempts($payload);
-        $payload = $this->withQueueName($payload, $queue);
-        $payload = $this->withTaskName($payload, $task->getName());
-        $payload = $this->withConnectionName($payload, $this->getConnectionName());
-        $payload = $this->withSecurityKey($payload);
-
-        if (! empty($this->config['app_engine'])) {
-            $path = \Safe\parse_url(route('cloud-tasks.handle-task'), PHP_URL_PATH);
-
-            $appEngineRequest = new AppEngineHttpRequest();
-            $appEngineRequest->setRelativeUri($path);
-            $appEngineRequest->setHttpMethod(HttpMethod::POST);
-            $appEngineRequest->setBody(json_encode($payload));
-            if (! empty($service = $this->config['app_engine_service'])) {
-                $routing = new AppEngineRouting();
-                $routing->setService($service);
-                $appEngineRequest->setAppEngineRouting($routing);
-            }
-            $task->setAppEngineHttpRequest($appEngineRequest);
-        } else {
-            $httpRequest = new HttpRequest();
-            $httpRequest->setUrl($this->getHandler());
-            $httpRequest->setHttpMethod(HttpMethod::POST);
-
-            $httpRequest->setBody(json_encode($payload));
+        $payload = $this->enrichPayloadWithInternalData(
+            payload: $payload,
+            taskName: $task->getName(),
+            connectionName: $this->getConnectionName(),
+            queueName: $queue,
+        );
 
-            $token = new OidcToken;
-            $token->setServiceAccountEmail($this->config['service_account_email']);
-            $httpRequest->setOidcToken($token);
-            $task->setHttpRequest($httpRequest);
-        }
+        $this->addPayloadToTask($payload, $task);
 
         // The deadline for requests sent to the app. If the app does not respond by
         // this deadline then the request is cancelled and the attempt is marked as
@@ -190,52 +165,60 @@ private function sanitizeTaskName(string $taskName): string
         return trim($sanitizedName, '-');
     }
 
-    private function withAttempts(array $payload): array
+    private function enrichPayloadWithInternalData(
+        array $payload,
+        string $queueName,
+        string $taskName,
+        string $connectionName,
+    ): array
     {
-        if (! isset($payload['internal']['attempts'])) {
-            $payload['internal']['attempts'] = 0;
-        }
+        $payload['internal'] = [
+            'attempts' => $payload['internal']['attempts'] ?? 0,
+            'queue' => $queueName,
+            'taskName' => $taskName,
+            'connection' => $connectionName,
+        ];
 
         return $payload;
     }
 
-    private function withQueueName(array $payload, string $queueName): array
+    public function addPayloadToTask(array $payload, Task $task): Task
     {
-        $payload['internal']['queue'] = $queueName;
-
-        return $payload;
-    }
+        if (!empty($this->config['app_engine'])) {
+            $path = \Safe\parse_url(route('cloud-tasks.handle-task'), PHP_URL_PATH);
 
-    private function withTaskName(array $payload, string $taskName): array
-    {
-        $payload['internal']['taskName'] = $taskName;
+            $appEngineRequest = new AppEngineHttpRequest();
+            $appEngineRequest->setRelativeUri($path);
+            $appEngineRequest->setHttpMethod(HttpMethod::POST);
+            $appEngineRequest->setBody(json_encode($payload));
 
-        return $payload;
-    }
+            if (!empty($service = $this->config['app_engine_service'])) {
+                $routing = new AppEngineRouting();
+                $routing->setService($service);
+                $appEngineRequest->setAppEngineRouting($routing);
+            }
 
-    private function withConnectionName(array $payload, string $connectionName): array
-    {
-        $payload['internal']['connection'] = $connectionName;
+            $task->setAppEngineHttpRequest($appEngineRequest);
+        } else {
+            $httpRequest = new HttpRequest();
+            $httpRequest->setUrl($this->getHandler());
 
-        return $payload;
-    }
+            $httpRequest->setBody(json_encode($payload));
+            $httpRequest->setHttpMethod(HttpMethod::POST);
 
-    private function withSecurityKey(array $payload): array
-    {
-        $payload['internal']['securityKey'] = encrypt($this->config['security_key'] ?? $payload['uuid']);
+            $token = new OidcToken;
+            $token->setServiceAccountEmail($this->config['service_account_email']);
+            $httpRequest->setOidcToken($token);
+            $task->setHttpRequest($httpRequest);
+        }
 
-        return $payload;
+        return $task;
     }
 
-    /**
-     * Pop the next job off of the queue.
-     *
-     * @param  string|null  $queue
-     * @return \Illuminate\Contracts\Queue\Job|null
-     */
     public function pop($queue = null)
     {
-        //
+        // It is not possible to pop a job from the queue.
+        return null;
     }
 
     public function delete(CloudTasksJob $job): void

tests/TestCase.php

@@ -70,8 +70,8 @@ protected function getPackageProviders($app)
      */
     protected function defineDatabaseMigrations()
     {
-        $this->loadMigrationsFrom(__DIR__.'/../migrations');
-        $this->loadMigrationsFrom(__DIR__.'/../vendor/orchestra/testbench-core/laravel/migrations');
+//        $this->loadMigrationsFrom(__DIR__.'/../migrations');
+//        $this->loadMigrationsFrom(__DIR__.'/../vendor/orchestra/testbench-core/laravel/migrations');
     }
 
     /**