From ee9530d03f88c15c35d107036b73dc34eb66a536 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Mon, 9 Sep 2024 10:40:05 +0200
Subject: [PATCH] More conditions to find staled workflows

---
 .../Workflow/EntityWorkflowRepository.php     | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Repository/Workflow/EntityWorkflowRepository.php b/src/Bundle/ChillMainBundle/Repository/Workflow/EntityWorkflowRepository.php
index b6e2e0814..62282fbe9 100644
--- a/src/Bundle/ChillMainBundle/Repository/Workflow/EntityWorkflowRepository.php
+++ b/src/Bundle/ChillMainBundle/Repository/Workflow/EntityWorkflowRepository.php
@@ -198,13 +198,28 @@ class EntityWorkflowRepository implements ObjectRepository
         return $this->repository->findOneBy($criteria);
     }
 
-    public function findWorkflowsWithoutFinalStepAndOlderThan(\DateTimeImmutable $olderThanDate)
+    /**
+     * Finds workflows that are not finalized and are older than the specified date.
+     *
+     * @param \DateTimeImmutable $olderThanDate the date to compare against
+     *
+     * @return list<int> the list of workflow IDs that meet the criteria
+     */
+    public function findWorkflowsWithoutFinalStepAndOlderThan(\DateTimeImmutable $olderThanDate): array
     {
         $qb = $this->repository->createQueryBuilder('sw');
 
         $qb->select('sw.id')
+            // only the workflow which are not finalized
             ->where('NOT EXISTS (SELECT 1 FROM chill_main_entity_workflow_step ews WHERE ews.isFinal = TRUE AND ews.entityWorkflow = sw.id)')
-            ->andWhere(':olderThanDate > ALL (SELECT ews.transitionAt FROM chill_main_entity_workflow_step ews WHERE ews.transitionAt IS NOT NULL AND ews.entityWorkflow = sw.id)')
+            ->andWhere(
+                $qb->expr()->orX(
+                    // only the workflow where all the last transition is older than transitionAt
+                    ':olderThanDate > ALL (SELECT ews.transitionAt FROM chill_main_entity_workflow_step ews WHERE ews.transitionAt IS NOT NULL AND ews.entityWorkflow = sw.id)',
+                    // or the workflow which have only the initial step, with no transition
+                    '1 = (SELECT COUNT(ews.id) FROM chill_main_entity_workflow_step ews WHERE ews.step = :initial AND ews.transitionAt IS NULL AND ews.createdAt < :olderThanDate AND ews.entityWorkflow = sw.id)',
+                )
+            )
             ->andWhere('sw.createdAt < :olderThanDate')
             ->setParameter('olderThanDate', $olderThanDate);