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

Move onSettingsChange from Bridge service to SettingsChangeHandler

Browse Source 
Bridge is a low level service that processes requests and responses to/from Bridge API.
This change is needed so that we can remove dependency on MailPoet\Util\License\Features\Subscribers
service from the Bridge. The dependecy is a higher level service and may easily cause a circular dependency issue.

The SettingsChangeHandler is service for handling side effects
when saving settings. This feels as a better place to put the functionality.
[MAILPOET-5191]
This commit is contained in:
Rostislav Wolny
2023-04-25 14:38:40 +02:00
committed by Veljko V
parent ab19ef92d5
commit cd5a023b35
6 changed files with 82 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
mailpoet/lib/Settings/SettingsChangeHandler.php
View File

@@ -5,7 +5,10 @@ namespace MailPoet\Settings;
use MailPoet\Cron\Workers\InactiveSubscribers;
use MailPoet\Cron\Workers\WooCommerceSync;
use MailPoet\Entities\ScheduledTaskEntity;
use MailPoet\Mailer\Mailer;
use MailPoet\Newsletter\Sending\ScheduledTasksRepository;
use MailPoet\Services\Bridge;
use MailPoet\Services\SubscribersCountReporter;
use MailPoet\WP\Functions as WPFunctions;
use MailPoetVendor\Carbon\Carbon;
@@ -17,12 +20,22 @@ class SettingsChangeHandler {
/** @var SettingsController */
private $settingsController;
/** @var Bridge */
private $bridge;
/** @var SubscribersCountReporter */
private $subscribersCountReporter;
public function __construct(
ScheduledTasksRepository $scheduledTasksRepository,
SettingsController $settingsController
SettingsController $settingsController,
Bridge $bridge,
SubscribersCountReporter $subscribersCountReporter
) {
$this->scheduledTasksRepository = $scheduledTasksRepository;
$this->settingsController = $settingsController;
$this->bridge = $bridge;
$this->subscribersCountReporter = $subscribersCountReporter;
}
public function onSubscribeOldWoocommerceCustomersChange(): void {
@@ -77,4 +90,23 @@ class SettingsChangeHandler {
$task->setStatus(ScheduledTaskEntity::STATUS_SCHEDULED);
return $task;
}
public function updateBridge($settings) {
$apiKey = $settings[Mailer::MAILER_CONFIG_SETTING_NAME]['mailpoet_api_key'] ?? null;
$premiumKey = $settings['premium']['premium_key'] ?? null;
if (!empty($apiKey)) {
$apiKeyState = $this->bridge->checkMSSKey($apiKey);
$this->bridge->storeMSSKeyAndState($apiKey, $apiKeyState);
}
if (!empty($premiumKey)) {
$premiumState = $this->bridge->checkPremiumKey($premiumKey);
$this->bridge->storePremiumKeyAndState($premiumKey, $premiumState);
}
if ($apiKey && !empty($apiKeyState) && in_array($apiKeyState['state'], [Bridge::KEY_VALID, Bridge::KEY_VALID_UNDERPRIVILEGED], true)) {
return $this->subscribersCountReporter->report($apiKey);
}
if ($premiumKey && !empty($premiumState) && in_array($premiumState['state'], [Bridge::KEY_VALID, Bridge::KEY_VALID_UNDERPRIVILEGED], true)) {
return $this->subscribersCountReporter->report($apiKey);
}
}
}