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

Refactor sending task subscribers resend endpoint to doctrine

Browse Source 
[MAILPOET-4006]
This commit is contained in:
Rostislav Wolny
2022-03-22 14:49:48 +01:00
committed by Veljko V
parent 86164fd32e
commit 8291b2f19c
2 changed files with 35 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
mailpoet/lib/API/JSON/v1/SendingTaskSubscribers.php
View File

@ -7,12 +7,10 @@ use MailPoet\API\JSON\Error as APIError;
use MailPoet\API\JSON\ResponseBuilders\ScheduledTaskSubscriberResponseBuilder; use MailPoet\API\JSON\ResponseBuilders\ScheduledTaskSubscriberResponseBuilder;
use MailPoet\Config\AccessControl; use MailPoet\Config\AccessControl;
use MailPoet\Cron\CronHelper; use MailPoet\Cron\CronHelper;
use MailPoet\Entities\NewsletterEntity;
use MailPoet\Listing; use MailPoet\Listing;
use MailPoet\Models\Newsletter;
use MailPoet\Models\ScheduledTask;
use MailPoet\Models\ScheduledTaskSubscriber;
use MailPoet\Models\SendingQueue as SendingQueueModel;
use MailPoet\Newsletter\Sending\ScheduledTaskSubscribersListingRepository; use MailPoet\Newsletter\Sending\ScheduledTaskSubscribersListingRepository;
use MailPoet\Newsletter\Sending\ScheduledTaskSubscribersRepository;
use MailPoet\Newsletter\Sending\SendingQueuesRepository; use MailPoet\Newsletter\Sending\SendingQueuesRepository;
use MailPoet\Settings\SettingsController; use MailPoet\Settings\SettingsController;
use MailPoet\WP\Functions as WPFunctions; use MailPoet\WP\Functions as WPFunctions;
@ -37,6 +35,9 @@ class SendingTaskSubscribers extends APIEndpoint {
/** @var SendingQueuesRepository */ /** @var SendingQueuesRepository */
private $sendingQueuesRepository; private $sendingQueuesRepository;
/** @var ScheduledTaskSubscribersRepository */
private $scheduledTaskSubscribersRepository;
/** @var ScheduledTaskSubscribersListingRepository */ /** @var ScheduledTaskSubscribersListingRepository */
private $taskSubscribersListingRepository; private $taskSubscribersListingRepository;
@ -50,6 +51,7 @@ class SendingTaskSubscribers extends APIEndpoint {
SendingQueuesRepository $sendingQueuesRepository, SendingQueuesRepository $sendingQueuesRepository,
ScheduledTaskSubscribersListingRepository $taskSubscribersListingRepository, ScheduledTaskSubscribersListingRepository $taskSubscribersListingRepository,
ScheduledTaskSubscriberResponseBuilder $scheduledTaskSubscriberResponseBuilder, ScheduledTaskSubscriberResponseBuilder $scheduledTaskSubscriberResponseBuilder,
ScheduledTaskSubscribersRepository $scheduledTaskSubscribersRepository,
WPFunctions $wp WPFunctions $wp
) { ) {
$this->listingHandler = $listingHandler; $this->listingHandler = $listingHandler;
@ -58,6 +60,7 @@ class SendingTaskSubscribers extends APIEndpoint {
$this->sendingQueuesRepository = $sendingQueuesRepository; $this->sendingQueuesRepository = $sendingQueuesRepository;
$this->taskSubscribersListingRepository = $taskSubscribersListingRepository; $this->taskSubscribersListingRepository = $taskSubscribersListingRepository;
$this->scheduledTaskSubscriberResponseBuilder = $scheduledTaskSubscriberResponseBuilder; $this->scheduledTaskSubscriberResponseBuilder = $scheduledTaskSubscriberResponseBuilder;
$this->scheduledTaskSubscribersRepository = $scheduledTaskSubscribersRepository;
$this->wp = $wp; $this->wp = $wp;
} }
@ -94,41 +97,39 @@ class SendingTaskSubscribers extends APIEndpoint {
} }
public function resend($data = []) { public function resend($data = []) {
$taskId = !empty($data['taskId']) ? (int)$data['taskId'] : false; $taskId = !empty($data['taskId']) ? (int)$data['taskId'] : 0;
$subscriberId = !empty($data['subscriberId']) ? (int)$data['subscriberId'] : false; $subscriberId = !empty($data['subscriberId']) ? (int)$data['subscriberId'] : 0;
$taskSubscriber = ScheduledTaskSubscriber::where('task_id', $taskId)
->where('subscriber_id', $subscriberId) $taskSubscriber = $this->scheduledTaskSubscribersRepository->findOneBy([
->findOne(); 'task' => $taskId,
$task = ScheduledTask::findOne($taskId); 'subscriber' => $subscriberId,
$sendingQueue = SendingQueueModel::where('task_id', $taskId)->findOne(); 'failed' => 1,
]);
$sendingQueue = $this->sendingQueuesRepository->findOneBy(['task' => $taskId]);
if ( if (
!($task instanceof ScheduledTask) !$taskSubscriber
|| !($taskSubscriber instanceof ScheduledTaskSubscriber) || !$taskSubscriber->getTask()
|| !($sendingQueue instanceof SendingQueueModel) || !$sendingQueue
|| $taskSubscriber->failed != 1
) { ) {
return $this->errorResponse([ return $this->errorResponse([
APIError::NOT_FOUND => __('Failed sending task not found!', 'mailpoet'), APIError::NOT_FOUND => __('Failed sending task not found!', 'mailpoet'),
]); ]);
} }
$newsletter = Newsletter::findOne($sendingQueue->newsletterId);
if (!($newsletter instanceof Newsletter)) { $newsletter = $sendingQueue->getNewsletter();
if (!$newsletter) {
return $this->errorResponse([ return $this->errorResponse([
APIError::NOT_FOUND => __('Newsletter not found!', 'mailpoet'), APIError::NOT_FOUND => __('Newsletter not found!', 'mailpoet'),
]); ]);
} }
$taskSubscriber->error = ''; $taskSubscriber->resetToUnprocessed();
$taskSubscriber->failed = 0; $taskSubscriber->getTask()->setStatus(null);
$taskSubscriber->processed = 0; $newsletter->setStatus(NewsletterEntity::STATUS_SENDING);
$taskSubscriber->save(); // Each repository flushes all changes
$this->scheduledTaskSubscribersRepository->flush();
$task->status = null;
$task->save();
$newsletter->status = Newsletter::STATUS_SENDING;
$newsletter->save();
return $this->successResponse([]); return $this->successResponse([]);
} }
} }

6
mailpoet/lib/Entities/ScheduledTaskSubscriberEntity.php
View File

@ -123,4 +123,10 @@ class ScheduledTaskSubscriberEntity {
public function setSubscriber(SubscriberEntity $subscriber) { public function setSubscriber(SubscriberEntity $subscriber) {
$this->subscriber = $subscriber; $this->subscriber = $subscriber;
} }
public function resetToUnprocessed() {
$this->setError(null);
$this->setProcessed(0);
$this->setFailed(0);
}
} }