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

Reschedule existing subscriber score task on reset

Browse Source 
[MAILPOET-3533]
This commit is contained in:
Jan Lysý
2021-05-10 10:09:28 +02:00
committed by Veljko V
parent 62cb468525
commit 28060c8e12
2 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/API/JSON/v1/Settings.php
View File

@ -9,6 +9,7 @@ use MailPoet\Config\ServicesChecker;
use MailPoet\Cron\Workers\SubscribersEngagementScore; use MailPoet\Cron\Workers\SubscribersEngagementScore;
use MailPoet\Entities\ScheduledTaskEntity; use MailPoet\Entities\ScheduledTaskEntity;
use MailPoet\Mailer\MailerLog; use MailPoet\Mailer\MailerLog;
use MailPoet\Newsletter\Sending\ScheduledTasksRepository;
use MailPoet\Services\AuthorizedEmailsController; use MailPoet\Services\AuthorizedEmailsController;
use MailPoet\Services\Bridge; use MailPoet\Services\Bridge;
use MailPoet\Settings\SettingsController; use MailPoet\Settings\SettingsController;
@ -44,6 +45,9 @@ class Settings extends APIEndpoint {
/** @var StatisticsOpensRepository */ /** @var StatisticsOpensRepository */
private $statisticsOpensRepository; private $statisticsOpensRepository;
/** @var ScheduledTasksRepository */
private $scheduledTasksRepository;
public $permissions = [ public $permissions = [
'global' => AccessControl::PERMISSION_MANAGE_SETTINGS, 'global' => AccessControl::PERMISSION_MANAGE_SETTINGS,
]; ];
@ -56,6 +60,7 @@ class Settings extends APIEndpoint {
WPFunctions $wp, WPFunctions $wp,
EntityManager $entityManager, EntityManager $entityManager,
StatisticsOpensRepository $statisticsOpensRepository, StatisticsOpensRepository $statisticsOpensRepository,
ScheduledTasksRepository $scheduledTasksRepository,
ServicesChecker $servicesChecker ServicesChecker $servicesChecker
) { ) {
$this->settings = $settings; $this->settings = $settings;
@ -66,6 +71,7 @@ class Settings extends APIEndpoint {
$this->wp = $wp; $this->wp = $wp;
$this->entityManager = $entityManager; $this->entityManager = $entityManager;
$this->statisticsOpensRepository = $statisticsOpensRepository; $this->statisticsOpensRepository = $statisticsOpensRepository;
$this->scheduledTasksRepository = $scheduledTasksRepository;
} }
public function get() { public function get() {
@ -104,10 +110,16 @@ class Settings extends APIEndpoint {
public function recalculateSubscribersScore() { public function recalculateSubscribersScore() {
$this->statisticsOpensRepository->resetSubscribersScoreCalculation(); $this->statisticsOpensRepository->resetSubscribersScoreCalculation();
$this->statisticsOpensRepository->resetSegmentsScoreCalculation(); $this->statisticsOpensRepository->resetSegmentsScoreCalculation();
$task = $this->scheduledTasksRepository->findOneBy([
'type' => SubscribersEngagementScore::TASK_TYPE,
'status' => ScheduledTaskEntity::STATUS_SCHEDULED,
]);
if (!$task) {
$task = new ScheduledTaskEntity(); $task = new ScheduledTaskEntity();
$task->setType(SubscribersEngagementScore::TASK_TYPE); $task->setType(SubscribersEngagementScore::TASK_TYPE);
$task->setScheduledAt(Carbon::createFromTimestamp($this->wp->currentTime('timestamp')));
$task->setStatus(ScheduledTaskEntity::STATUS_SCHEDULED); $task->setStatus(ScheduledTaskEntity::STATUS_SCHEDULED);
}
$task->setScheduledAt(Carbon::createFromTimestamp($this->wp->currentTime('timestamp')));
$this->entityManager->persist($task); $this->entityManager->persist($task);
$this->entityManager->flush(); $this->entityManager->flush();
return $this->successResponse(); return $this->successResponse();

5
tests/integration/API/JSON/v1/SettingsTest.php
View File

@ -11,6 +11,7 @@ use MailPoet\Cron\Workers\InactiveSubscribers;
use MailPoet\Mailer\MailerLog; use MailPoet\Mailer\MailerLog;
use MailPoet\Models\ScheduledTask; use MailPoet\Models\ScheduledTask;
use MailPoet\Newsletter\NewslettersRepository; use MailPoet\Newsletter\NewslettersRepository;
use MailPoet\Newsletter\Sending\ScheduledTasksRepository;
use MailPoet\Services\AuthorizedEmailsController; use MailPoet\Services\AuthorizedEmailsController;
use MailPoet\Services\Bridge; use MailPoet\Services\Bridge;
use MailPoet\Settings\SettingsController; use MailPoet\Settings\SettingsController;
@ -43,6 +44,7 @@ class SettingsTest extends \MailPoetTest {
WPFunctions::get(), WPFunctions::get(),
$this->diContainer->get(EntityManager::class), $this->diContainer->get(EntityManager::class),
$this->diContainer->get(StatisticsOpensRepository::class), $this->diContainer->get(StatisticsOpensRepository::class),
$this->diContainer->get(ScheduledTasksRepository::class),
$this->make(ServicesChecker::class, ['isMailPoetAPIKeyPendingApproval' => false]) $this->make(ServicesChecker::class, ['isMailPoetAPIKeyPendingApproval' => false])
); );
} }
@ -79,6 +81,7 @@ class SettingsTest extends \MailPoetTest {
WPFunctions::get(), WPFunctions::get(),
$this->diContainer->get(EntityManager::class), $this->diContainer->get(EntityManager::class),
$this->diContainer->get(StatisticsOpensRepository::class), $this->diContainer->get(StatisticsOpensRepository::class),
$this->diContainer->get(ScheduledTasksRepository::class),
$this->make(ServicesChecker::class, ['isMailPoetAPIKeyPendingApproval' => false]) $this->make(ServicesChecker::class, ['isMailPoetAPIKeyPendingApproval' => false])
); );
@ -106,6 +109,7 @@ class SettingsTest extends \MailPoetTest {
WPFunctions::get(), WPFunctions::get(),
$this->diContainer->get(EntityManager::class), $this->diContainer->get(EntityManager::class),
$this->diContainer->get(StatisticsOpensRepository::class), $this->diContainer->get(StatisticsOpensRepository::class),
$this->diContainer->get(ScheduledTasksRepository::class),
$this->make(ServicesChecker::class, ['isMailPoetAPIKeyPendingApproval' => false]) $this->make(ServicesChecker::class, ['isMailPoetAPIKeyPendingApproval' => false])
); );
@ -127,6 +131,7 @@ class SettingsTest extends \MailPoetTest {
WPFunctions::get(), WPFunctions::get(),
$this->diContainer->get(EntityManager::class), $this->diContainer->get(EntityManager::class),
$this->diContainer->get(StatisticsOpensRepository::class), $this->diContainer->get(StatisticsOpensRepository::class),
$this->diContainer->get(ScheduledTasksRepository::class),
$this->make(ServicesChecker::class) $this->make(ServicesChecker::class)
); );