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

Rename function in NewslettersRepository

Browse Source 
[MAILPOET-2946]
This commit is contained in:
Jan Lysý
2020-10-22 20:02:37 +02:00
committed by Veljko V
parent 3479783588
commit 080a822135
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/Newsletter/NewslettersRepository.php
View File

@ -322,7 +322,10 @@ class NewslettersRepository extends Repository {
return count($ids); return count($ids);
} }
public function existsNotificationHistory(NewsletterEntity $newsletter): bool { /**
* @return NewsletterEntity[]
*/
public function findSendigNotificationHistoryWithPausedTask(NewsletterEntity $newsletter): array {
$result = $this->entityManager->createQueryBuilder() $result = $this->entityManager->createQueryBuilder()
->select('n') ->select('n')
->from(NewsletterEntity::class, 'n') ->from(NewsletterEntity::class, 'n')
@ -336,9 +339,8 @@ class NewslettersRepository extends Repository {
->setParameter('type', NewsletterEntity::TYPE_NOTIFICATION_HISTORY) ->setParameter('type', NewsletterEntity::TYPE_NOTIFICATION_HISTORY)
->setParameter('status', NewsletterEntity::STATUS_SENDING) ->setParameter('status', NewsletterEntity::STATUS_SENDING)
->setParameter('taskStatus', ScheduledTaskEntity::STATUS_PAUSED) ->setParameter('taskStatus', ScheduledTaskEntity::STATUS_PAUSED)
->setMaxResults(1)
->getQuery()->execute(); ->getQuery()->execute();
return count($result) > 0; return $result;
} }
public function prefetchOptions(array $newsletters) { public function prefetchOptions(array $newsletters) {

4
lib/Newsletter/Scheduler/PostNotificationScheduler.php
View File

@ -91,8 +91,8 @@ class PostNotificationScheduler {
} }
public function createPostNotificationSendingTask(NewsletterEntity $newsletter): ?SendingTask { public function createPostNotificationSendingTask(NewsletterEntity $newsletter): ?SendingTask {
$notificationHistoryExists = $this->newslettersRepository->existsNotificationHistory($newsletter); $notificationHistory = $this->newslettersRepository->findSendigNotificationHistoryWithPausedTask($newsletter);
if ($notificationHistoryExists) { if (count($notificationHistory) > 0) {
return null; return null;
} }