Add cleanup command

src/Command/CleanupCommand.php

@@ -0,0 +1,33 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Frosh\MailArchive\Command;
+
+use Frosh\MailArchive\Messenger\CleanupMessage;
+use Symfony\Component\Console\Attribute\AsCommand;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Messenger\MessageBusInterface;
+
+#[AsCommand('frosh:mail-archive:cleanup', 'Cleanup old mail archive entries')]
+class CleanupCommand extends Command
+{
+    public function __construct(
+        private readonly MessageBusInterface $messageBus,
+    ) {
+        parent::__construct();
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output): int
+    {
+        $output->writeln('Dispatching mail archive cleanup...');
+
+        $this->messageBus->dispatch(new CleanupMessage());
+
+        $output->writeln('Cleanup message dispatched successfully.');
+
+        return Command::SUCCESS;
+    }
+}

src/Messenger/CleanupHandler.php

@@ -0,0 +1,67 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Frosh\MailArchive\Messenger;
+
+use Doctrine\DBAL\ArrayParameterType;
+use Doctrine\DBAL\Connection;
+use Frosh\MailArchive\Content\MailArchive\MailArchiveDefinition;
+use Frosh\MailArchive\Services\EmlFileManager;
+use Shopware\Core\Defaults;
+use Shopware\Core\System\SystemConfig\SystemConfigService;
+use Symfony\Component\Messenger\Attribute\AsMessageHandler;
+
+#[AsMessageHandler]
+class CleanupHandler
+{
+    public function __construct(
+        private readonly SystemConfigService $configService,
+        private readonly Connection $connection,
+        private readonly EmlFileManager $emlFileManager,
+    ) {}
+
+    public function __invoke(CleanupMessage $message): void
+    {
+        $days = $this->configService->getInt('FroshPlatformMailArchive.config.deleteMessageAfterDays');
+
+        if ($days === 0) {
+            return;
+        }
+
+        $time = new \DateTime();
+        $time->modify(\sprintf('-%s days', $days));
+
+        $query = $this->connection->createQueryBuilder();
+
+        $query->select('id', 'eml_path');
+        $query->from(MailArchiveDefinition::ENTITY_NAME);
+        $query->where(
+            $query->expr()->lte(
+                'created_at',
+                $query->createNamedParameter($time->format(Defaults::STORAGE_DATE_TIME_FORMAT)),
+            ),
+        );
+
+        $result = $query->executeQuery()->fetchAllAssociative();
+
+        if (\count($result) === 0) {
+            return;
+        }
+
+        foreach ($result as $item) {
+            if (empty($item['eml_path']) || !\is_string($item['eml_path'])) {
+                continue;
+            }
+
+            $this->emlFileManager->deleteEmlFile($item['eml_path']);
+        }
+
+        $deleteQuery = $this->connection->createQueryBuilder();
+        $deleteQuery->delete(MailArchiveDefinition::ENTITY_NAME);
+        $deleteQuery->where('id IN (:ids)');
+        $deleteQuery->setParameter('ids', \array_column($result, 'id'), ArrayParameterType::STRING);
+
+        $deleteQuery->executeQuery();
+    }
+}

src/Messenger/CleanupMessage.php

@@ -0,0 +1,9 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Frosh\MailArchive\Messenger;
+
+use Shopware\Core\Framework\MessageQueue\AsyncMessageInterface;
+
+class CleanupMessage implements AsyncMessageInterface {}

src/Task/CleanupTask.php

@@ -17,6 +17,6 @@ public static function getTaskName(): string
 
     public static function getDefaultInterval(): int
     {
-        return 86400;
+        return 86400; // 1 day
     }
 }

src/Task/CleanupTaskHandler.php

@@ -4,16 +4,12 @@
 
 namespace Frosh\MailArchive\Task;
 
-use Doctrine\DBAL\Connection;
-use Doctrine\DBAL\ArrayParameterType;
-use Frosh\MailArchive\Content\MailArchive\MailArchiveDefinition;
-use Frosh\MailArchive\Services\EmlFileManager;
-use Shopware\Core\Defaults;
+use Frosh\MailArchive\Messenger\CleanupMessage;
 use Shopware\Core\Framework\DataAbstractionLayer\EntityRepository;
 use Shopware\Core\Framework\MessageQueue\ScheduledTask\ScheduledTaskCollection;
 use Shopware\Core\Framework\MessageQueue\ScheduledTask\ScheduledTaskHandler;
-use Shopware\Core\System\SystemConfig\SystemConfigService;
 use Symfony\Component\Messenger\Attribute\AsMessageHandler;
+use Symfony\Component\Messenger\MessageBusInterface;
 
 #[AsMessageHandler(handles: CleanupTask::class)]
 class CleanupTaskHandler extends ScheduledTaskHandler
@@ -23,54 +19,13 @@ class CleanupTaskHandler extends ScheduledTaskHandler
      */
     public function __construct(
         EntityRepository $scheduledTaskRepository,
-        private readonly SystemConfigService $configService,
-        private readonly Connection $connection,
-        private readonly EmlFileManager $emlFileManager,
+        private readonly MessageBusInterface $messageBus,
     ) {
         parent::__construct($scheduledTaskRepository);
     }
 
     public function run(): void
     {
-        $days = $this->configService->getInt('FroshPlatformMailArchive.config.deleteMessageAfterDays');
-
-        if ($days === 0) {
-            return;
-        }
-
-        $time = new \DateTime();
-        $time->modify(sprintf('-%s days', $days));
-
-        $query = $this->connection->createQueryBuilder();
-
-        $query->select('id', 'eml_path');
-        $query->from(MailArchiveDefinition::ENTITY_NAME);
-        $query->where(
-            $query->expr()->lte(
-                'created_at',
-                $query->createNamedParameter($time->format(Defaults::STORAGE_DATE_TIME_FORMAT)),
-            ),
-        );
-
-        $result = $query->executeQuery()->fetchAllAssociative();
-
-        if (\count($result) === 0) {
-            return;
-        }
-
-        foreach ($result as $item) {
-            if (empty($item['eml_path']) || !\is_string($item['eml_path'])) {
-                continue;
-            }
-
-            $this->emlFileManager->deleteEmlFile($item['eml_path']);
-        }
-
-        $deleteQuery = $this->connection->createQueryBuilder();
-        $deleteQuery->delete(MailArchiveDefinition::ENTITY_NAME);
-        $deleteQuery->where('id IN (:ids)');
-        $deleteQuery->setParameter('ids', \array_column($result, 'id'), ArrayParameterType::STRING);
-
-        $deleteQuery->executeQuery();
+        $this->messageBus->dispatch(new CleanupMessage());
     }
 }