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

Refactor updateProcessedSubscribers() to use Doctrine instead of Paris

Browse Source 
It was necessary to update a test to be more lenient when comparing
dates and another one to persist a change in Paris to the database.

[MAILPOET-4368]
This commit is contained in:
Rodrigo Primo
2023-07-07 09:37:17 -03:00
committed by Aschepikov
parent c0a091de04
commit 2b368141db
3 changed files with 6 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -276,8 +276,10 @@ class Sending {
$this->updateCount(); $this->updateCount();
} }
public function updateProcessedSubscribers(array $processedSubscribers) { public function updateProcessedSubscribers(array $processedSubscribers): bool {
$this->taskSubscribers->updateProcessedSubscribers($processedSubscribers); $this->scheduledTaskSubscribersRepository->updateProcessedSubscribers($this->scheduledTaskEntity, $processedSubscribers);
$this->scheduledTasksRepository->refresh($this->scheduledTaskEntity); // needed while Sending still uses Paris
$this->status = $this->scheduledTaskEntity->getStatus();
return $this->updateCount(count($processedSubscribers))->getErrors() === false; return $this->updateCount(count($processedSubscribers))->getErrors() === false;
} }

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

@@ -24,19 +24,6 @@ class Subscribers {
$this->checkCompleted(); $this->checkCompleted();
} }
public function updateProcessedSubscribers(array $processedSubscribers) {
if (!empty($processedSubscribers)) {
ScheduledTaskSubscriber::rawExecute(sprintf(
'UPDATE %1$s SET processed = %2$s WHERE task_id = %3$s AND subscriber_id IN (%4$s)',
ScheduledTaskSubscriber::$_table,
ScheduledTaskSubscriber::STATUS_PROCESSED,
$this->task->id,
join(', ', array_map('intval', $processedSubscribers))
));
}
$this->checkCompleted();
}
public function saveSubscriberError($subcriberId, $errorMessage) { public function saveSubscriberError($subcriberId, $errorMessage) {
$this->getSubscribers() $this->getSubscribers()
->where('subscriber_id', $subcriberId) ->where('subscriber_id', $subcriberId)

3
mailpoet/tests/integration/Cron/Workers/SendingQueue/SendingQueueTest.php
View File

@@ -271,6 +271,7 @@ class SendingQueueTest extends \MailPoetTest {
// in the process() method and after that execution limits will be enforced // in the process() method and after that execution limits will be enforced
$queue = $this->queue; $queue = $this->queue;
$queue->status = SendingQueue::STATUS_COMPLETED; $queue->status = SendingQueue::STATUS_COMPLETED;
$queue->save();
$sendingQueueWorker = $this->make( $sendingQueueWorker = $this->make(
$this->getSendingQueueWorker(), $this->getSendingQueueWorker(),
[ [
@@ -616,7 +617,7 @@ class SendingQueueTest extends \MailPoetTest {
$updatedNewsletter = $this->newslettersRepository->findOneById($this->newsletter->id); $updatedNewsletter = $this->newslettersRepository->findOneById($this->newsletter->id);
$this->assertInstanceOf(NewsletterEntity::class, $updatedNewsletter); $this->assertInstanceOf(NewsletterEntity::class, $updatedNewsletter);
verify($updatedNewsletter->getStatus())->equals(Newsletter::STATUS_SENT); verify($updatedNewsletter->getStatus())->equals(Newsletter::STATUS_SENT);
verify($updatedNewsletter->getSentAt())->equals($scheduledTask->getProcessedAt()); verify($updatedNewsletter->getSentAt())->equalsWithDelta($scheduledTask->getProcessedAt(), 1);
// queue subscriber processed/to process count is updated // queue subscriber processed/to process count is updated
verify($scheduledTask->getSubscribersByProcessed(ScheduledTaskSubscriber::STATUS_UNPROCESSED)) verify($scheduledTask->getSubscribersByProcessed(ScheduledTaskSubscriber::STATUS_UNPROCESSED))