Fix dead instance query by allowing lastSuccessfulDeliver is null (#1204

)
MbinOrg · Nov 4, 2024 · 56b7d93 · 56b7d93
1 parent 8180d0e
commit 56b7d93
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/Entity/Instance.php b/src/Entity/Instance.php
@@ -100,6 +100,7 @@ public function getFailedDelivers(): int
 
     public function isDead(): bool
     {
-        return $this->getLastSuccessfulDeliver() < self::getDateBeforeDead() && $this->getFailedDelivers() >= self::NUMBER_OF_FAILED_DELIVERS_UNTIL_DEAD;
+        return ($this->getLastSuccessfulDeliver() < self::getDateBeforeDead() || null === $this->getLastSuccessfulDeliver())
+            && $this->getFailedDelivers() >= self::NUMBER_OF_FAILED_DELIVERS_UNTIL_DEAD;
     }
 }
diff --git a/src/Repository/InstanceRepository.php b/src/Repository/InstanceRepository.php
@@ -84,7 +84,7 @@ public function getDeadInstances(): array
     {
         return $this->createQueryBuilder('i')
             ->where('i.failedDelivers >= :numToDead')
-            ->andWhere('i.lastSuccessfulDeliver < :dateBeforeDead')
+            ->andWhere('i.lastSuccessfulDeliver < :dateBeforeDead OR i.lastSuccessfulDeliver IS NULL')
             ->setParameter('numToDead', Instance::NUMBER_OF_FAILED_DELIVERS_UNTIL_DEAD)
             ->setParameter('dateBeforeDead', Instance::getDateBeforeDead())
             ->orderBy('i.id')