Queue summary for ohdear

Author: rick-bongers

src/Controllers/ToolsController.php

@@ -11,26 +11,37 @@ class ToolsController extends Controller
 {
     public function ohdear(QueueSummary $queueSummary): JsonResponse
     {
+        $results = $queueSummary->all();
+        $treshold = 100;
+
         return response()->json([
             'finishedAt' => now()->timestamp,
-            'checkResults' => $queueSummary->all()->map(function ($queue) {
+            'checkResults' => $results->map(function ($queue) use ($treshold) {
                 $name = $queue[0]->queue;
                 $count = $queue->sum('count');
-                $status = $count > 100 ? 'warning' : 'ok';
+                $status = $count > $treshold ? 'warning' : 'ok';
+                $notificationMessage = 'Queue is fine';
+
+                if ($status === 'warning') {
+                    $notificationMessage = "Queue ($name) seems to be filling up";
+                }
 
                 return [
                     'name' => "Queue $name",
-                    'label' => "queue",
+                    'label' => $name,
                     'status' => $status,
-                    'notificationMessage' => "Queue ($name) seems to be filling up",
-                    'shortSummary' => "$count jobs",
-                    'meta' => $queue->map(function ($event) {
-                        $eventName = str_replace('\\\\', '\\', (trim($event->event, '"')));
-
-                        return [
-                            'event' => $eventName,
-                            'count' => $event->count,
-                        ];
+                    'notificationMessage' => $notificationMessage,
+                    'shortSummary' => "$count / $treshold jobs",
+                    'meta' => $queue->mapWithKeys(function ($event) {
+                        if (isset($event->event)) {
+                            $eventName = str_replace('\\\\', '\\', (trim($event->event, '"')));
+
+                            return [
+                                $eventName => $event->count,
+                            ];
+                        }
+
+                        return [];
                     })
                 ];
             }),

src/Services/Queue/DatabaseQueueService.php

@@ -6,14 +6,17 @@
 use Illuminate\Support\Facades\DB;
 use Programic\Tools\Contracts\QueueSummary;
 
-class DatabaseQueueService implements QueueSummary
+class DatabaseQueueService extends QueueService implements QueueSummary
 {
     public function all(): Collection
     {
-        return DB::table('queue_jobs')
-            ->select(DB::raw('COUNT(0) as count, queue, JSON_EXTRACT(payload, "$.displayName") as event'))
-            ->groupByRaw('queue, JSON_EXTRACT(payload, "$.displayName")')
-            ->get()
-            ->groupBy('queue');
+        return $this->format(
+            DB::table('queue_jobs')
+                ->select(DB::raw('COUNT(0) as count, queue, JSON_EXTRACT(payload, "$.displayName") as event'))
+                ->where('available_at', '>', DB::raw('UNIX_TIMESTAMP(NOW())'))
+                ->groupByRaw('queue, JSON_EXTRACT(payload, "$.displayName")')
+                ->get()
+                ->groupBy('queue')
+        );
     }
 }

src/Services/Queue/QueueService.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace Programic\Tools\Services\Queue;
+
+use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\DB;
+use Programic\Tools\Contracts\QueueSummary;
+
+abstract class QueueService
+{
+    public function format(Collection $items): Collection
+    {
+        if ($items->count() > 0) {
+            return $items;
+        }
+
+        $stdClass = new \StdClass();
+        $stdClass->count = 0;
+        $stdClass->queue = 'default';
+
+        return collect([
+            'queue' => collect([
+                $stdClass,
+            ]),
+        ]);
+    }
+}

src/Services/Queue/RedisQueueService.php

@@ -6,7 +6,7 @@
 use Illuminate\Support\Facades\DB;
 use Programic\Tools\Contracts\QueueSummary;
 
-class RedisQueueService implements QueueSummary
+class RedisQueueService extends QueueService implements QueueSummary
 {
     public function all(): Collection
     {