Rate limit initialized from history

Author: tatevikg1

src/Domain/Messaging/Repository/UserMessageRepository.php

@@ -4,8 +4,10 @@
 
 namespace PhpList\Core\Domain\Messaging\Repository;
 
+use DateTimeInterface;
 use PhpList\Core\Domain\Common\Repository\AbstractRepository;
 use PhpList\Core\Domain\Messaging\Model\Message;
+use PhpList\Core\Domain\Messaging\Model\Message\UserMessageStatus;
 use PhpList\Core\Domain\Messaging\Model\UserMessage;
 use PhpList\Core\Domain\Subscription\Model\Subscriber;
 
@@ -15,4 +17,19 @@ public function findOneByUserAndMessage(Subscriber $subscriber, Message $campaig
     {
         return $this->findOneBy(['user' => $subscriber, 'message' => $campaign]);
     }
+
+    /**
+     * Counts how many user messages have status "sent" since the given time.
+     */
+    public function countSentSince(DateTimeInterface $since): int
+    {
+        $queryBuilder = $this->createQueryBuilder('um');
+        $queryBuilder->select('COUNT(um)')
+            ->where('um.createdAt > :since')
+            ->andWhere('um.status = :status')
+            ->setParameter('since', $since)
+            ->setParameter('status', UserMessageStatus::Sent->value);
+
+        return (int) $queryBuilder->getQuery()->getSingleScalarResult();
+    }
 }

src/Domain/Messaging/Service/SendRateLimiter.php

@@ -4,7 +4,10 @@
 
 namespace PhpList\Core\Domain\Messaging\Service;
 
+use DateInterval;
+use DateTimeImmutable;
 use PhpList\Core\Domain\Common\IspRestrictionsProvider;
+use PhpList\Core\Domain\Messaging\Repository\UserMessageRepository;
 use Symfony\Component\Console\Output\OutputInterface;
 
 /**
@@ -18,9 +21,11 @@ class SendRateLimiter
     private int $throttleSec;
     private int $sentInBatch = 0;
     private float $batchStart = 0.0;
+    private bool $initializedFromHistory = false;
 
     public function __construct(
         private readonly IspRestrictionsProvider $ispRestrictionsProvider,
+        private readonly UserMessageRepository $userMessageRepository,
         private readonly ?int $mailqueueBatchSize = null,
         private readonly ?int $mailqueueBatchPeriod = null,
         private readonly ?int $mailqueueThrottle = null,
@@ -51,6 +56,7 @@ private function initializeLimits(): void
 
         $this->sentInBatch = 0;
         $this->batchStart = microtime(true);
+        $this->initializedFromHistory = false;
     }
 
     /**
@@ -59,6 +65,13 @@ private function initializeLimits(): void
      */
     public function awaitTurn(?OutputInterface $output = null): bool
     {
+        if (!$this->initializedFromHistory && $this->batchSize > 0 && $this->batchPeriod > 0) {
+            $since = (new DateTimeImmutable())->sub(new DateInterval('PT' . $this->batchPeriod . 'S'));
+            $alreadySent = $this->userMessageRepository->countSentSince($since);
+            $this->sentInBatch = max($this->sentInBatch, $alreadySent);
+            $this->initializedFromHistory = true;
+        }
+
         if ($this->batchSize > 0 && $this->batchPeriod > 0 && $this->sentInBatch >= $this->batchSize) {
             $elapsed = microtime(true) - $this->batchStart;
             $remaining = (int)ceil($this->batchPeriod - $elapsed);
@@ -71,7 +84,9 @@ public function awaitTurn(?OutputInterface $output = null): bool
             }
             $this->batchStart = microtime(true);
             $this->sentInBatch = 0;
+            $this->initializedFromHistory = false;
         }
+
         return true;
     }
 

tests/Unit/Domain/Messaging/Service/SendRateLimiterTest.php

@@ -6,6 +6,7 @@
 
 use PhpList\Core\Domain\Common\IspRestrictionsProvider;
 use PhpList\Core\Domain\Common\Model\IspRestrictions;
+use PhpList\Core\Domain\Messaging\Repository\UserMessageRepository;
 use PhpList\Core\Domain\Messaging\Service\SendRateLimiter;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
@@ -25,6 +26,7 @@ public function testInitializesLimitsFromConfigOnly(): void
         $this->ispProvider->method('load')->willReturn(new IspRestrictions(null, null, null));
         $limiter = new SendRateLimiter(
             ispRestrictionsProvider: $this->ispProvider,
+            userMessageRepository: $this->createMock(UserMessageRepository::class),
             mailqueueBatchSize: 5,
             mailqueueBatchPeriod: 10,
             mailqueueThrottle: 2
@@ -40,7 +42,8 @@ public function testBatchLimitTriggersWaitMessageAndResetsCounters(): void
     {
         $this->ispProvider->method('load')->willReturn(new IspRestrictions(2, 1, null));
         $limiter = new SendRateLimiter(
-            $this->ispProvider,
+            ispRestrictionsProvider: $this->ispProvider,
+            userMessageRepository: $this->createMock(UserMessageRepository::class),
             mailqueueBatchSize: 10,
             mailqueueBatchPeriod: 1,
             mailqueueThrottle: 0
@@ -66,7 +69,8 @@ public function testThrottleSleepsPerMessagePathIsCallable(): void
     {
         $this->ispProvider->method('load')->willReturn(new IspRestrictions(null, null, null));
         $limiter = new SendRateLimiter(
-            $this->ispProvider,
+            ispRestrictionsProvider: $this->ispProvider,
+            userMessageRepository: $this->createMock(UserMessageRepository::class),
             mailqueueBatchSize: 0,
             mailqueueBatchPeriod: 0,
             mailqueueThrottle: 1