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

New service for handling setting changes

Browse Source 
[MAILPOET-4061]
This commit is contained in:
John Oleksowicz
2022-01-27 13:21:23 -06:00
committed by Veljko V
parent 82a6fb8ac7
commit 00f3e3787d
6 changed files with 170 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
mailpoet/tests/integration/API/JSON/v1/SettingsTest.php
View File

@@ -9,7 +9,6 @@ use MailPoet\API\JSON\Response as APIResponse;
use MailPoet\API\JSON\v1\Settings;
use MailPoet\Config\ServicesChecker;
use MailPoet\Cron\Workers\InactiveSubscribers;
use MailPoet\Cron\Workers\WooCommerceSync;
use MailPoet\Entities\NewsletterEntity;
use MailPoet\Entities\ScheduledTaskEntity;
use MailPoet\Form\FormMessageController;
@@ -21,6 +20,7 @@ use MailPoet\Newsletter\Sending\ScheduledTasksRepository;
use MailPoet\Segments\SegmentsRepository;
use MailPoet\Services\AuthorizedEmailsController;
use MailPoet\Services\Bridge;
use MailPoet\Settings\SettingsChangeHandler;
use MailPoet\Settings\SettingsController;
use MailPoet\Settings\SettingsRepository;
use MailPoet\Settings\TrackingConfig;
@@ -40,16 +40,12 @@ class SettingsTest extends \MailPoetTest {
/** @var SettingsController */
private $settings;
/** @var ScheduledTasksRepository */
private $tasksRepository;
/* @var NewslettersRepository */
private $newsletterRepository;
public function _before() {
parent::_before();
ORM::raw_execute('TRUNCATE ' . ScheduledTask::$_table);
$this->tasksRepository = $this->diContainer->get(ScheduledTasksRepository::class);
$this->newsletterRepository = $this->diContainer->get(NewslettersRepository::class);
$this->settings = SettingsController::getInstance();
$this->settings->set('some.setting.key', true);
@@ -66,6 +62,7 @@ class SettingsTest extends \MailPoetTest {
$this->diContainer->get(FormMessageController::class),
$this->make(ServicesChecker::class, ['isMailPoetAPIKeyPendingApproval' => false]),
$this->diContainer->get(SegmentsRepository::class),
$this->diContainer->get(SettingsChangeHandler::class),
$this->diContainer->get(SubscribersCountsController::class),
$this->diContainer->get(TrackingConfig::class)
);
@@ -108,6 +105,7 @@ class SettingsTest extends \MailPoetTest {
$this->diContainer->get(FormMessageController::class),
$this->make(ServicesChecker::class, ['isMailPoetAPIKeyPendingApproval' => false]),
$this->diContainer->get(SegmentsRepository::class),
$this->diContainer->get(SettingsChangeHandler::class),
$this->diContainer->get(SubscribersCountsController::class),
$this->diContainer->get(TrackingConfig::class)
);
@@ -141,6 +139,7 @@ class SettingsTest extends \MailPoetTest {
$this->diContainer->get(FormMessageController::class),
$this->make(ServicesChecker::class, ['isMailPoetAPIKeyPendingApproval' => false]),
$this->diContainer->get(SegmentsRepository::class),
$this->diContainer->get(SettingsChangeHandler::class),
$this->diContainer->get(SubscribersCountsController::class),
$this->diContainer->get(TrackingConfig::class)
);
@@ -169,6 +168,7 @@ class SettingsTest extends \MailPoetTest {
$this->diContainer->get(FormMessageController::class),
$this->make(ServicesChecker::class, ['isMailPoetAPIKeyPendingApproval' => false]),
$this->diContainer->get(SegmentsRepository::class),
$this->diContainer->get(SettingsChangeHandler::class),
$this->diContainer->get(SubscribersCountsController::class),
$this->diContainer->get(TrackingConfig::class)
);
@@ -199,6 +199,7 @@ class SettingsTest extends \MailPoetTest {
$this->diContainer->get(FormMessageController::class),
$this->make(ServicesChecker::class),
$this->diContainer->get(SegmentsRepository::class),
$this->diContainer->get(SettingsChangeHandler::class),
$this->diContainer->get(SubscribersCountsController::class),
$this->diContainer->get(TrackingConfig::class)
);
@@ -247,54 +248,6 @@ class SettingsTest extends \MailPoetTest {
expect($this->settings->get('reply_to'))->isEmpty();
}
public function testItReschedulesScheduledTaskForWoocommerceSync(): void {
$newTask = $this->createScheduledTask(WooCommerceSync::TASK_TYPE);
assert($newTask instanceof ScheduledTaskEntity);
$this->endpoint->onSubscribeOldWoocommerceCustomersChange();
$this->entityManager->clear();
$task = $this->getScheduledTaskByType(WooCommerceSync::TASK_TYPE);
assert($task instanceof ScheduledTaskEntity);
$scheduledAt = $task->getScheduledAt();
assert($scheduledAt instanceof \DateTime);
$expectedScheduledAt = Carbon::createFromTimestamp(WPFunctions::get()->currentTime('timestamp'));
$expectedScheduledAt->subMinute();
expect($scheduledAt)->equals($expectedScheduledAt);
expect($newTask->getId())->equals($task->getId());
}
public function testItCreatesScheduledTaskForWoocommerceSync(): void {
$task = $this->getScheduledTaskByType(WooCommerceSync::TASK_TYPE);
expect($task)->null();
$this->endpoint->onSubscribeOldWoocommerceCustomersChange();
$task = $this->getScheduledTaskByType(WooCommerceSync::TASK_TYPE);
expect($task)->isInstanceOf(ScheduledTaskEntity::class);
}
public function testItReschedulesScheduledTaskForInactiveSubscribers(): void {
$newTask = $this->createScheduledTask(InactiveSubscribers::TASK_TYPE);
assert($newTask instanceof ScheduledTaskEntity);
$this->endpoint->onInactiveSubscribersIntervalChange();
$task = $this->getScheduledTaskByType(InactiveSubscribers::TASK_TYPE);
assert($task instanceof ScheduledTaskEntity);
$scheduledAt = $task->getScheduledAt();
assert($scheduledAt instanceof \DateTime);
$expectedScheduledAt = Carbon::createFromTimestamp(WPFunctions::get()->currentTime('timestamp'));
$expectedScheduledAt->subMinute();
expect($scheduledAt)->equals($expectedScheduledAt);
expect($newTask->getId())->equals($task->getId());
}
public function testItCreatesScheduledTaskForInactiveSubscribers(): void {
$task = $this->getScheduledTaskByType(InactiveSubscribers::TASK_TYPE);
expect($task)->null();
$this->endpoint->onInactiveSubscribersIntervalChange();
$task = $this->getScheduledTaskByType(InactiveSubscribers::TASK_TYPE);
expect($task)->isInstanceOf(ScheduledTaskEntity::class);
}
public function testItDeactivatesReEngagementEmailsIfTrackingDisabled(): void {
$this->createNewsletter(NewsletterEntity::TYPE_RE_ENGAGEMENT, NewsletterEntity::STATUS_ACTIVE);
$this->settings->set('tracking', ['level' => TrackingConfig::LEVEL_PARTIAL]);
@@ -321,22 +274,6 @@ class SettingsTest extends \MailPoetTest {
expect($response->meta['showNotice'])->equals(false);
}
private function createScheduledTask(string $type): ScheduledTaskEntity {
$task = new ScheduledTaskEntity();
$task->setType($type);
$task->setStatus(ScheduledTaskEntity::STATUS_SCHEDULED);
$this->tasksRepository->persist($task);
$this->tasksRepository->flush();
return $task;
}
private function getScheduledTaskByType(string $type): ?ScheduledTaskEntity {
return $this->tasksRepository->findOneBy([
'type' => $type,
'status' => ScheduledTaskEntity::STATUS_SCHEDULED,
]);
}
private function createNewsletter(string $type, string $status = NewsletterEntity::STATUS_DRAFT, $parent = null): NewsletterEntity {
$newsletter = new NewsletterEntity();
$newsletter->setType($type);