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

Rename WooCommerceOrders job to WooCommercePastOrders

Browse Source 
[MAILPOET-2465]
This commit is contained in:
Jan Jakeš
2019-10-10 10:18:55 +02:00
committed by Jack Kitterhing
parent e0244c771a
commit 1f2e1f9e4a
7 changed files with 26 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Cron/Daemon.php
View File

@@ -54,7 +54,7 @@ class Daemon {
yield $this->workers_factory->createUnsubscribeTokensWorker($this->timer);
yield $this->workers_factory->createWooCommerceSyncWorker($this->timer);
yield $this->workers_factory->createAuthorizedSendingEmailsCheckWorker($this->timer);
yield $this->workers_factory->createWooCommerceOrdersWorker($this->timer);
yield $this->workers_factory->createWooCommercePastOrdersWorker($this->timer);
yield $this->workers_factory->createStatsNotificationsWorkerForAutomatedEmails($this->timer);
yield $this->workers_factory->createSubscriberLinkTokensWorker($this->timer);
}

10
lib/Cron/Triggers/WordPress.php
View File

@@ -16,7 +16,7 @@ use MailPoet\Cron\Workers\StatsNotifications\AutomatedEmails;
use MailPoet\Cron\Workers\StatsNotifications\Worker as StatsNotificationsWorker;
use MailPoet\Cron\Workers\SubscriberLinkTokens;
use MailPoet\Cron\Workers\UnsubscribeTokens;
use MailPoet\Cron\Workers\WooCommerceOrders;
use MailPoet\Cron\Workers\WooCommercePastOrders;
use MailPoet\Cron\Workers\WooCommerceSync as WooCommerceSyncWorker;
use MailPoet\Mailer\MailerLog;
use MailPoet\Models\ScheduledTask;
@@ -176,9 +176,9 @@ class WordPress {
'status' => ['null', ScheduledTask::STATUS_SCHEDULED],
]);
// WooCommerce orders revenues sync
$woo_commerce_orders_tasks = self::getTasksCount([
'type' => WooCommerceOrders::TASK_TYPE,
// WooCommerce past orders revenues sync
$woo_commerce_past_orders_tasks = self::getTasksCount([
'type' => WooCommercePastOrders::TASK_TYPE,
'scheduled_in' => [self::SCHEDULED_IN_THE_PAST],
'status' => ['null', ScheduledTask::STATUS_SCHEDULED],
]);
@@ -203,7 +203,7 @@ class WordPress {
|| $woo_commerce_sync_tasks
|| $authorized_email_addresses_tasks
|| $beamer_active
|| $woo_commerce_orders_tasks
|| $woo_commerce_past_orders_tasks
|| $unsubscribe_tokens_tasks
|| $subscriber_link_tokens_tasks
);

3
lib/Cron/Workers/WooCommerceOrders.php → lib/Cron/Workers/WooCommercePastOrders.php
View File

@@ -10,8 +10,7 @@ use MailPoet\Statistics\Track\WooCommercePurchases;
use MailPoet\WooCommerce\Helper as WCHelper;
use MailPoet\WP\Functions as WPFunctions;
class WooCommerceOrders extends SimpleWorker {
const TASK_TYPE = 'woocommerce_orders';
class WooCommercePastOrders extends SimpleWorker {
const TASK_TYPE = 'woocommerce_past_orders';
const BATCH_SIZE = 20;

6
lib/Cron/Workers/WorkersFactory.php
View File

@@ -168,8 +168,8 @@ class WorkersFactory {
return new AuthorizedSendingEmailsCheck($this->authorized_emails_controller, $timer);
}
/** @return WooCommerceOrders */
function createWooCommerceOrdersWorker($timer) {
return new WooCommerceOrders($this->woocommerce_helper, $this->woocommerce_purchases, $timer);
/** @return WooCommercePastOrders */
function createWooCommercePastOrdersWorker($timer) {
return new WooCommercePastOrders($this->woocommerce_helper, $this->woocommerce_purchases, $timer);
}
}

2
tests/integration/Cron/DaemonHttpRunnerTest.php
View File

@@ -290,7 +290,7 @@ class DaemonHttpRunnerTest extends \MailPoetTest {
'createExportFilesCleanupWorker' => $worker,
'createInactiveSubscribersWorker' => $worker,
'createAuthorizedSendingEmailsCheckWorker' => $worker,
'createWooCommerceOrdersWorker' => $worker,
'createWooCommercePastOrdersWorker' => $worker,
'createBeamerkWorker' => $worker,
]);
}

2
tests/integration/Cron/DaemonTest.php
View File

@@ -47,7 +47,7 @@ class DaemonTest extends \MailPoetTest {
'createExportFilesCleanupWorker' => $this->createSimpleWorkerMock(),
'createInactiveSubscribersWorker' => $this->createSimpleWorkerMock(),
'createAuthorizedSendingEmailsCheckWorker' => $this->createSimpleWorkerMock(),
'createWooCommerceOrdersWorker' => $this->createSimpleWorkerMock(),
'createWooCommercePastOrdersWorker' => $this->createSimpleWorkerMock(),
'createBeamerkWorker' => $this->createSimpleWorkerMock(),
]);

28
tests/integration/Cron/Workers/WooCommerceOrdersTest.php
View File

@@ -3,7 +3,7 @@
namespace MailPoet\Test\Cron\Workers;
use DateTime;
use MailPoet\Cron\Workers\WooCommerceOrders;
use MailPoet\Cron\Workers\WooCommercePastOrders;
use MailPoet\Models\ScheduledTask;
use MailPoet\Models\StatisticsClicks;
use MailPoet\Models\StatisticsWooCommercePurchases;
@@ -17,7 +17,7 @@ class WooCommerceOrdersTest extends \MailPoetTest {
/** @var WooCommercePurchases */
private $woocommerce_purchases;
/** @var WooCommerceOrders */
/** @var WooCommercePastOrders */
private $worker;
function _before() {
@@ -25,7 +25,7 @@ class WooCommerceOrdersTest extends \MailPoetTest {
$this->woocommerce_helper = $this->createMock(WooCommerceHelper::class);
$this->woocommerce_purchases = $this->createMock(WooCommercePurchases::class);
$this->worker = new WooCommerceOrders($this->woocommerce_helper, $this->woocommerce_purchases, microtime(true));
$this->worker = new WooCommercePastOrders($this->woocommerce_helper, $this->woocommerce_purchases, microtime(true));
}
function testItDoesNotRunIfWooCommerceIsDisabled() {
@@ -33,7 +33,7 @@ class WooCommerceOrdersTest extends \MailPoetTest {
expect($this->worker->checkProcessingRequirements())->false();
$this->worker->process();
$tasks = ScheduledTask::where('type', WooCommerceOrders::TASK_TYPE)->findMany();
$tasks = ScheduledTask::where('type', WooCommercePastOrders::TASK_TYPE)->findMany();
expect($tasks)->isEmpty();
}
@@ -42,7 +42,7 @@ class WooCommerceOrdersTest extends \MailPoetTest {
expect($this->worker->checkProcessingRequirements())->true();
$this->worker->process();
$tasks = ScheduledTask::where('type', WooCommerceOrders::TASK_TYPE)->findMany();
$tasks = ScheduledTask::where('type', WooCommercePastOrders::TASK_TYPE)->findMany();
expect($tasks)->count(1);
}
@@ -53,28 +53,28 @@ class WooCommerceOrdersTest extends \MailPoetTest {
// 1. schedule
expect($this->worker->checkProcessingRequirements())->true();
$this->worker->process();
$task = ScheduledTask::where('type', WooCommerceOrders::TASK_TYPE)->findOne();
$task = ScheduledTask::where('type', WooCommercePastOrders::TASK_TYPE)->findOne();
expect($task->status)->equals(ScheduledTask::STATUS_SCHEDULED);
// 2. prepare
expect($this->worker->checkProcessingRequirements())->true();
$this->worker->process();
$task = ScheduledTask::where('type', WooCommerceOrders::TASK_TYPE)->findOne();
$task = ScheduledTask::where('type', WooCommercePastOrders::TASK_TYPE)->findOne();
expect($task->status)->null(); // null means 'running'
// 3. run
expect($this->worker->checkProcessingRequirements())->true();
$this->worker->process();
$task = ScheduledTask::where('type', WooCommerceOrders::TASK_TYPE)->findOne();
$task = ScheduledTask::where('type', WooCommercePastOrders::TASK_TYPE)->findOne();
expect($task->status)->equals(ScheduledTask::STATUS_COMPLETED);
// 4. complete (do not schedule again)
expect($this->worker->checkProcessingRequirements())->false();
$this->worker->process();
$task = ScheduledTask::where('type', WooCommerceOrders::TASK_TYPE)->findOne();
$task = ScheduledTask::where('type', WooCommercePastOrders::TASK_TYPE)->findOne();
expect($task->status)->equals(ScheduledTask::STATUS_COMPLETED);
$tasks = ScheduledTask::where('type', WooCommerceOrders::TASK_TYPE)->findMany();
$tasks = ScheduledTask::where('type', WooCommercePastOrders::TASK_TYPE)->findMany();
expect($tasks)->count(1);
}
@@ -89,7 +89,7 @@ class WooCommerceOrdersTest extends \MailPoetTest {
$this->worker->process(); // prepare
$this->worker->process(); // run
$tasks = ScheduledTask::where('type', WooCommerceOrders::TASK_TYPE)->findMany();
$tasks = ScheduledTask::where('type', WooCommercePastOrders::TASK_TYPE)->findMany();
expect($tasks)->count(1);
expect($tasks[0]->status)->equals(null); // null means 'running'
}
@@ -106,17 +106,17 @@ class WooCommerceOrdersTest extends \MailPoetTest {
$this->worker->process(); // prepare
$this->worker->process(); // run for 1, 2, 3
$task = ScheduledTask::where('type', WooCommerceOrders::TASK_TYPE)->findOne();
$task = ScheduledTask::where('type', WooCommercePastOrders::TASK_TYPE)->findOne();
expect($task->getMeta())->equals(['last_processed_id' => 3]);
$this->worker->process(); // run for 4, 5
$task = ScheduledTask::where('type', WooCommerceOrders::TASK_TYPE)->findOne();
$task = ScheduledTask::where('type', WooCommercePastOrders::TASK_TYPE)->findOne();
expect($task->getMeta())->equals(['last_processed_id' => 5]);
$this->worker->process(); // complete
$tasks = ScheduledTask::where('type', WooCommerceOrders::TASK_TYPE)->findMany();
$tasks = ScheduledTask::where('type', WooCommercePastOrders::TASK_TYPE)->findMany();
expect($tasks)->count(1);
expect($tasks[0]->status)->equals(ScheduledTask::STATUS_COMPLETED);
}