Embargo check

Author: tatevikg1

src/Domain/Messaging/Command/ProcessQueueCommand.php

@@ -4,6 +4,8 @@
 
 namespace PhpList\Core\Domain\Messaging\Command;
 
+use DateTimeImmutable;
+use PhpList\Core\Domain\Messaging\Model\Message\MessageStatus;
 use PhpList\Core\Domain\Messaging\Repository\MessageRepository;
 use PhpList\Core\Domain\Messaging\Service\MessageProcessingPreparator;
 use PhpList\Core\Domain\Messaging\Service\Processor\CampaignProcessor;
@@ -54,7 +56,10 @@ protected function execute(InputInterface $input, OutputInterface $output): int
             $this->messagePreparator->ensureSubscribersHaveUuid($output);
             $this->messagePreparator->ensureCampaignsHaveUuid($output);
 
-            $campaigns = $this->messageRepository->findBy(['status' => 'submitted']);
+            $campaigns = $this->messageRepository->getByStatusAndEmbargo(
+                status: MessageStatus::Submitted,
+                embargo: new DateTimeImmutable()
+            );
 
             foreach ($campaigns as $campaign) {
                 $this->campaignProcessor->process($campaign, $output);

src/Domain/Messaging/Model/Message/MessageMetadata.php

@@ -6,6 +6,7 @@
 
 use DateTime;
 use Doctrine\ORM\Mapping as ORM;
+use InvalidArgumentException;
 use PhpList\Core\Domain\Common\Model\Interfaces\EmbeddableInterface;
 
 #[ORM\Embeddable]
@@ -58,7 +59,11 @@ public function getStatus(): ?MessageStatus
 
     public function setStatus(MessageStatus $status): self
     {
+        if (!$this->getStatus()->canTransitionTo($status)) {
+            throw new InvalidArgumentException('Invalid status transition');
+        }
         $this->status = $status->value;
+
         return $this;
     }
 

src/Domain/Messaging/Repository/MessageRepository.php

@@ -4,6 +4,7 @@
 
 namespace PhpList\Core\Domain\Messaging\Repository;
 
+use DateTimeImmutable;
 use PhpList\Core\Domain\Common\Model\Filter\FilterRequestInterface;
 use PhpList\Core\Domain\Common\Repository\AbstractRepository;
 use PhpList\Core\Domain\Common\Repository\Interfaces\PaginatableRepositoryInterface;
@@ -74,4 +75,15 @@ public function incrementBounceCount(int $messageId): void
             ->getQuery()
             ->execute();
     }
+
+    public function getByStatusAndEmbargo(Message\MessageStatus $status, DateTimeImmutable $embargo): array
+    {
+        return $this->createQueryBuilder('m')
+            ->where('m.status = :status')
+            ->andWhere('m.embargo IS NULL OR m.embargo <= :embargo')
+            ->setParameter('status', $status->value)
+            ->setParameter('embargo', $embargo)
+            ->getQuery()
+            ->getResult();
+    }
 }

src/Domain/Messaging/Service/Manager/MessageManager.php

@@ -4,7 +4,6 @@
 
 namespace PhpList\Core\Domain\Messaging\Service\Manager;
 
-use InvalidArgumentException;
 use PhpList\Core\Domain\Identity\Model\Administrator;
 use PhpList\Core\Domain\Messaging\Model\Dto\MessageContext;
 use PhpList\Core\Domain\Messaging\Model\Dto\MessageDtoInterface;
@@ -46,10 +45,6 @@ public function updateMessage(
 
     public function updateStatus(Message $message, Message\MessageStatus $status): Message
     {
-        if (!$message->getMetadata()->getStatus()->canTransitionTo($status)) {
-            throw new InvalidArgumentException('Invalid status transition');
-        }
-
         $message->getMetadata()->setStatus($status);
         $this->messageRepository->save($message);
 

src/Domain/Messaging/Service/Processor/CampaignProcessor.php

@@ -38,7 +38,14 @@ public function __construct(
 
     public function process(Message $campaign, ?OutputInterface $output = null): void
     {
+        $campaign->getMetadata()->setStatus(Message\MessageStatus::Prepared);
+        $this->entityManager->flush();
+
         $subscribers = $this->subscriberProvider->getSubscribersForMessage($campaign);
+
+        $campaign->getMetadata()->setStatus(Message\MessageStatus::InProcess);
+        $this->entityManager->flush();
+
         // phpcs:ignore Generic.Commenting.Todo
         // @todo check $ISPrestrictions logic
         foreach ($subscribers as $subscriber) {