Set task scheduled if a delay has been set

Author: marickvantuil

dashboard/src/api.js

@@ -18,7 +18,7 @@ export async function fetchTasks(into, query = {}) {
 
     paused = true
     fetch(
-      `${import.meta.env.VITE_API_URL}/cloud-tasks-api/tasks?${queryParams.toString()}`
+      `${import.meta.env.VITE_API_URL || ''}/cloud-tasks-api/tasks?${queryParams.toString()}`
     )
       .then((response) => response.json())
       .then((response) => {

dashboard/src/components/Dashboard.vue

@@ -16,7 +16,7 @@ const dashboard = ref({
 
 const tsLoaded = Math.floor(Date.now() / 1000)
 
-fetch(`${import.meta.env.VITE_API_URL}/cloud-tasks-api/dashboard`)
+fetch(`${import.meta.env.VITE_API_URL || ''}/cloud-tasks-api/dashboard`)
   .then((response) => response.json())
   .then((response) => (dashboard.value = response))
 </script>

dashboard/src/components/Status.vue

@@ -28,10 +28,10 @@ function ucfirst(input) {
 .task-error {
   @apply bg-red-100/50 text-red-600/50
 }
-.task-queued {
+.task-queued, .task-scheduled {
   @apply bg-gray-100 text-gray-500
 }
 .task-running {
   @apply bg-blue-100 text-blue-800
 }
-</style>
+</style>

dashboard/src/components/Task.vue

@@ -11,11 +11,12 @@ const task = ref({
   status: 'loading',
 })
 
-fetch(`${import.meta.env.VITE_API_URL}/cloud-tasks-api/task/${route.params.uuid}`)
+fetch(`${import.meta.env.VITE_API_URL || ''}/cloud-tasks-api/task/${route.params.uuid}`)
   .then((response) => response.json())
   .then((response) => (task.value = response))
 
 const titles = {
+  scheduled: 'Scheduled',
   queued: 'Added to the queue',
   running: 'Running',
   successful: 'Successful',
@@ -47,6 +48,13 @@ const titles = {
                   >{{ task.queue }}</span
                 >
               </div>
+              <div v-if="event['scheduled_at']">
+                <span
+                    class="bg-gray-200 text-gray-800 text-xs font-medium mr-2 inline-block mb-1 px-1.5 py-0.5 rounded dark:bg-blue-200 dark:text-blue-800"
+                >
+                  Scheduled: {{ event['scheduled_at'] }} (UTC)
+                </span>
+              </div>
             </h3>
             <Popper
               :content="event.datetime"

src/CloudTasksQueue.php

@@ -122,7 +122,7 @@ protected function pushToCloudTasks($queue, $payload, $delay = 0)
 
         $createdTask = CloudTasksApi::createTask($queueName, $task);
 
-        event((new TaskCreated)->queue($queue)->task($createdTask));
+        event((new TaskCreated)->queue($queue)->task($task));
     }
 
     private function withUuid(string $payload): string

src/MonitoringService.php

@@ -33,17 +33,27 @@ public function addToMonitor(string $queue, Task $task): void
     {
         $metadata = new TaskMetadata();
         $metadata->payload = $this->getTaskBody($task);
-        $metadata->addEvent('queued', [
+
+        $data = [
             'queue' => $queue,
-        ]);
+        ];
+
+        if ($task->hasScheduleTime()) {
+            $status = 'scheduled';
+            $data['scheduled_at'] = $task->getScheduleTime()->toDateTime()->format('Y-m-d H:i:s');
+        } else {
+            $status = 'queued';
+        }
+
+        $metadata->addEvent($status, $data);
 
         DB::table('stackkit_cloud_tasks')
             ->insert([
                 'task_uuid' => $this->getTaskUuid($task),
                 'name' => $this->getTaskName($task),
                 'queue' => $queue,
                 'payload' =>  $this->getTaskBody($task),
-                'status' => 'queued',
+                'status' => $status,
                 'metadata' => $metadata->toJson(),
                 'created_at' => now()->utc(),
                 'updated_at' => now()->utc(),

tests/CloudTasksMonitoringTest.php

@@ -280,6 +280,31 @@ public function when_monitoring_is_disabled_jobs_will_not_be_added_to_the_monito
         $this->assertDatabaseCount((new StackkitCloudTask())->getTable(), 0);
     }
 
+    /**
+     * @test
+     */
+    public function when_a_job_is_scheduled_it_will_be_added_as_such()
+    {
+        // Arrange
+        CloudTasksApi::fake();
+        Carbon::setTestNow(now());
+        $tasksBefore = StackkitCloudTask::count();
+
+        $job = $this->dispatch((new SimpleJob())->delay(now()->addSeconds(10)));
+        $tasksAfter = StackkitCloudTask::count();
+
+        // Assert
+        $task = StackkitCloudTask::first();
+        $this->assertSame(0, $tasksBefore);
+        $this->assertSame(1, $tasksAfter);
+        $this->assertDatabaseHas((new StackkitCloudTask())->getTable(), [
+            'queue' => 'barbequeue',
+            'status' => 'scheduled',
+            'name' => SimpleJob::class,
+        ]);
+        $this->assertEquals(now()->addSeconds(10)->toDateTimeString(), $task->getEvents()[0]['scheduled_at']);
+    }
+
     /**
      * @test
      */