From 38e709e3b10480700bd0c770c1a3db6f68f91284 Mon Sep 17 00:00:00 2001
From: John Oleksowicz <john.oleksowicz@automattic.com>
Date: Fri, 11 Aug 2023 15:49:02 -0500
Subject: [PATCH] Filter subscribers when creating scheduled tasks

MAILPOET-5509
---
 mailpoet/lib/API/JSON/v1/SendingQueue.php | 2 +-
 mailpoet/lib/Cron/Workers/Scheduler.php   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/mailpoet/lib/API/JSON/v1/SendingQueue.php b/mailpoet/lib/API/JSON/v1/SendingQueue.php
index c6e0a56258..688f8206a1 100644
--- a/mailpoet/lib/API/JSON/v1/SendingQueue.php
+++ b/mailpoet/lib/API/JSON/v1/SendingQueue.php
@@ -163,7 +163,7 @@ class SendingQueue extends APIEndpoint {
       $taskEntity = $this->scheduledTasksRepository->findOneById($taskModel->id);
 
       if ($taskEntity instanceof ScheduledTaskEntity) {
-        $subscribersCount = $this->subscribersFinder->addSubscribersToTaskFromSegments($taskEntity, $segments);
+        $subscribersCount = $this->subscribersFinder->addSubscribersToTaskFromSegments($taskEntity, $segments, $newsletterEntity->getFilterSegmentId());
       }
 
       if (!isset($subscribersCount) || !$subscribersCount) {
diff --git a/mailpoet/lib/Cron/Workers/Scheduler.php b/mailpoet/lib/Cron/Workers/Scheduler.php
index ae46701374..037e29ddd7 100644
--- a/mailpoet/lib/Cron/Workers/Scheduler.php
+++ b/mailpoet/lib/Cron/Workers/Scheduler.php
@@ -197,7 +197,7 @@ class Scheduler {
     $taskModel = $queue->task();
     $taskEntity = $this->scheduledTasksRepository->findOneById($taskModel->id);
     if ($taskEntity instanceof ScheduledTaskEntity) {
-      $subscribersCount = $this->subscribersFinder->addSubscribersToTaskFromSegments($taskEntity, $segments);
+      $subscribersCount = $this->subscribersFinder->addSubscribersToTaskFromSegments($taskEntity, $segments, $newsletter->getFilterSegmentId());
     }
 
     if (empty($subscribersCount)) {
@@ -318,7 +318,7 @@ class Scheduler {
     $taskEntity = $this->scheduledTasksRepository->findOneById($taskModel->id);
 
     if ($taskEntity instanceof ScheduledTaskEntity) {
-      $this->subscribersFinder->addSubscribersToTaskFromSegments($taskEntity, $segments);
+      $this->subscribersFinder->addSubscribersToTaskFromSegments($taskEntity, $segments, $newsletter->getFilterSegmentId());
     }
 
     // update current queue