Fix scheduler not running (#1166)

Co-authored-by: Melroy van den Berg <[email protected]>

src/Message/ClearDeadMessagesMessage.php

@@ -0,0 +1,14 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Message;
+
+use App\Message\Contracts\SchedulerInterface;
+
+class ClearDeadMessagesMessage implements SchedulerInterface
+{
+    public function __construct()
+    {
+    }
+}

src/Message/ClearDeletedUserMessage.php

@@ -0,0 +1,14 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Message;
+
+use App\Message\Contracts\SchedulerInterface;
+
+class ClearDeletedUserMessage implements SchedulerInterface
+{
+    public function __construct()
+    {
+    }
+}

src/Message/Contracts/SchedulerInterface.php

@@ -0,0 +1,9 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Message\Contracts;
+
+interface SchedulerInterface extends MessageInterface
+{
+}

src/MessageHandler/ClearDeadMessagesHandler.php

@@ -0,0 +1,30 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\MessageHandler;
+
+use App\Message\ClearDeadMessagesMessage;
+use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\Query\ResultSetMapping;
+use Psr\Log\LoggerInterface;
+use Symfony\Component\Messenger\Attribute\AsMessageHandler;
+
+#[AsMessageHandler]
+class ClearDeadMessagesHandler
+{
+    public function __construct(
+        private readonly EntityManagerInterface $entityManager,
+        private readonly LoggerInterface $logger,
+    ) {
+    }
+
+    public function __invoke(ClearDeadMessagesMessage $message): void
+    {
+        $this->logger->info('Clearing dead messages');
+        $sql = 'DELETE FROM messenger_messages WHERE queue_name = :queue_name';
+        $this->entityManager->createNativeQuery($sql, new ResultSetMapping())
+            ->setParameter('queue_name', 'dead')
+            ->getResult();
+    }
+}

src/Scheduler/Handlers/ClearDeletedUserHandler.php → src/MessageHandler/ClearDeletedUserHandler.php

@@ -2,10 +2,10 @@
 
 declare(strict_types=1);
 
-namespace App\Scheduler\Handlers;
+namespace App\MessageHandler;
 
+use App\Message\ClearDeletedUserMessage;
 use App\Message\DeleteUserMessage;
-use App\Scheduler\Messages\ClearDeletedUserMessage;
 use App\Service\UserManager;
 use Psr\Log\LoggerInterface;
 use Symfony\Component\Messenger\Attribute\AsMessageHandler;

src/Scheduler/MbinTaskProvider.php

@@ -0,0 +1,38 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Scheduler;
+
+use App\Message\ClearDeadMessagesMessage;
+use App\Message\ClearDeletedUserMessage;
+use Symfony\Component\Scheduler\Attribute\AsSchedule;
+use Symfony\Component\Scheduler\RecurringMessage;
+use Symfony\Component\Scheduler\Schedule;
+use Symfony\Component\Scheduler\ScheduleProviderInterface;
+use Symfony\Contracts\Cache\CacheInterface;
+
+#[AsSchedule]
+class MbinTaskProvider implements ScheduleProviderInterface
+{
+    private ?Schedule $schedule = null;
+
+    public function __construct(
+        private readonly CacheInterface $cache
+    ) {
+    }
+
+    public function getSchedule(): Schedule
+    {
+        if (null === $this->schedule) {
+            $this->schedule = (new Schedule())
+                ->add(
+                    RecurringMessage::every('1 day', new ClearDeletedUserMessage()),
+                    RecurringMessage::every('1 day', new ClearDeadMessagesMessage()),
+                )
+                ->stateful($this->cache);
+        }
+
+        return $this->schedule;
+    }
+}

src/Service/UserManager.php

@@ -13,16 +13,17 @@
 use App\Event\User\UserFollowEvent;
 use App\Exception\UserCannotBeBanned;
 use App\Factory\UserFactory;
+use App\Message\ClearDeletedUserMessage;
 use App\Message\DeleteImageMessage;
 use App\Message\DeleteUserMessage;
 use App\Message\UserCreatedMessage;
 use App\Message\UserUpdatedMessage;
+use App\MessageHandler\ClearDeletedUserHandler;
 use App\Repository\ImageRepository;
 use App\Repository\ReputationRepository;
 use App\Repository\UserFollowRepository;
 use App\Repository\UserFollowRequestRepository;
 use App\Repository\UserRepository;
-use App\Scheduler\Messages\ClearDeletedUserMessage;
 use App\Security\EmailVerifier;
 use App\Service\ActivityPub\KeysGenerator;
 use Doctrine\ORM\EntityManagerInterface;