SCENTRE-6184 Republish queue in initial status

stanislav.kovin · Tekill · commit 0aa5dfc91c3c · 2020-03-26T14:18:36.000+03:00
diff --git a/src/Entity/QueueRepository.php b/src/Entity/QueueRepository.php
@@ -73,17 +73,27 @@ public function getToRepublish(int $limit, ?int $offset = null): array
             ->where(
                 $qb->expr()->andX(
                     $qb->expr()->in('queue.status', ':statuses'),
-                    $qb->expr()->eq('queue.isDeleted', ':not_deleted'),
                     $qb->expr()->lte('queue.scheduledAt', ':now')
                 )
             )
+            ->orWhere(
+                $qb->expr()->andX(
+                    $qb->expr()->eq('queue.status', ':initial_status'),
+                    $qb->expr()->lte('queue.createdAt', ':from_created_at')
+                )
+            )
+            ->andWhere(
+                $qb->expr()->eq('queue.isDeleted', ':not_deleted')
+            )
             ->setParameters(
                 [
                     'statuses' => [
                         QueueEntityMappedSuperclass::STATUS_WAITING,
                         QueueEntityMappedSuperclass::STATUS_SCHEDULED,
                     ],
                     'now' => new DateTime(),
+                    'initial_status' => QueueEntityMappedSuperclass::STATUS_INITIAL,
+                    'from_created_at' => (new DateTime())->modify('-5 minute'),
                 ]
             )
             ->setParameter('not_deleted', false, PDO::PARAM_BOOL)

Original file line number	Diff line number	Diff line change
`@@ -73,17 +73,27 @@ public function getToRepublish(int $limit, ?int $offset = null): array`
`73`	`73`	`->where(`
`74`	`74`	`$qb->expr()->andX(`
`75`	`75`	`$qb->expr()->in('queue.status', ':statuses'),`
`76`		`- $qb->expr()->eq('queue.isDeleted', ':not_deleted'),`
`77`	`76`	`$qb->expr()->lte('queue.scheduledAt', ':now')`
`78`	`77`	`)`
`79`	`78`	`)`
	`79`	`+ ->orWhere(`
	`80`	`+ $qb->expr()->andX(`
	`81`	`+ $qb->expr()->eq('queue.status', ':initial_status'),`
	`82`	`+ $qb->expr()->lte('queue.createdAt', ':from_created_at')`
	`83`	`+ )`
	`84`	`+ )`
	`85`	`+ ->andWhere(`
	`86`	`+ $qb->expr()->eq('queue.isDeleted', ':not_deleted')`
	`87`	`+ )`
`80`	`88`	`->setParameters(`
`81`	`89`	`[`
`82`	`90`	`'statuses' => [`
`83`	`91`	`QueueEntityMappedSuperclass::STATUS_WAITING,`
`84`	`92`	`QueueEntityMappedSuperclass::STATUS_SCHEDULED,`
`85`	`93`	`],`
`86`	`94`	`'now' => new DateTime(),`
	`95`	`+ 'initial_status' => QueueEntityMappedSuperclass::STATUS_INITIAL,`
	`96`	`+ 'from_created_at' => (new DateTime())->modify('-5 minute'),`
`87`	`97`	`]`
`88`	`98`	`)`
`89`	`99`	`->setParameter('not_deleted', false, PDO::PARAM_BOOL)`