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

Clean all previous stats records per-order before inserting new ones

Browse Source 
[MAILPOET-2446]
This commit is contained in:
Jan Jakeš
2019-10-08 14:39:28 +02:00
committed by Jack Kitterhing
parent 4e15aad794
commit 260b9baeae
2 changed files with 45 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,6 +5,7 @@ namespace MailPoet\Cron\Workers;
use Carbon\Carbon; use Carbon\Carbon;
use MailPoet\Models\ScheduledTask; use MailPoet\Models\ScheduledTask;
use MailPoet\Models\StatisticsClicks; use MailPoet\Models\StatisticsClicks;
use MailPoet\Models\StatisticsWooCommercePurchases;
use MailPoet\Statistics\Track\WooCommercePurchases; use MailPoet\Statistics\Track\WooCommercePurchases;
use MailPoet\WooCommerce\Helper as WCHelper; use MailPoet\WooCommerce\Helper as WCHelper;
use MailPoet\WP\Functions as WPFunctions; use MailPoet\WP\Functions as WPFunctions;
@@ -61,6 +62,8 @@ class WooCommerceOrders extends SimpleWorker {
} }
foreach ($order_ids as $order_id) { foreach ($order_ids as $order_id) {
// clean all records for given order to fix wrong data inserted by a past buggy version
StatisticsWooCommercePurchases::where('order_id', $order_id)->deleteMany();
$this->woocommerce_purchases->trackPurchase($order_id, false); $this->woocommerce_purchases->trackPurchase($order_id, false);
} }
$task->meta = ['last_processed_id' => end($order_ids)]; $task->meta = ['last_processed_id' => end($order_ids)];

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

@@ -6,6 +6,7 @@ use DateTime;
use MailPoet\Cron\Workers\WooCommerceOrders; use MailPoet\Cron\Workers\WooCommerceOrders;
use MailPoet\Models\ScheduledTask; use MailPoet\Models\ScheduledTask;
use MailPoet\Models\StatisticsClicks; use MailPoet\Models\StatisticsClicks;
use MailPoet\Models\StatisticsWooCommercePurchases;
use MailPoet\Statistics\Track\WooCommercePurchases; use MailPoet\Statistics\Track\WooCommercePurchases;
use MailPoet\WooCommerce\Helper as WooCommerceHelper; use MailPoet\WooCommerce\Helper as WooCommerceHelper;
@@ -120,6 +121,35 @@ class WooCommerceOrdersTest extends \MailPoetTest {
expect($tasks[0]->status)->equals(ScheduledTask::STATUS_COMPLETED); expect($tasks[0]->status)->equals(ScheduledTask::STATUS_COMPLETED);
} }
function testItResetsPreviouslyTrackedOrders() {
$this->woocommerce_helper->method('isWooCommerceActive')->willReturn(true);
$this->woocommerce_helper->method('wcGetOrders')->willReturnOnConsecutiveCalls([1, 2], [3], [4]);
$click = $this->createClick();
$this->woocommerce_purchases->expects($this->exactly(4))->method('trackPurchase');
// wrong data inserted by a past buggy version should be removed for each order
// nothing new is inserted because we don't fully mock WC_Order (expect count 0)
$this->createOrder(1, $click);
$this->createOrder(2, $click);
$this->worker->process(); // schedule
$this->worker->process(); // prepare
$this->worker->process(); // run for 1, 2
expect(StatisticsWooCommercePurchases::findMany())->count(0);
// don't remove data for unrelated orders (for order ID 4 row should not be removed)
$this->createOrder(3, $click);
$this->createOrder(4, $click);
$this->worker->process(); // run for 3
$purchase_stats = StatisticsWooCommercePurchases::findMany();
expect($purchase_stats)->count(1);
expect($purchase_stats[0]->order_id)->equals(4);
// now row for order ID 4 should be removed as well
$this->worker->process(); // run for 4
expect(StatisticsWooCommercePurchases::findMany())->count(0);
}
function _after() { function _after() {
$this->cleanup(); $this->cleanup();
} }
@@ -139,6 +169,18 @@ class WooCommerceOrdersTest extends \MailPoetTest {
return $click->save(); return $click->save();
} }
private function createOrder($id, StatisticsClicks $click) {
$statistics = StatisticsWooCommercePurchases::create();
$statistics->newsletter_id = $click->newsletter_id;
$statistics->subscriber_id = $click->subscriber_id;
$statistics->queue_id = $click->queue_id;
$statistics->click_id = $click->id;
$statistics->order_id = $id;
$statistics->order_currency = 'EUR';
$statistics->order_price_total = 123.0;
$statistics->save();
}
private function cleanup() { private function cleanup() {
\ORM::raw_execute('TRUNCATE ' . ScheduledTask::$_table); \ORM::raw_execute('TRUNCATE ' . ScheduledTask::$_table);
\ORM::raw_execute('TRUNCATE ' . StatisticsClicks::$_table); \ORM::raw_execute('TRUNCATE ' . StatisticsClicks::$_table);