Merge pull request #44 from DmitryFurs/fix-broken-cron-job-count-aggr…

…egator Fix BrokenCronJobCountAggregator
run-as-root · Nov 7, 2024 · d092414 · d092414
2 parents 89e3241 + 7007200
commit d092414
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/Test/Unit/Aggregator/Cronjob/BrokenCronJobCountAggregatorTest.php b/Test/Unit/Aggregator/Cronjob/BrokenCronJobCountAggregatorTest.php
@@ -43,18 +43,18 @@ public function testAggregate()
     {
         $this->collection
             ->expects($this->at(0))
-            ->method('addFilter')
+            ->method('addFieldToFilter')
             ->with(...['status', 'pending'])
             ->willReturn($this->collection);
         $this->collection
             ->expects($this->at(1))
-            ->method('addFilter')
-            ->with(...['executed_at', 'NULL', 'IS NOT'])
+            ->method('addFieldToFilter')
+            ->with(...['executed_at', ['notnull' => true]])
             ->willReturn($this->collection);
         $this->collection
             ->expects($this->at(2))
-            ->method('addFilter')
-            ->with(...['finished_at', 'NULL', 'IS'])
+            ->method('addFieldToFilter')
+            ->with(...['finished_at', ['null' => true]])
             ->willReturn($this->collection);
 
         $this->collection

diff --git a/Test/Unit/Aggregator/Cronjob/CronJobCountAggregatorTest.php b/Test/Unit/Aggregator/Cronjob/CronJobCountAggregatorTest.php
@@ -27,7 +27,7 @@ class CronJobCountAggregatorTest extends TestCase
     /** @var MockObject|Collection */
     private $collection;
 
-    /** @var BrokenCronJobCountAggregator */
+    /** @var CronJobCountAggregator */
     private $sut;
 
     public function setUp(): void

diff --git a/src/Aggregator/CronJob/BrokenCronJobCountAggregator.php b/src/Aggregator/CronJob/BrokenCronJobCountAggregator.php
@@ -47,9 +47,9 @@ public function aggregate(): bool
     {
         /** @var Collection $collection */
         $collection = $this->cronCollectionFactory->create();
-        $collection->addFilter('status', Schedule::STATUS_PENDING)
-            ->addFilter('executed_at', 'NULL', 'IS NOT')
-            ->addFilter('finished_at', 'NULL', 'IS');
+        $collection->addFieldToFilter('status', Schedule::STATUS_PENDING)
+            ->addFieldToFilter('executed_at', ['notnull' => true])
+            ->addFieldToFilter('finished_at', ['null' => true]);
         $this->updateMetricService->update($this->getCode(), (string)$collection->count());
 
         return true;