From e2ea98e0507475866d700123d3d26af3192c0d26 Mon Sep 17 00:00:00 2001 From: ted-selig-five9 <149825586+ted-selig-five9@users.noreply.github.com> Date: Tue, 6 Feb 2024 12:22:02 -0500 Subject: [PATCH 1/4] Update CloudTasksQueue.php use milliseconds to avoid duplicate task name --- src/CloudTasksQueue.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/CloudTasksQueue.php b/src/CloudTasksQueue.php index cd8da1d..b07242b 100644 --- a/src/CloudTasksQueue.php +++ b/src/CloudTasksQueue.php @@ -200,7 +200,7 @@ private function taskName(string $queueName, array $payload): string $this->config['project'], $this->config['location'], $queueName, - $displayName . '-' . $payload['uuid'] . '-' . Carbon::now()->getTimestamp(), + $displayName . '-' . $payload['uuid'] . '-' . Carbon::now()->getTimeStampMs(), ); } From a61b9e03e1742f2ab3cf191cbf87b9f42b2ef56e Mon Sep 17 00:00:00 2001 From: ted-selig-five9 <149825586+ted-selig-five9@users.noreply.github.com> Date: Tue, 6 Feb 2024 16:52:22 -0500 Subject: [PATCH 2/4] Update QueueTest.php fix it_adds_a_task_name_based_on_the_display_name --- tests/QueueTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/QueueTest.php b/tests/QueueTest.php index c68bac3..09ded08 100644 --- a/tests/QueueTest.php +++ b/tests/QueueTest.php @@ -495,7 +495,7 @@ public function it_adds_a_task_name_based_on_the_display_name() CloudTasksApi::assertTaskCreated(function (Task $task, string $queueName): bool { $uuid = \Safe\json_decode($task->getHttpRequest()->getBody(), true)['uuid']; - return $task->getName() === 'projects/my-test-project/locations/europe-west6/queues/barbequeue/tasks/Tests-Support-SimpleJob-' . $uuid . '-1685649757'; + return $task->getName() === 'projects/my-test-project/locations/europe-west6/queues/barbequeue/tasks/Tests-Support-SimpleJob-' . $uuid . '-168564975000'; }); } } From 9cfc05d3ea28386c643acbb2168c4f0a7cf6bbcb Mon Sep 17 00:00:00 2001 From: ted-selig-five9 <149825586+ted-selig-five9@users.noreply.github.com> Date: Tue, 6 Feb 2024 16:53:10 -0500 Subject: [PATCH 3/4] Update TaskHandlerTest.php fix retried_jobs_get_a_new_name --- tests/TaskHandlerTest.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/TaskHandlerTest.php b/tests/TaskHandlerTest.php index da2114c..5cc4292 100644 --- a/tests/TaskHandlerTest.php +++ b/tests/TaskHandlerTest.php @@ -499,11 +499,11 @@ public function retried_jobs_get_a_new_name() CloudTasksApi::assertCreatedTaskCount(2); CloudTasksApi::assertTaskCreated(function (Task $task): bool { [$timestamp] = array_reverse(explode('-', $task->getName())); - return $timestamp === '1685035628'; + return $timestamp === '1685035628000'; }); CloudTasksApi::assertTaskCreated(function (Task $task): bool { [$timestamp] = array_reverse(explode('-', $task->getName())); - return $timestamp === '1685035629'; + return $timestamp === '1685035629000'; }); } } From 4ca8104c68ff5e74b0dd52c2b188eeb6d1d11496 Mon Sep 17 00:00:00 2001 From: Marick van Tuil Date: Wed, 7 Feb 2024 20:19:26 +0100 Subject: [PATCH 4/4] Fix test --- tests/QueueTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/QueueTest.php b/tests/QueueTest.php index 09ded08..5338afe 100644 --- a/tests/QueueTest.php +++ b/tests/QueueTest.php @@ -495,7 +495,7 @@ public function it_adds_a_task_name_based_on_the_display_name() CloudTasksApi::assertTaskCreated(function (Task $task, string $queueName): bool { $uuid = \Safe\json_decode($task->getHttpRequest()->getBody(), true)['uuid']; - return $task->getName() === 'projects/my-test-project/locations/europe-west6/queues/barbequeue/tasks/Tests-Support-SimpleJob-' . $uuid . '-168564975000'; + return $task->getName() === 'projects/my-test-project/locations/europe-west6/queues/barbequeue/tasks/Tests-Support-SimpleJob-' . $uuid . '-1685649757000'; }); } }