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

Refactor Sending::saveSubscriberError() to use Doctrine instead of Paris

Browse Source 
[MAILPOET-4368]
This commit is contained in:
Rodrigo Primo
2023-07-07 11:25:45 -03:00
committed by Aschepikov
parent 11f8de4176
commit 8b4e747499
3 changed files with 28 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
mailpoet/lib/Newsletter/Sending/ScheduledTaskSubscribersRepository.php
View File

@@ -150,6 +150,20 @@ class ScheduledTaskSubscribersRepository extends Repository {
}
}
public function saveError(ScheduledTaskEntity $scheduledTask, int $subscriberId, string $errorMessage): void {
$scheduledTaskSubscriber = $this->findOneBy(['task' => $scheduledTask, 'subscriber' => $subscriberId]);
if ($scheduledTaskSubscriber instanceof ScheduledTaskSubscriberEntity) {
$scheduledTaskSubscriber->setFailed(ScheduledTaskSubscriberEntity::FAIL_STATUS_FAILED);
$scheduledTaskSubscriber->setProcessed(ScheduledTaskSubscriberEntity::STATUS_PROCESSED);
$scheduledTaskSubscriber->setError($errorMessage);
$this->persist($scheduledTaskSubscriber);
$this->flush();
$this->checkCompleted($scheduledTask);
}
}
private function checkCompleted(ScheduledTaskEntity $task): void {
$count = $this->countBy(['task' => $task, 'processed' => ScheduledTaskSubscriberEntity::STATUS_UNPROCESSED]);
if ($count === 0) {

22
mailpoet/lib/Tasks/Sending.php
View File

@@ -278,13 +278,7 @@ class Sending {
public function removeSubscribers(array $subscriberIds) {
$this->scheduledTaskSubscribersRepository->deleteByScheduledTaskAndSubscriberIds($this->scheduledTaskEntity, $subscriberIds);
// we need to update those fields here as the Sending class is in a mixed state using Paris and Doctrine at the same time
// this probably won't be necessary anymore once https://mailpoet.atlassian.net/browse/MAILPOET-4375 is finished
$this->task->status = $this->scheduledTaskEntity->getStatus();
if (!is_null($this->scheduledTaskEntity->getProcessedAt())) {
$this->task->processedAt = $this->scheduledTaskEntity->getProcessedAt()->format('Y-m-d H:i:s');
}
$this->updateTaskStatus();
$this->updateCount();
}
@@ -296,10 +290,22 @@ class Sending {
}
public function saveSubscriberError($subcriberId, $errorMessage) {
$this->taskSubscribers->saveSubscriberError($subcriberId, $errorMessage);
$this->scheduledTaskSubscribersRepository->saveError($this->scheduledTaskEntity, $subcriberId, $errorMessage);
$this->updateTaskStatus();
return $this->updateCount()->getErrors() === false;
}
private function updateTaskStatus() {
// we need to update those fields here as the Sending class is in a mixed state using Paris and Doctrine at the same time
// this probably won't be necessary anymore once https://mailpoet.atlassian.net/browse/MAILPOET-4375 is finished
$this->task->status = $this->scheduledTaskEntity->getStatus();
if (!is_null($this->scheduledTaskEntity->getProcessedAt())) {
$this->task->processedAt = $this->scheduledTaskEntity->getProcessedAt()->format('Y-m-d H:i:s');
}
}
public function updateCount(?int $count = null) {
if ($count) {
// increment/decrement counts based on known subscriber count, don't exceed the bounds

17
mailpoet/lib/Tasks/Subscribers.php
View File

@@ -17,21 +17,4 @@ class Subscribers {
public function getSubscribers() {
return ScheduledTaskSubscriber::where('task_id', $this->task->id);
}
public function saveSubscriberError($subcriberId, $errorMessage) {
$this->getSubscribers()
->where('subscriber_id', $subcriberId)
->findResultSet()
->set('failed', ScheduledTaskSubscriber::FAIL_STATUS_FAILED)
->set('processed', ScheduledTaskSubscriber::STATUS_PROCESSED)
->set('error', $errorMessage)
->save();
$this->checkCompleted();
}
private function checkCompleted($count = null) {
if (!$count && !ScheduledTaskSubscriber::getUnprocessedCount($this->task->id)) {
$this->task->complete();
}
}
}