fix: don't show always scheduled tasks are wrong, fixes #97

Author: shyim

src/Components/Health/Checker/HealthChecker/TaskChecker.php

@@ -12,14 +12,19 @@
 use Shopware\Core\Framework\DataAbstractionLayer\Search\Filter\NotFilter;
 use Shopware\Core\Framework\DataAbstractionLayer\Search\Filter\RangeFilter;
 use Shopware\Core\Framework\MessageQueue\ScheduledTask\ScheduledTaskDefinition;
+use Shopware\Core\Framework\MessageQueue\ScheduledTask\ScheduledTaskEntity;
+use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
 
 class TaskChecker implements CheckerInterface
 {
     private EntityRepositoryInterface $scheduledTaskRepository;
 
-    public function __construct(EntityRepositoryInterface $scheduledTaskRepository)
+    private ParameterBagInterface $parameterBag;
+
+    public function __construct(EntityRepositoryInterface $scheduledTaskRepository, ParameterBagInterface $parameterBag)
     {
         $this->scheduledTaskRepository = $scheduledTaskRepository;
+        $this->parameterBag = $parameterBag;
     }
 
     public function collect(HealthCollection $collection): void
@@ -44,9 +49,20 @@ public function collect(HealthCollection $collection): void
         ));
 
         $oldTasks = $this->scheduledTaskRepository
-            ->searchIds($criteria, Context::createDefaultContext())->getIds();
+            ->search($criteria, Context::createDefaultContext());
+
+        $oldTasks = $oldTasks->filter(function (ScheduledTaskEntity $task) {
+            $taskClass = $task->getScheduledTaskClass();
+
+            // Old Shopware version
+            if (!method_exists($taskClass, 'shouldRun')) {
+                return true;
+            }
+
+            return $taskClass::shouldRun($this->parameterBag);
+        });
 
-        if (count($oldTasks) === 0) {
+        if ($oldTasks->count() === 0) {
             $collection->add(SettingsResult::ok('frosh-tools.checker.scheduledTaskGood'));
 
             return;

src/Resources/config/services.xml

@@ -109,6 +109,7 @@
 
         <service id="Frosh\Tools\Components\Health\Checker\HealthChecker\TaskChecker">
             <argument type="service" id="scheduled_task.repository"/>
+            <argument type="service" id="parameter_bag"/>
             <tag name="frosh_tools.health_checker"/>
         </service>