Replace NewsletterLink with NewsletterLinkEntity in the class Tasks\Links

[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

View File

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