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

Filter subscribers when creating scheduled tasks

Browse Source 
MAILPOET-5509
This commit is contained in:
John Oleksowicz
2023-08-11 15:49:02 -05:00
committed by Aschepikov
parent f52b1343f8
commit 38e709e3b1
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mailpoet/lib/API/JSON/v1/SendingQueue.php
View File

@@ -163,7 +163,7 @@ class SendingQueue extends APIEndpoint {
$taskEntity = $this->scheduledTasksRepository->findOneById($taskModel->id); $taskEntity = $this->scheduledTasksRepository->findOneById($taskModel->id);
if ($taskEntity instanceof ScheduledTaskEntity) { if ($taskEntity instanceof ScheduledTaskEntity) {
$subscribersCount = $this->subscribersFinder->addSubscribersToTaskFromSegments($taskEntity, $segments); $subscribersCount = $this->subscribersFinder->addSubscribersToTaskFromSegments($taskEntity, $segments, $newsletterEntity->getFilterSegmentId());
} }
if (!isset($subscribersCount) || !$subscribersCount) { if (!isset($subscribersCount) || !$subscribersCount) {

4
mailpoet/lib/Cron/Workers/Scheduler.php
View File

@@ -197,7 +197,7 @@ class Scheduler {
$taskModel = $queue->task(); $taskModel = $queue->task();
$taskEntity = $this->scheduledTasksRepository->findOneById($taskModel->id); $taskEntity = $this->scheduledTasksRepository->findOneById($taskModel->id);
if ($taskEntity instanceof ScheduledTaskEntity) { if ($taskEntity instanceof ScheduledTaskEntity) {
$subscribersCount = $this->subscribersFinder->addSubscribersToTaskFromSegments($taskEntity, $segments); $subscribersCount = $this->subscribersFinder->addSubscribersToTaskFromSegments($taskEntity, $segments, $newsletter->getFilterSegmentId());
} }
if (empty($subscribersCount)) { if (empty($subscribersCount)) {
@@ -318,7 +318,7 @@ class Scheduler {
$taskEntity = $this->scheduledTasksRepository->findOneById($taskModel->id); $taskEntity = $this->scheduledTasksRepository->findOneById($taskModel->id);
if ($taskEntity instanceof ScheduledTaskEntity) { if ($taskEntity instanceof ScheduledTaskEntity) {
$this->subscribersFinder->addSubscribersToTaskFromSegments($taskEntity, $segments); $this->subscribersFinder->addSubscribersToTaskFromSegments($taskEntity, $segments, $newsletter->getFilterSegmentId());
} }
// update current queue // update current queue