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

Use cron worker scheduler service when scheduling Woo sync

Browse Source 
[MAILPOET-3726]
This commit is contained in:
Rostislav Wolny
2021-09-06 13:32:47 +02:00
committed by Veljko V
parent 8eaf9471f5
commit 5a5ec1cc19
1 changed files with 7 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
lib/API/JSON/v1/ImportExport.php
View File

@ -7,12 +7,11 @@ use MailPoet\API\JSON\Endpoint as APIEndpoint;
use MailPoet\API\JSON\Error as APIError; use MailPoet\API\JSON\Error as APIError;
use MailPoet\API\JSON\ResponseBuilders\SegmentsResponseBuilder; use MailPoet\API\JSON\ResponseBuilders\SegmentsResponseBuilder;
use MailPoet\Config\AccessControl; use MailPoet\Config\AccessControl;
use MailPoet\Cron\CronWorkerScheduler;
use MailPoet\Cron\Workers\WooCommerceSync; use MailPoet\Cron\Workers\WooCommerceSync;
use MailPoet\CustomFields\CustomFieldsRepository; use MailPoet\CustomFields\CustomFieldsRepository;
use MailPoet\Doctrine\Validator\ValidationException; use MailPoet\Doctrine\Validator\ValidationException;
use MailPoet\Entities\ScheduledTaskEntity;
use MailPoet\Newsletter\Options\NewsletterOptionsRepository; use MailPoet\Newsletter\Options\NewsletterOptionsRepository;
use MailPoet\Newsletter\Sending\ScheduledTasksRepository;
use MailPoet\Segments\SegmentSaveController; use MailPoet\Segments\SegmentSaveController;
use MailPoet\Segments\SegmentsRepository; use MailPoet\Segments\SegmentsRepository;
use MailPoet\Segments\WP; use MailPoet\Segments\WP;
@ -21,7 +20,6 @@ use MailPoet\Subscribers\ImportExport\Import\Import;
use MailPoet\Subscribers\ImportExport\Import\MailChimp; use MailPoet\Subscribers\ImportExport\Import\MailChimp;
use MailPoet\Subscribers\ImportExport\ImportExportRepository; use MailPoet\Subscribers\ImportExport\ImportExportRepository;
use MailPoet\Subscribers\SubscribersRepository; use MailPoet\Subscribers\SubscribersRepository;
use MailPoetVendor\Carbon\Carbon;
class ImportExport extends APIEndpoint { class ImportExport extends APIEndpoint {
@ -43,15 +41,15 @@ class ImportExport extends APIEndpoint {
/** @var SubscribersRepository */ /** @var SubscribersRepository */
private $subscriberRepository; private $subscriberRepository;
/** @var ScheduledTasksRepository */
private $scheduledTasksRepository;
/** @var SegmentSaveController */ /** @var SegmentSaveController */
private $segmentSavecontroller; private $segmentSavecontroller;
/** @var SegmentsResponseBuilder */ /** @var SegmentsResponseBuilder */
private $segmentsResponseBuilder; private $segmentsResponseBuilder;
/** @var CronWorkerScheduler */
private $cronWorkerScheduler;
public $permissions = [ public $permissions = [
'global' => AccessControl::PERMISSION_MANAGE_SUBSCRIBERS, 'global' => AccessControl::PERMISSION_MANAGE_SUBSCRIBERS,
]; ];
@ -62,9 +60,9 @@ class ImportExport extends APIEndpoint {
ImportExportRepository $importExportRepository, ImportExportRepository $importExportRepository,
NewsletterOptionsRepository $newsletterOptionsRepository, NewsletterOptionsRepository $newsletterOptionsRepository,
SegmentsRepository $segmentsRepository, SegmentsRepository $segmentsRepository,
ScheduledTasksRepository $scheduledTasksRepository,
SegmentSaveController $segmentSavecontroller, SegmentSaveController $segmentSavecontroller,
SegmentsResponseBuilder $segmentsResponseBuilder, SegmentsResponseBuilder $segmentsResponseBuilder,
CronWorkerScheduler $cronWorkerScheduler,
SubscribersRepository $subscribersRepository SubscribersRepository $subscribersRepository
) { ) {
$this->wpSegment = $wpSegment; $this->wpSegment = $wpSegment;
@ -73,8 +71,8 @@ class ImportExport extends APIEndpoint {
$this->newsletterOptionsRepository = $newsletterOptionsRepository; $this->newsletterOptionsRepository = $newsletterOptionsRepository;
$this->segmentsRepository = $segmentsRepository; $this->segmentsRepository = $segmentsRepository;
$this->subscriberRepository = $subscribersRepository; $this->subscriberRepository = $subscribersRepository;
$this->scheduledTasksRepository = $scheduledTasksRepository;
$this->segmentSavecontroller = $segmentSavecontroller; $this->segmentSavecontroller = $segmentSavecontroller;
$this->cronWorkerScheduler = $cronWorkerScheduler;
$this->segmentsResponseBuilder = $segmentsResponseBuilder; $this->segmentsResponseBuilder = $segmentsResponseBuilder;
} }
@ -156,18 +154,7 @@ class ImportExport extends APIEndpoint {
public function setupWooCommerceInitialImport() { public function setupWooCommerceInitialImport() {
try { try {
$task = $this->scheduledTasksRepository->findScheduledOrRunningTask(WooCommerceSync::TASK_TYPE); $this->cronWorkerScheduler->scheduleImmediatelyIfNotRunning(WooCommerceSync::TASK_TYPE);
if (($task instanceof ScheduledTaskEntity) && $task->getStatus() === null) {
return $this->successResponse();
}
if (!($task instanceof ScheduledTaskEntity)) {
$task = new ScheduledTaskEntity();
$task->setType(WooCommerceSync::TASK_TYPE);
$task->setStatus(ScheduledTaskEntity::STATUS_SCHEDULED);
$this->scheduledTasksRepository->persist($task);
}
$task->setScheduledAt(Carbon::createFromTimestamp((int)current_time('timestamp')));
$this->scheduledTasksRepository->flush();
return $this->successResponse(); return $this->successResponse();
} catch (\Exception $e) { } catch (\Exception $e) {
return $this->errorResponse([ return $this->errorResponse([