From 8330c0249c551aaa94fad5f09b2311299e8ce009 Mon Sep 17 00:00:00 2001 From: Jess Archer Date: Fri, 3 Nov 2023 16:25:30 +1000 Subject: [PATCH] Fix queued at timestamp --- src/Queries/Queues.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Queries/Queues.php b/src/Queries/Queues.php index d30b16de..88905157 100644 --- a/src/Queries/Queues.php +++ b/src/Queries/Queues.php @@ -82,9 +82,9 @@ public function __invoke(Interval $interval): Collection ->selectRaw('NULL AS `processed_at`') ->selectRaw('NULL AS `failed_at`') // Divide the data into buckets. - ->selectRaw('FLOOR(UNIX_TIMESTAMP(CONVERT_TZ(`date`, ?, @@session.time_zone)) / ?) AS `bucket`', [$now->format('P'), $secondsPerPeriod]) - ->where('date', '>=', $now->ceilSeconds($interval->totalSeconds / $maxDataPoints)->subSeconds((int) $interval->totalSeconds)) - ->whereNotNull('date') + ->selectRaw('FLOOR(UNIX_TIMESTAMP(CONVERT_TZ(`queued_at`, ?, @@session.time_zone)) / ?) AS `bucket`', [$now->format('P'), $secondsPerPeriod]) + ->where('queued_at', '>=', $now->ceilSeconds($interval->totalSeconds / $maxDataPoints)->subSeconds((int) $interval->totalSeconds)) + ->whereNotNull('queued_at') // Processing ->union(fn (Builder $query) => $query ->from('pulse_jobs')