Fix scheduledEnqueueTimeUtc format

Author: Adrien Herbert

src/Queue.php

@@ -2,7 +2,6 @@
 
 namespace sagacorp\queue\azure;
 
-use Carbon\Carbon;
 use sagacorp\queue\azure\service\BrokerProperties;
 use sagacorp\queue\azure\service\Message;
 use sagacorp\queue\azure\service\ServiceBus;
@@ -15,10 +14,6 @@
  */
 class Queue extends \yii\queue\cli\Queue
 {
-    //region Constants
-    public const PRIORITY = 'yii-priority';
-    //endregion Constants
-
     //region Public Properties
     /**
      * @var ServiceBus
@@ -102,13 +97,10 @@ protected function pushMessage($message, $ttr, $delay, $priority): string
                 'contentType'      => 'application/vnd.microsoft.servicebus.yml',
                 'brokerProperties' => new BrokerProperties(
                     [
-                        'timeToLive'              => $ttr,
-                        'scheduledEnqueueTimeUtc' => Carbon::now()->addSeconds($delay),
+                        'timeToLive' => $ttr,
+                        'delay'      => $delay,
                     ]
                 ),
-                'properties'       => [
-                    self::PRIORITY => $priority ?? 'low',
-                ],
             ]
         );
 

src/service/BrokerProperties.php

@@ -13,10 +13,6 @@
  */
 class BrokerProperties extends Model
 {
-    //region Constants
-    public const AZURE_DATE_FORMAT = 'D, d M Y H:i:s T';
-    //endregion Constants
-
     //region Public Properties
     /**
      * The correlation ID.
@@ -139,6 +135,11 @@ public function getLockedUntilUtc(): ?Carbon
         return $this->lockedUntilUtc;
     }
 
+    public function setDelay(int $value): void
+    {
+        $this->setScheduledEnqueueTimeUtc(Carbon::now()->addSeconds($value)->setTimezone('UTC'));
+    }
+
     public function getScheduledEnqueueTimeUtc(): ?Carbon
     {
         return $this->scheduledEnqueueTimeUtc;
@@ -175,12 +176,12 @@ public function setScheduledEnqueueTimeUtc(Carbon|string $scheduledEnqueueTimeUt
     //region Protected Methods
     protected function azureDateToCarbon(string $date): ?Carbon
     {
-        return Carbon::createFromFormat(self::AZURE_DATE_FORMAT, $date, new CarbonTimeZone('GMT')) ?: null;
+        return Carbon::parse($date, 'UTC') ?: null;
     }
 
     protected function carbonToAzureDate(Carbon $carbon): string
     {
-        return $carbon->format(self::AZURE_DATE_FORMAT);
+        return $carbon->format(\DateTimeInterface::RFC7231);
     }
     //endregion Protected Methods
 }