From 626546eac215a7f2abdf822b9d3d22289a28e68d Mon Sep 17 00:00:00 2001
From: Dennis <dennissmink@gmail.com>
Date: Mon, 10 Feb 2020 16:00:10 +0100
Subject: [PATCH] Change to JS PHP unserialize to prevent DB queries

---
 resources/js/screens/recentJobs/index.vue     | 50 +++----------
 resources/js/screens/recentJobs/job-row.vue   | 71 +++++++++++++++++++
 resources/js/screens/recentJobs/job.vue       | 19 ++++-
 src/Http/Controllers/RecentJobsController.php |  4 --
 4 files changed, 98 insertions(+), 46 deletions(-)
 create mode 100644 resources/js/screens/recentJobs/job-row.vue

diff --git a/resources/js/screens/recentJobs/index.vue b/resources/js/screens/recentJobs/index.vue
index 4074e0c5..7d39c314 100644
--- a/resources/js/screens/recentJobs/index.vue
+++ b/resources/js/screens/recentJobs/index.vue
@@ -1,4 +1,6 @@
 <script type="text/ecmascript-6">
+    import JobRow from './job-row';
+
     export default {
         /**
          * The component's data.
@@ -15,6 +17,13 @@
             };
         },
 
+        /**
+         * Components
+         */
+        components: {
+            JobRow,
+        },
+
         /**
          * Prepare the component.
          */
@@ -166,46 +175,7 @@
                     </td>
                 </tr>
 
-                <tr v-for="job in jobs" :key="job.id">
-                    <td>
-                        <span v-if="job.status != 'failed'" :title="job.name">{{jobBaseName(job.name)}}</span>
-                        <router-link v-if="job.status === 'failed'" :title="job.name" :to="{ name: 'failed-jobs-preview', params: { jobId: job.id }}">
-                            {{ jobBaseName(job.name) }}
-                        </router-link>
-
-                        <small class="badge badge-secondary badge-sm" v-tooltip:top="`Delayed for ${readableHumanTimestamp(job.delayed)}`" v-if="job.delayed && (job.status == 'reserved' || job.status == 'pending')">Delayed</small>
-                        <br>
-
-                        <small class="text-muted">
-                            <router-link :to="{name: 'recent-jobs-preview', params: {jobId: job.id}}">View detail</router-link> |
-                            Queue: {{job.queue}}
-                            <span v-if="job.payload.tags.length">
-                                | Tags: {{ job.payload.tags && job.payload.tags.length ? job.payload.tags.slice(0,3).join(', ') : '' }}<span v-if="job.payload.tags.length > 3"> ({{ job.payload.tags.length - 3 }} more)</span>
-                            </span>
-                        </small>
-                    </td>
-                    <td class="table-fit">
-                        {{ readableTimestamp(job.payload.pushedAt) }}
-                    </td>
-
-                    <td class="table-fit">
-                        <span>{{ job.completed_at ? (job.completed_at - job.reserved_at).toFixed(2)+'s' : '-' }}</span>
-                    </td>
-
-                    <td class="text-right table-fit">
-                        <svg v-if="job.status == 'completed'" class="fill-success" viewBox="0 0 20 20" style="width: 1.5rem; height: 1.5rem;">
-                            <path d="M2.93 17.07A10 10 0 1 1 17.07 2.93 10 10 0 0 1 2.93 17.07zm12.73-1.41A8 8 0 1 0 4.34 4.34a8 8 0 0 0 11.32 11.32zM6.7 9.29L9 11.6l4.3-4.3 1.4 1.42L9 14.4l-3.7-3.7 1.4-1.42z"></path>
-                        </svg>
-
-                        <svg v-if="job.status == 'reserved' || job.status == 'pending'" class="fill-warning" viewBox="0 0 20 20" style="width: 1.5rem; height: 1.5rem;">
-                            <path d="M2.93 17.07A10 10 0 1 1 17.07 2.93 10 10 0 0 1 2.93 17.07zm12.73-1.41A8 8 0 1 0 4.34 4.34a8 8 0 0 0 11.32 11.32zM7 6h2v8H7V6zm4 0h2v8h-2V6z"/>
-                        </svg>
-
-                        <svg v-if="job.status == 'failed'" class="fill-danger" viewBox="0 0 20 20" style="width: 1.5rem; height: 1.5rem;">
-                            <path d="M2.93 17.07A10 10 0 1 1 17.07 2.93 10 10 0 0 1 2.93 17.07zm1.41-1.41A8 8 0 1 0 15.66 4.34 8 8 0 0 0 4.34 15.66zm9.9-8.49L11.41 10l2.83 2.83-1.41 1.41L10 11.41l-2.83 2.83-1.41-1.41L8.59 10 5.76 7.17l1.41-1.41L10 8.59l2.83-2.83 1.41 1.41z"/>
-                        </svg>
-                    </td>
-                </tr>
+                <tr v-for="job in jobs" :key="job.id" :job="job" is="job-row"></tr>
                 </tbody>
             </table>
 
diff --git a/resources/js/screens/recentJobs/job-row.vue b/resources/js/screens/recentJobs/job-row.vue
new file mode 100644
index 00000000..2b737fc4
--- /dev/null
+++ b/resources/js/screens/recentJobs/job-row.vue
@@ -0,0 +1,71 @@
+<script type="text/ecmascript-6">
+    import phpunserialize from 'phpunserialize'
+    import moment from 'moment-timezone';
+
+    export default {
+        props: {
+            job: {
+                type: Object,
+                required: true
+            }
+        },
+
+        computed: {
+            unserialized() {
+                return phpunserialize(this.job.payload.data.command);
+            },
+
+            delayed() {
+                if(this.unserialized && this.unserialized.delay){
+                    return moment.utc(this.unserialized.delay.date).fromNow(true);
+                }
+
+                return null;
+            },
+        },
+    }
+</script>
+<template>
+    <tr>
+        <td>
+            <span v-if="job.status != 'failed'" :title="job.name">{{jobBaseName(job.name)}}</span>
+            <router-link v-if="job.status === 'failed'" :title="job.name" :to="{ name: 'failed-jobs-preview', params: { jobId: job.id }}">
+                {{ jobBaseName(job.name) }}
+            </router-link>
+
+            {{ job.id }}
+
+            <small class="badge badge-secondary badge-sm" v-tooltip:top="`Delayed for ${delayed}`" v-if="delayed && (job.status == 'reserved' || job.status == 'pending')">Delayed</small>
+            <br>
+
+            <small class="text-muted">
+                <router-link :to="{name: 'recent-jobs-preview', params: {jobId: job.id}}">View detail</router-link> |
+                Queue: {{job.queue}}
+                <span v-if="job.payload.tags.length">
+                    | Tags: {{ job.payload.tags && job.payload.tags.length ? job.payload.tags.slice(0,3).join(', ') : '' }}<span v-if="job.payload.tags.length > 3"> ({{ job.payload.tags.length - 3 }} more)</span>
+                </span>
+            </small>
+        </td>
+        <td class="table-fit">
+            {{ readableTimestamp(job.payload.pushedAt) }}
+        </td>
+
+        <td class="table-fit">
+            <span>{{ job.completed_at ? (job.completed_at - job.reserved_at).toFixed(2)+'s' : '-' }}</span>
+        </td>
+
+        <td class="text-right table-fit">
+            <svg v-if="job.status == 'completed'" class="fill-success" viewBox="0 0 20 20" style="width: 1.5rem; height: 1.5rem;">
+                <path d="M2.93 17.07A10 10 0 1 1 17.07 2.93 10 10 0 0 1 2.93 17.07zm12.73-1.41A8 8 0 1 0 4.34 4.34a8 8 0 0 0 11.32 11.32zM6.7 9.29L9 11.6l4.3-4.3 1.4 1.42L9 14.4l-3.7-3.7 1.4-1.42z"></path>
+            </svg>
+
+            <svg v-if="job.status == 'reserved' || job.status == 'pending'" class="fill-warning" viewBox="0 0 20 20" style="width: 1.5rem; height: 1.5rem;">
+                <path d="M2.93 17.07A10 10 0 1 1 17.07 2.93 10 10 0 0 1 2.93 17.07zm12.73-1.41A8 8 0 1 0 4.34 4.34a8 8 0 0 0 11.32 11.32zM7 6h2v8H7V6zm4 0h2v8h-2V6z"/>
+            </svg>
+
+            <svg v-if="job.status == 'failed'" class="fill-danger" viewBox="0 0 20 20" style="width: 1.5rem; height: 1.5rem;">
+                <path d="M2.93 17.07A10 10 0 1 1 17.07 2.93 10 10 0 0 1 2.93 17.07zm1.41-1.41A8 8 0 1 0 15.66 4.34 8 8 0 0 0 4.34 15.66zm9.9-8.49L11.41 10l2.83 2.83-1.41 1.41L10 11.41l-2.83 2.83-1.41-1.41L8.59 10 5.76 7.17l1.41-1.41L10 8.59l2.83-2.83 1.41 1.41z"/>
+            </svg>
+        </td>
+    </tr>
+</template>
diff --git a/resources/js/screens/recentJobs/job.vue b/resources/js/screens/recentJobs/job.vue
index 76c14e24..87f45c31 100644
--- a/resources/js/screens/recentJobs/job.vue
+++ b/resources/js/screens/recentJobs/job.vue
@@ -1,5 +1,6 @@
 <script type="text/ecmascript-6">
     import phpunserialize from 'phpunserialize'
+    import moment from "moment-timezone";
 
     export default {
         components: {
@@ -16,6 +17,20 @@
             };
         },
 
+        computed: {
+            unserialized() {
+                return phpunserialize(this.job.payload.data.command);
+            },
+
+            delayed() {
+                if(this.unserialized && this.unserialized.delay){
+                    return moment.utc(this.unserialized.delay.date).local().format('YYYY-MM-DD HH:mm:ss');
+                }
+
+                return null;
+            },
+        },
+
 
         /**
          * Prepare the component.
@@ -85,9 +100,9 @@
                     <div class="col-md-2"><strong>Pushed At</strong></div>
                     <div class="col">{{ readableTimestamp(job.payload.pushedAt) }}</div>
                 </div>
-                <div class="row mb-2" v-if="job.delayed">
+                <div class="row mb-2" v-if="delayed">
                     <div class="col-md-2"><strong>Delayed Until</strong></div>
-                    <div class="col">{{readableTimestamp(job.delayed)}}</div>
+                    <div class="col">{{delayed}}</div>
                 </div>
                 <div class="row">
                     <div class="col-md-2"><strong>Completed At</strong></div>
diff --git a/src/Http/Controllers/RecentJobsController.php b/src/Http/Controllers/RecentJobsController.php
index fdf8d70c..6ed4d3d5 100644
--- a/src/Http/Controllers/RecentJobsController.php
+++ b/src/Http/Controllers/RecentJobsController.php
@@ -38,8 +38,6 @@ public function index(Request $request)
         $jobs = $this->jobs->getRecent($request->query('starting_at', -1))->map(function ($job) {
             $job->payload = json_decode($job->payload);
 
-            $job->delayed = strtotime(optional(unserialize($job->payload->data->command))->delay);
-
             return $job;
         })->values();
 
@@ -66,8 +64,6 @@ protected function decode($job)
     {
         $job->payload = json_decode($job->payload);
 
-        $job->delayed = strtotime(optional(unserialize($job->payload->data->command))->delay);
-
         return $job;
     }
 }