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

Replace old model ScheduledTaskSubscriber with ScheduledTaskSubscriberEntity in SubscribersFinder

Browse Source 
[MAILPOET-3925]
This commit is contained in:
Rodrigo Primo
2022-03-14 16:20:10 -03:00
committed by Veljko V
parent 8c70e0eb80
commit 9c1f0556b7
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mailpoet/lib/Entities/ScheduledTaskSubscriberEntity.php
View File

@ -12,6 +12,9 @@ use MailPoetVendor\Doctrine\ORM\Mapping as ORM;
* @ORM\Table(name="scheduled_task_subscribers") * @ORM\Table(name="scheduled_task_subscribers")
*/ */
class ScheduledTaskSubscriberEntity { class ScheduledTaskSubscriberEntity {
const STATUS_UNPROCESSED = 0;
const STATUS_PROCESSED = 1;
use CreatedAtTrait; use CreatedAtTrait;
use UpdatedAtTrait; use UpdatedAtTrait;
use SafeToOneAssociationLoadTrait; use SafeToOneAssociationLoadTrait;

5
mailpoet/lib/Models/ScheduledTaskSubscriber.php
View File

@ -2,6 +2,7 @@
namespace MailPoet\Models; namespace MailPoet\Models;
use MailPoet\Entities\ScheduledTaskSubscriberEntity;
use MailPoet\Util\Helpers; use MailPoet\Util\Helpers;
use MailPoet\WP\Functions as WPFunctions; use MailPoet\WP\Functions as WPFunctions;
@ -13,8 +14,8 @@ use MailPoet\WP\Functions as WPFunctions;
* @property string $error * @property string $error
*/ */
class ScheduledTaskSubscriber extends Model { class ScheduledTaskSubscriber extends Model {
const STATUS_UNPROCESSED = 0; const STATUS_UNPROCESSED = ScheduledTaskSubscriberEntity::STATUS_UNPROCESSED;
const STATUS_PROCESSED = 1; const STATUS_PROCESSED = ScheduledTaskSubscriberEntity::STATUS_PROCESSED;
const FAIL_STATUS_OK = 0; const FAIL_STATUS_OK = 0;
const FAIL_STATUS_FAILED = 1; const FAIL_STATUS_FAILED = 1;

6
mailpoet/lib/Segments/SubscribersFinder.php
View File

@ -2,10 +2,10 @@
namespace MailPoet\Segments; namespace MailPoet\Segments;
use MailPoet\Entities\ScheduledTaskSubscriberEntity;
use MailPoet\Entities\SegmentEntity; use MailPoet\Entities\SegmentEntity;
use MailPoet\InvalidStateException; use MailPoet\InvalidStateException;
use MailPoet\Models\ScheduledTask; use MailPoet\Models\ScheduledTask;
use MailPoet\Models\ScheduledTaskSubscriber;
use MailPoet\Models\Subscriber; use MailPoet\Models\Subscriber;
use MailPoetVendor\Idiorm\ORM; use MailPoetVendor\Idiorm\ORM;
@ -94,7 +94,7 @@ class SubscribersFinder {
AND relation.`segment_id` IN (' . join(',', array_map('intval', $segmentIds)) . ')', AND relation.`segment_id` IN (' . join(',', array_map('intval', $segmentIds)) . ')',
[ [
$task->id, $task->id,
ScheduledTaskSubscriber::STATUS_UNPROCESSED, ScheduledTaskSubscriberEntity::STATUS_UNPROCESSED,
Subscriber::STATUS_SUBSCRIBED, Subscriber::STATUS_SUBSCRIBED,
Subscriber::STATUS_SUBSCRIBED, Subscriber::STATUS_SUBSCRIBED,
] ]
@ -136,7 +136,7 @@ class SubscribersFinder {
AND subscribers.`id` IN (' . join(',', array_map('intval', $subscriberIds)) . ')', AND subscribers.`id` IN (' . join(',', array_map('intval', $subscriberIds)) . ')',
[ [
$task->id, $task->id,
ScheduledTaskSubscriber::STATUS_UNPROCESSED, ScheduledTaskSubscriberEntity::STATUS_UNPROCESSED,
Subscriber::STATUS_SUBSCRIBED, Subscriber::STATUS_SUBSCRIBED,
] ]
); );