diff --git a/mailpoet/lib/Entities/ScheduledTaskSubscriberEntity.php b/mailpoet/lib/Entities/ScheduledTaskSubscriberEntity.php index bac6cc341a..3470c8cf44 100644 --- a/mailpoet/lib/Entities/ScheduledTaskSubscriberEntity.php +++ b/mailpoet/lib/Entities/ScheduledTaskSubscriberEntity.php @@ -12,6 +12,9 @@ use MailPoetVendor\Doctrine\ORM\Mapping as ORM; * @ORM\Table(name="scheduled_task_subscribers") */ class ScheduledTaskSubscriberEntity { + const STATUS_UNPROCESSED = 0; + const STATUS_PROCESSED = 1; + use CreatedAtTrait; use UpdatedAtTrait; use SafeToOneAssociationLoadTrait; diff --git a/mailpoet/lib/Models/ScheduledTaskSubscriber.php b/mailpoet/lib/Models/ScheduledTaskSubscriber.php index 2a39cf7fee..939cc8264b 100644 --- a/mailpoet/lib/Models/ScheduledTaskSubscriber.php +++ b/mailpoet/lib/Models/ScheduledTaskSubscriber.php @@ -2,6 +2,7 @@ namespace MailPoet\Models; +use MailPoet\Entities\ScheduledTaskSubscriberEntity; use MailPoet\Util\Helpers; use MailPoet\WP\Functions as WPFunctions; @@ -13,8 +14,8 @@ use MailPoet\WP\Functions as WPFunctions; * @property string $error */ class ScheduledTaskSubscriber extends Model { - const STATUS_UNPROCESSED = 0; - const STATUS_PROCESSED = 1; + const STATUS_UNPROCESSED = ScheduledTaskSubscriberEntity::STATUS_UNPROCESSED; + const STATUS_PROCESSED = ScheduledTaskSubscriberEntity::STATUS_PROCESSED; const FAIL_STATUS_OK = 0; const FAIL_STATUS_FAILED = 1; diff --git a/mailpoet/lib/Segments/SubscribersFinder.php b/mailpoet/lib/Segments/SubscribersFinder.php index 4fcbf8cafc..70acb3a172 100644 --- a/mailpoet/lib/Segments/SubscribersFinder.php +++ b/mailpoet/lib/Segments/SubscribersFinder.php @@ -2,10 +2,10 @@ namespace MailPoet\Segments; +use MailPoet\Entities\ScheduledTaskSubscriberEntity; use MailPoet\Entities\SegmentEntity; use MailPoet\InvalidStateException; use MailPoet\Models\ScheduledTask; -use MailPoet\Models\ScheduledTaskSubscriber; use MailPoet\Models\Subscriber; use MailPoetVendor\Idiorm\ORM; @@ -94,7 +94,7 @@ class SubscribersFinder { AND relation.`segment_id` IN (' . join(',', array_map('intval', $segmentIds)) . ')', [ $task->id, - ScheduledTaskSubscriber::STATUS_UNPROCESSED, + ScheduledTaskSubscriberEntity::STATUS_UNPROCESSED, Subscriber::STATUS_SUBSCRIBED, Subscriber::STATUS_SUBSCRIBED, ] @@ -136,7 +136,7 @@ class SubscribersFinder { AND subscribers.`id` IN (' . join(',', array_map('intval', $subscriberIds)) . ')', [ $task->id, - ScheduledTaskSubscriber::STATUS_UNPROCESSED, + ScheduledTaskSubscriberEntity::STATUS_UNPROCESSED, Subscriber::STATUS_SUBSCRIBED, ] );