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

Replace NewsletterLink with NewsletterLinkEntity in the class Tasks\Links

Browse Source 
[MAILPOET-3816]
This commit is contained in:
Rodrigo Primo
2021-10-26 16:50:34 -03:00
committed by Veljko V
parent 0c8a8d8caa
commit 1501c4e54d
1 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
lib/Cron/Workers/SendingQueue/Tasks/Links.php
View File

@@ -2,8 +2,8 @@
namespace MailPoet\Cron\Workers\SendingQueue\Tasks; namespace MailPoet\Cron\Workers\SendingQueue\Tasks;
use MailPoet\Cron\Workers\StatsNotifications\NewsletterLinkRepository;
use MailPoet\Entities\NewsletterLinkEntity; use MailPoet\Entities\NewsletterLinkEntity;
use MailPoet\Models\NewsletterLink as NewsletterLinkModel;
use MailPoet\Newsletter\Links\Links as NewsletterLinks; use MailPoet\Newsletter\Links\Links as NewsletterLinks;
use MailPoet\Router\Endpoints\Track; use MailPoet\Router\Endpoints\Track;
use MailPoet\Router\Router; use MailPoet\Router\Router;
@@ -23,14 +23,19 @@ class Links {
/** @var SubscribersRepository */ /** @var SubscribersRepository */
private $subscribersRepository; private $subscribersRepository;
/** @var NewsletterLinkRepository */
private $newsletterLinkRepository;
public function __construct( public function __construct(
LinkTokens $linkTokens, LinkTokens $linkTokens,
NewsletterLinks $newsletterLinks, NewsletterLinks $newsletterLinks,
SubscribersRepository $subscribersRepository SubscribersRepository $subscribersRepository,
NewsletterLinkRepository $newsletterLinkRepository
) { ) {
$this->linkTokens = $linkTokens; $this->linkTokens = $linkTokens;
$this->newsletterLinks = $newsletterLinks; $this->newsletterLinks = $newsletterLinks;
$this->subscribersRepository = $subscribersRepository; $this->subscribersRepository = $subscribersRepository;
$this->newsletterLinkRepository = $newsletterLinkRepository;
} }
public function process($renderedNewsletter, $newsletter, $queue) { public function process($renderedNewsletter, $newsletter, $queue) {
@@ -61,17 +66,21 @@ class Links {
$subscriber = $this->subscribersRepository->findOneById($subscriberId); $subscriber = $this->subscribersRepository->findOneById($subscriberId);
$settings = SettingsController::getInstance(); $settings = SettingsController::getInstance();
if ((boolean)$settings->get('tracking.enabled') && $subscriber) { if ((boolean)$settings->get('tracking.enabled') && $subscriber) {
$linkHash = NewsletterLinkModel::where('queue_id', $queue->id) $linkHash = $this->newsletterLinkRepository->findOneBy(
->where('url', NewsletterLinkEntity::INSTANT_UNSUBSCRIBE_LINK_SHORT_CODE) [
->findOne(); 'queue' => $queue->id,
if (!$linkHash instanceof NewsletterLinkModel) { 'url' => NewsletterLinkEntity::INSTANT_UNSUBSCRIBE_LINK_SHORT_CODE,
]
);
if (!$linkHash instanceof NewsletterLinkEntity) {
return ''; return '';
} }
$data = $this->newsletterLinks->createUrlDataObject( $data = $this->newsletterLinks->createUrlDataObject(
$subscriber->getId(), $subscriber->getId(),
$this->linkTokens->getToken($subscriber), $this->linkTokens->getToken($subscriber),
$queue->id, $queue->id,
$linkHash->hash, $linkHash->getHash(),
false false
); );
$url = Router::buildRequest( $url = Router::buildRequest(