@@ -13,55 +13,61 @@ abstract public function getContext(): DbalContext;
1313
1414 abstract public function getConnection (): Connection ;
1515
16- protected function fetchMessage (array $ queues ): ?array
16+ protected function fetchMessage (array $ queues, string $ deliveryId , int $ redeliveryDelay ): ?array
1717 {
18- $ now = time ();
18+ try {
19+ $ now = time ();
1920
20- $ result = $ this ->getConnection ()->createQueryBuilder ()
21- ->select ('* ' )
22- ->from ($ this ->getContext ()->getTableName ())
23- ->andWhere ('delivery_id IS NULL ' )
24- ->andWhere ('delayed_until IS NULL OR delayed_until <= :delayedUntil ' )
25- ->andWhere ('queue IN (:queues) ' )
26- ->addOrderBy ('priority ' , 'desc ' )
27- ->addOrderBy ('published_at ' , 'asc ' )
28- ->setParameter ('delayedUntil ' , $ now , \Doctrine \DBAL \ParameterType::INTEGER )
29- ->setParameter ('queues ' , array_values ($ queues ), \Doctrine \DBAL \Connection::PARAM_STR_ARRAY )
30- ->setMaxResults (1 )
31- ->execute ()
32- ->fetch ()
33- ;
21+ $ this ->getConnection ()->beginTransaction ();
3422
35- return $ result ?: null ;
36- }
23+ $ message = $ this ->getConnection ()->createQueryBuilder ()
24+ ->select ('* ' )
25+ ->from ($ this ->getContext ()->getTableName ())
26+ ->andWhere ('delivery_id IS NULL ' )
27+ ->andWhere ('delayed_until IS NULL OR delayed_until <= :delayedUntil ' )
28+ ->andWhere ('queue IN (:queues) ' )
29+ ->addOrderBy ('priority ' , 'desc ' )
30+ ->addOrderBy ('published_at ' , 'asc ' )
31+ ->setParameter ('delayedUntil ' , $ now , \Doctrine \DBAL \ParameterType::INTEGER )
32+ ->setParameter ('queues ' , array_values ($ queues ), \Doctrine \DBAL \Connection::PARAM_STR_ARRAY )
33+ ->setMaxResults (1 )
34+ ->execute ()
35+ ->fetch ()
36+ ;
3737
38- protected function markMessageAsDeliveredToConsumer (array $ message , string $ deliveryId ): void
39- {
40- $ now = time ();
41- $ redeliveryDelay = $ this ->getRedeliveryDelay () / 1000 ; // milliseconds to seconds
38+ if (!$ message ) {
39+ $ this ->getConnection ()->commit ();
4240
43- $ this ->getConnection ()->createQueryBuilder ()
44- ->andWhere ('id = :id ' )
45- ->update ($ this ->getContext ()->getTableName ())
46- ->set ('delivery_id ' , ':deliveryId ' )
47- ->set ('redeliver_after ' , ':redeliverAfter ' )
48- ->setParameter ('id ' , $ message ['id ' ], Type::GUID )
49- ->setParameter ('deliveryId ' , $ deliveryId , Type::STRING )
50- ->setParameter ('redeliverAfter ' , $ now + $ redeliveryDelay , Type::BIGINT )
51- ->execute ()
52- ;
53- }
41+ return null ;
42+ }
5443
55- protected function getMessageByDeliveryId (string $ deliveryId ): array
56- {
57- return $ this ->getConnection ()->createQueryBuilder ()
58- ->select ('* ' )
59- ->from ($ this ->getContext ()->getTableName ())
60- ->andWhere ('delivery_id = :deliveryId ' )
61- ->setParameter ('deliveryId ' , $ deliveryId , Type::STRING )
62- ->setMaxResults (1 )
63- ->execute ()
64- ->fetch ()
65- ;
44+ // mark message as delivered to consumer
45+ $ this ->getConnection ()->createQueryBuilder ()
46+ ->andWhere ('id = :id ' )
47+ ->update ($ this ->getContext ()->getTableName ())
48+ ->set ('delivery_id ' , ':deliveryId ' )
49+ ->set ('redeliver_after ' , ':redeliverAfter ' )
50+ ->setParameter ('id ' , $ message ['id ' ], Type::GUID )
51+ ->setParameter ('deliveryId ' , $ deliveryId , Type::STRING )
52+ ->setParameter ('redeliverAfter ' , $ now + $ redeliveryDelay , Type::BIGINT )
53+ ->execute ();
54+
55+ $ this ->getConnection ()->commit ();
56+
57+ $ deliveredMessage = $ this ->getConnection ()->createQueryBuilder ()
58+ ->select ('* ' )
59+ ->from ($ this ->getContext ()->getTableName ())
60+ ->andWhere ('delivery_id = :deliveryId ' )
61+ ->setParameter ('deliveryId ' , $ deliveryId , Type::STRING )
62+ ->setMaxResults (1 )
63+ ->execute ()
64+ ->fetch ();
65+
66+ return $ deliveredMessage ?: null ;
67+ } catch (\Exception $ e ) {
68+ $ this ->getConnection ()->rollBack ();
69+
70+ throw $ e ;
71+ }
6672 }
6773}
0 commit comments