Cavemanon/piratepoet
7
Fork 0
Code Pull Requests Actions Releases 16 Activity

Do not update email_count if there are no new emails

Browse Source 
[MAILPOET-4177]
This commit is contained in:
Brezo Cordero
2022-04-04 13:15:11 -05:00
committed by Veljko V
parent 8077322a29
commit 7ab8055b69
2 changed files with 40 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
mailpoet/lib/Subscribers/SubscribersEmailCountsController.php
View File

@ -15,15 +15,18 @@ class SubscribersEmailCountsController {
/** @var string */
private $subscribersTable;
/** @var string */
private $scheduledTasksTable;
public function __construct(
EntityManager $entityManager
) {
$this->entityManager = $entityManager;
$this->subscribersTable = $this->entityManager->getClassMetadata(SubscriberEntity::class)->getTableName();
$this->scheduledTasksTable = $this->entityManager->getClassMetadata(ScheduledTaskEntity::class)->getTableName();
}
public function updateSubscribersEmailCounts(?\DateTimeInterface $dateLastProcessed, int $batchSize, ?int $startId = null): array {
$scheduledTasksTable = $this->entityManager->getClassMetadata(ScheduledTaskEntity::class)->getTableName();
$scheduledTaskSubscribersTable = $this->entityManager->getClassMetadata(ScheduledTaskSubscriberEntity::class)->getTableName();
$connection = $this->entityManager->getConnection();
@ -33,6 +36,11 @@ class SubscribersEmailCountsController {
$startId = (int)$startId;
// Return if there are no new sending tasks
if ($dateLastProcessed && !$this->newSendingTasksSince($dateLastProcessed)) {
return [0, 0];
}
// Return if there are no subscribers to update
[$countSubscribersToUpdate, $endId] = $this->countAndMaxOfSubscribersInRange($startId, $batchSize);
if (!$countSubscribersToUpdate) {
return [0, 0];
@ -58,7 +66,7 @@ class SubscribersEmailCountsController {
SELECT s.id, COUNT(st.id) as email_count
FROM {$this->subscribersTable} as s
JOIN {$scheduledTaskSubscribersTable} as sts ON s.id = sts.subscriber_id
JOIN {$scheduledTasksTable} as st ON st.id = sts.task_id
JOIN {$this->scheduledTasksTable} as st ON st.id = sts.task_id
WHERE s.id >= :startId
AND s.id <= :endId
AND st.type = 'sending'
@ -75,10 +83,30 @@ class SubscribersEmailCountsController {
return [$countSubscribersToUpdate, $endId];
}
private function countAndMaxOfSubscribersInRange(int $startId, int $batchSize): array {
$connection = $this->entityManager->getConnection();
private function newSendingTasksSince(\DateTimeInterface $dateLastProcessed): bool {
$carbonDateLastProcessed = Carbon::createFromTimestamp($dateLastProcessed->getTimestamp());
$dateFromIso = ($carbonDateLastProcessed->subDay())->toDateTimeString();
$queryParams['dateFrom'] = $dateFromIso;
$dayAgo = new Carbon();
$dayAgoIso = $dayAgo->subDay()->toDateTimeString();
$queryParams['dayAgo'] = $dayAgoIso;
$result = $connection->executeQuery("
$result = $this->entityManager->getConnection()->executeQuery("
SELECT count(id) FROM {$this->scheduledTasksTable}
WHERE type = 'sending'
AND processed_at IS NOT NULL
AND processed_at < :dayAgo
AND processed_at >= :dateFrom
",
$queryParams
)->fetchNumeric();
/** @var int[] $result - it's required for PHPStan */
return is_array($result) && isset($result[0]) && ((int)$result[0] > 0);
}
private function countAndMaxOfSubscribersInRange(int $startId, int $batchSize): array {
$result = $this->entityManager->getConnection()->executeQuery("
SELECT s.id FROM {$this->subscribersTable} as s
WHERE s.id >= :startId
ORDER BY s.id