Fixed message deleting in consumer

rosamarsky · rosamarsky · commit 697d9513b6e2 · 2018-10-30T16:34:01.000+02:00
diff --git a/pkg/dbal/DbalConsumer.php b/pkg/dbal/DbalConsumer.php
@@ -144,8 +144,12 @@ public function reject(Message $message, bool $requeue = false): void
         $this->deleteMessage($message->getDeliveryId());
     }
 
-    private function deleteMessage(?string $deliveryId): void
+    private function deleteMessage(string $deliveryId): void
     {
+        if (empty($deliveryId)) {
+            throw new \LogicException(sprintf('Expected record was removed but it is not. Delivery id: "%s"', $deliveryId));
+        }
+
         $this->getConnection()->delete(
             $this->getContext()->getTableName(),
             ['delivery_id' => $deliveryId],

Original file line number	Diff line number	Diff line change
`@@ -144,8 +144,12 @@ public function reject(Message $message, bool $requeue = false): void`
`144`	`144`	`$this->deleteMessage($message->getDeliveryId());`
`145`	`145`	`}`
`146`	`146`
`147`		`- private function deleteMessage(?string $deliveryId): void`
	`147`	`+ private function deleteMessage(string $deliveryId): void`
`148`	`148`	`{`
	`149`	`+ if (empty($deliveryId)) {`
	`150`	`+ throw new \LogicException(sprintf('Expected record was removed but it is not. Delivery id: "%s"', $deliveryId));`
	`151`	`+ }`
	`152`	`+`
`149`	`153`	`$this->getConnection()->delete(`
`150`	`154`	`$this->getContext()->getTableName(),`
`151`	`155`	`['delivery_id' => $deliveryId],`