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

Simplify fetching a single result from database

Browse Source 
[MAILPOET-2439]
This commit is contained in:
Pavel Dohnal
2019-10-29 15:34:17 +01:00
committed by Jack Kitterhing
parent 20ad724a98
commit ac9761228a
2 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/Cron/Workers/StatsNotifications/NewsletterLinkRepository.php
View File

@ -12,9 +12,7 @@ class NewsletterLinkRepository extends Repository {
/** /**
* @param int $newsletter_id * @param int $newsletter_id
* @return NewsletterLinkEntity * @return NewsletterLinkEntity|null
* @throws \MailPoetVendor\Doctrine\ORM\NoResultException
* @throws \MailPoetVendor\Doctrine\ORM\NonUniqueResultException
*/ */
public function findTopLinkForNewsletter($newsletter_id) { public function findTopLinkForNewsletter($newsletter_id) {
return $this->doctrine_repository return $this->doctrine_repository
@ -27,7 +25,7 @@ class NewsletterLinkRepository extends Repository {
->orderBy('counter', 'desc') ->orderBy('counter', 'desc')
->setMaxResults(1) ->setMaxResults(1)
->getQuery() ->getQuery()
->getSingleResult(); ->getOneOrNullResult();
} }
} }

6
lib/Cron/Workers/StatsNotifications/Worker.php
View File

@ -102,11 +102,7 @@ class Worker {
private function constructNewsletter(StatsNotificationEntity $stats_notification_entity) { private function constructNewsletter(StatsNotificationEntity $stats_notification_entity) {
$newsletter = $stats_notification_entity->getNewsletter(); $newsletter = $stats_notification_entity->getNewsletter();
try { $link = $this->newsletter_link_repository->findTopLinkForNewsletter($newsletter->getId());
$link = $this->newsletter_link_repository->findTopLinkForNewsletter($newsletter->getId());
} catch (\MailPoetVendor\Doctrine\ORM\UnexpectedResultException $e) {
$link = null;
}
$context = $this->prepareContext($newsletter, $link); $context = $this->prepareContext($newsletter, $link);
$subject = $newsletter->getLatestQueue()->getNewsletterRenderedSubject(); $subject = $newsletter->getLatestQueue()->getNewsletterRenderedSubject();
return [ return [