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

Fix trashing check to check also welcome and automatic emails

Browse Source 
[MAILPOET-3463]
This commit is contained in:
Rostislav Wolny
2021-03-25 14:22:44 +01:00
committed by Veljko V
parent fc66381da2
commit 51e5206ed8
6 changed files with 218 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
lib/Newsletter/Segment/NewsletterSegmentRepository.php
View File

@ -5,36 +5,62 @@ namespace MailPoet\Newsletter\Segment;
use MailPoet\Doctrine\Repository;
use MailPoet\Entities\NewsletterEntity;
use MailPoet\Entities\NewsletterSegmentEntity;
use MailPoet\Newsletter\Options\NewsletterOptionsRepository;
use MailPoetVendor\Doctrine\ORM\EntityManager;
/**
* @extends Repository<NewsletterSegmentEntity>
*/
class NewsletterSegmentRepository extends Repository {
/** @var NewsletterOptionsRepository */
private $newsletterOptionsRepository;
public function __construct(
NewsletterOptionsRepository $newsletterOptionsRepository,
EntityManager $entityManager
) {
parent::__construct($entityManager);
$this->newsletterOptionsRepository = $newsletterOptionsRepository;
}
protected function getEntityClassName() {
return NewsletterSegmentEntity::class;
}
public function getSubjectsOfActivelyUsedEmailsForSegments(array $segmentIds): array {
$results = $this->doctrineRepository->createQueryBuilder('ns')
$nameMap = [];
// Welcome emails
foreach ($this->newsletterOptionsRepository->findWelcomeNotificationsForSegments($segmentIds) as $option) {
$newsletter = $option->getNewsletter();
if (!$newsletter instanceof NewsletterEntity) continue;
$nameMap[(string)$option->getValue()][] = $newsletter->getSubject();
}
// Automatic emails
foreach ($this->newsletterOptionsRepository->findAutomaticEmailsForSegments($segmentIds) as $option) {
$newsletter = $option->getNewsletter();
if (!$newsletter instanceof NewsletterEntity) continue;
$nameMap[(string)$option->getValue()][] = $newsletter->getSubject();
}
$otherNewsletters = $this->doctrineRepository->createQueryBuilder('ns')
->join('ns.newsletter', 'n')
->leftJoin('n.queues', 'q')
->leftJoin('q.task', 't')
->select('IDENTITY(ns.segment) AS segment_id, n.subject')
->where('(n.type IN (:types) OR n.status = :scheduled OR (t.id IS NOT NULL AND t.status IS NULL))')
->where('(n.type = (:postNotification) OR n.status = :scheduled OR (t.id IS NOT NULL AND t.status IS NULL))')
->andWhere('ns.segment IN (:segmentIds)')
->setParameter('types', [
NewsletterEntity::TYPE_AUTOMATIC,
NewsletterEntity::TYPE_WELCOME,
NewsletterEntity::TYPE_NOTIFICATION,
])
->setParameter('postNotification', NewsletterEntity::TYPE_NOTIFICATION)
->setParameter('segmentIds', $segmentIds)
->setParameter('scheduled', NewsletterEntity::STATUS_SCHEDULED)
->addGroupBy('n.id, q.id, t.id')
->addGroupBy('ns.segment, q.id, t.id')
->getQuery()
->getResult();
$nameMap = [];
foreach ($results as $result) {
foreach ($otherNewsletters as $result) {
if (isset($nameMap[(string)$result['segment_id']]) && in_array($result['subject'], $nameMap[(string)$result['segment_id']])) {
continue;
}
$nameMap[(string)$result['segment_id']][] = $result['subject'];
}
return $nameMap;