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

Refactor setupWooCommerceInitialImport to Doctrine

Browse Source 
[MAILPOET-3625]
This commit is contained in:
Pavel Dohnal
2021-08-19 10:19:55 +02:00
committed by Veljko V
parent e31707903e
commit 3d1e2c5a2e
2 changed files with 33 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,9 +6,11 @@ use MailPoet\API\JSON\Endpoint as APIEndpoint;
use MailPoet\Config\AccessControl;
use MailPoet\Cron\Workers\WooCommerceSync;
use MailPoet\CustomFields\CustomFieldsRepository;
use MailPoet\Entities\ScheduledTaskEntity;
use MailPoet\Models\ScheduledTask;
use MailPoet\Models\Segment;
use MailPoet\Newsletter\Options\NewsletterOptionsRepository;
use MailPoet\Newsletter\Sending\ScheduledTasksRepository;
use MailPoet\Segments\SegmentsRepository;
use MailPoet\Segments\WP;
use MailPoet\Subscribers\ImportExport\Export\Export;
@ -38,6 +40,9 @@ class ImportExport extends APIEndpoint {
/** @var SubscribersRepository */
private $subscriberRepository;
/** @var ScheduledTasksRepository */
private $scheduledTasksRepository;
public $permissions = [
'global' => AccessControl::PERMISSION_MANAGE_SUBSCRIBERS,
];
@ -48,6 +53,7 @@ class ImportExport extends APIEndpoint {
ImportExportRepository $importExportRepository,
NewsletterOptionsRepository $newsletterOptionsRepository,
SegmentsRepository $segmentsRepository,
ScheduledTasksRepository $scheduledTasksRepository,
SubscribersRepository $subscribersRepository
) {
$this->wpSegment = $wpSegment;
@ -56,6 +62,7 @@ class ImportExport extends APIEndpoint {
$this->newsletterOptionsRepository = $newsletterOptionsRepository;
$this->segmentsRepository = $segmentsRepository;
$this->subscriberRepository = $subscribersRepository;
$this->scheduledTasksRepository = $scheduledTasksRepository;
}
public function getMailChimpLists($data) {
@ -133,19 +140,18 @@ class ImportExport extends APIEndpoint {
public function setupWooCommerceInitialImport() {
try {
$task = ScheduledTask::where('type', WooCommerceSync::TASK_TYPE)
->whereRaw('status = ? OR status IS NULL', [ScheduledTask::STATUS_SCHEDULED])
->findOne();
if (($task instanceof ScheduledTask) && $task->status === null) {
$task = $this->scheduledTasksRepository->findScheduledOrRunningTask([WooCommerceSync::TASK_TYPE]);
if (($task instanceof ScheduledTaskEntity) && $task->getStatus() === null) {
return $this->successResponse();
}
if (!($task instanceof ScheduledTask)) {
$task = ScheduledTask::create();
$task->type = WooCommerceSync::TASK_TYPE;
$task->status = ScheduledTask::STATUS_SCHEDULED;
if (!($task instanceof ScheduledTaskEntity)) {
$task = new ScheduledTaskEntity();
$task->setType(WooCommerceSync::TASK_TYPE);
$task->setStatus(ScheduledTaskEntity::STATUS_SCHEDULED);
$this->scheduledTasksRepository->persist($task);
}
$task->scheduledAt = Carbon::createFromTimestamp((int)current_time('timestamp'));
$task->save();
$task->setScheduledAt(Carbon::createFromTimestamp((int)current_time('timestamp')));
$this->scheduledTasksRepository->flush();
return $this->successResponse();
} catch (\Exception $e) {
return $this->errorResponse([

17
lib/Newsletter/Sending/ScheduledTasksRepository.php
View File

@ -46,6 +46,23 @@ class ScheduledTasksRepository extends Repository {
->getResult();
}
/**
* @param string[] $types
* @return ScheduledTaskEntity|null
*/
public function findScheduledOrRunningTask(array $types = []): ?ScheduledTaskEntity {
$queryBuilder = $this->doctrineRepository->createQueryBuilder('st')
->select('st')
->where('(st.status = :scheduledStatus) OR (st.status is NULL)')
->setParameter('scheduledStatus', ScheduledTaskEntity::STATUS_SCHEDULED);
if (!empty($types)) {
$queryBuilder
->andWhere('st.type in (:types)')
->setParameter('types', $types);
}
return $queryBuilder->getQuery()->getOneOrNullResult();
}
protected function getEntityClassName() {
return ScheduledTaskEntity::class;
}