Set newsletter data using Doctrine
[MAILPOET-2900]
This commit is contained in:
Jan Jakeš
Veljko V
@ -3,6 +3,7 @@
|
||||
namespace MailPoet\Newsletter;
|
||||
|
||||
use MailPoet\Cron\Workers\SendingQueue\Tasks\Newsletter as NewsletterQueueTask;
|
||||
use MailPoet\Entities\NewsletterEntity;
|
||||
use MailPoet\InvalidStateException;
|
||||
use MailPoet\Models\Newsletter;
|
||||
use MailPoet\Models\NewsletterOption;
|
||||
@ -13,6 +14,7 @@ use MailPoet\Newsletter\Scheduler\PostNotificationScheduler;
|
||||
use MailPoet\Newsletter\Scheduler\Scheduler;
|
||||
use MailPoet\Newsletter\Url as NewsletterUrl;
|
||||
use MailPoet\NewsletterTemplates\NewsletterTemplatesRepository;
|
||||
use MailPoet\NotFoundException;
|
||||
use MailPoet\Services\AuthorizedEmailsController;
|
||||
use MailPoet\Settings\SettingsController;
|
||||
use MailPoet\UnexpectedValueException;
|
||||
@ -26,6 +28,9 @@ class NewsletterSaveController {
|
||||
/** @var Emoji */
|
||||
private $emoji;
|
||||
|
||||
/** @var NewslettersRepository */
|
||||
private $newslettersRepository;
|
||||
|
||||
/** @var NewsletterTemplatesRepository */
|
||||
private $newsletterTemplatesRepository;
|
||||
|
||||
@ -41,6 +46,7 @@ class NewsletterSaveController {
|
||||
public function __construct(
|
||||
AuthorizedEmailsController $authorizedEmailsController,
|
||||
Emoji $emoji,
|
||||
NewslettersRepository $newslettersRepository,
|
||||
NewsletterTemplatesRepository $newsletterTemplatesRepository,
|
||||
PostNotificationScheduler $postNotificationScheduler,
|
||||
SettingsController $settings,
|
||||
@ -48,6 +54,7 @@ class NewsletterSaveController {
|
||||
) {
|
||||
$this->authorizedEmailsController = $authorizedEmailsController;
|
||||
$this->emoji = $emoji;
|
||||
$this->newslettersRepository = $newslettersRepository;
|
||||
$this->newsletterTemplatesRepository = $newsletterTemplatesRepository;
|
||||
$this->postNotificationScheduler = $postNotificationScheduler;
|
||||
$this->settings = $settings;
|
||||
@ -57,56 +64,41 @@ class NewsletterSaveController {
|
||||
public function save(array $data = []): array {
|
||||
$data = $this->wp->applyFilters('mailpoet_api_newsletters_save_before', $data);
|
||||
|
||||
$segments = [];
|
||||
if (isset($data['segments'])) {
|
||||
$segments = $data['segments'];
|
||||
unset($data['segments']);
|
||||
}
|
||||
|
||||
$options = [];
|
||||
if (isset($data['options'])) {
|
||||
$options = $data['options'];
|
||||
unset($data['options']);
|
||||
}
|
||||
|
||||
if (!empty($data['template_id'])) {
|
||||
$template = $this->newsletterTemplatesRepository->findOneById($data['template_id']);
|
||||
if ($template) {
|
||||
$data['body'] = json_encode($template->getBody());
|
||||
}
|
||||
unset($data['template_id']);
|
||||
}
|
||||
|
||||
$oldNewsletter = null;
|
||||
$oldNewsletterModel = null;
|
||||
if (isset($data['id'])) {
|
||||
$fetched = Newsletter::findOne(intval($data['id']));
|
||||
$oldNewsletter = $fetched instanceof Newsletter ? $fetched : null;
|
||||
$oldNewsletterModel = $fetched instanceof Newsletter ? $fetched : null;
|
||||
}
|
||||
|
||||
if (!empty($data['body'])) {
|
||||
$data['body'] = $this->emoji->encodeForUTF8Column(MP_NEWSLETTERS_TABLE, 'body', $data['body']);
|
||||
}
|
||||
$newsletter = Newsletter::createOrUpdate($data);
|
||||
$errors = $newsletter->getErrors();
|
||||
if (!empty($errors)) {
|
||||
throw UnexpectedValueException::create()->withErrors($errors);
|
||||
}
|
||||
|
||||
// Re-fetch newsletter to sync changes made by DB
|
||||
// updated_at column use CURRENT_TIMESTAMP for update and this change is not updated automatically by ORM
|
||||
$newsletter = Newsletter::findOne($newsletter->id);
|
||||
if (!$newsletter) {
|
||||
$newsletter = $this->getNewsletter($data);
|
||||
$this->updateNewsletter($newsletter, $data);
|
||||
|
||||
// fetch old model for back compatibility
|
||||
$newsletterModel = Newsletter::findOne((int)$data['id']);
|
||||
if (!$newsletterModel) {
|
||||
throw new InvalidStateException();
|
||||
}
|
||||
|
||||
if (!empty($segments)) {
|
||||
NewsletterSegment::where('newsletter_id', $newsletter->id)
|
||||
$segments = $data['segments'] ?? [];
|
||||
if ($segments) {
|
||||
NewsletterSegment::where('newsletter_id', $newsletterModel->id)
|
||||
->deleteMany();
|
||||
foreach ($segments as $segment) {
|
||||
if (!is_array($segment)) continue;
|
||||
$relation = NewsletterSegment::create();
|
||||
$relation->segmentId = (int)$segment['id'];
|
||||
$relation->newsletterId = $newsletter->id;
|
||||
$relation->newsletterId = $newsletterModel->id;
|
||||
$relation->save();
|
||||
}
|
||||
}
|
||||
@ -119,17 +111,18 @@ class NewsletterSaveController {
|
||||
]);
|
||||
}
|
||||
|
||||
if (!empty($options)) {
|
||||
$options = $data['options'] ?? [];
|
||||
if ($options) {
|
||||
$optionFields = NewsletterOptionField::where(
|
||||
'newsletter_type',
|
||||
$newsletter->type
|
||||
$newsletterModel->type
|
||||
)->findMany();
|
||||
// update newsletter options
|
||||
foreach ($optionFields as $optionField) {
|
||||
if (isset($options[$optionField->name])) {
|
||||
$newsletterOption = NewsletterOption::createOrUpdate(
|
||||
[
|
||||
'newsletter_id' => $newsletter->id,
|
||||
'newsletter_id' => $newsletterModel->id,
|
||||
'option_field_id' => $optionField->id,
|
||||
'value' => $options[$optionField->name],
|
||||
]
|
||||
@ -137,17 +130,17 @@ class NewsletterSaveController {
|
||||
}
|
||||
}
|
||||
// reload newsletter with updated options
|
||||
$newsletter = Newsletter::filter('filterWithOptions', $newsletter->type)->findOne($newsletter->id);
|
||||
if (!$newsletter) {
|
||||
$newsletterModel = Newsletter::filter('filterWithOptions', $newsletterModel->type)->findOne($newsletterModel->id);
|
||||
if (!$newsletterModel) {
|
||||
throw new InvalidStateException();
|
||||
}
|
||||
// if this is a post notification, process newsletter options and update its schedule
|
||||
if ($newsletter->type === Newsletter::TYPE_NOTIFICATION) {
|
||||
if ($newsletterModel->type === Newsletter::TYPE_NOTIFICATION) {
|
||||
// generate the new schedule from options and get the new "next run" date
|
||||
$newsletter->schedule = $this->postNotificationScheduler->processPostNotificationSchedule($newsletter);
|
||||
$nextRunDate = Scheduler::getNextRunDate($newsletter->schedule);
|
||||
$newsletterModel->schedule = $this->postNotificationScheduler->processPostNotificationSchedule($newsletterModel);
|
||||
$nextRunDate = Scheduler::getNextRunDate($newsletterModel->schedule);
|
||||
// find previously scheduled jobs and reschedule them using the new "next run" date
|
||||
SendingQueue::findTaskByNewsletterId($newsletter->id)
|
||||
SendingQueue::findTaskByNewsletterId($newsletterModel->id)
|
||||
->where('tasks.status', SendingQueue::STATUS_SCHEDULED)
|
||||
->findResultSet()
|
||||
->set('scheduled_at', $nextRunDate)
|
||||
@ -155,25 +148,77 @@ class NewsletterSaveController {
|
||||
}
|
||||
}
|
||||
|
||||
$queue = $newsletter->getQueue();
|
||||
if ($queue && !in_array($newsletter->type, [Newsletter::TYPE_NOTIFICATION, Newsletter::TYPE_NOTIFICATION_HISTORY])) {
|
||||
$queue = $newsletterModel->getQueue();
|
||||
if ($queue && !in_array($newsletterModel->type, [Newsletter::TYPE_NOTIFICATION, Newsletter::TYPE_NOTIFICATION_HISTORY])) {
|
||||
// if newsletter was previously scheduled and is now unscheduled, set its status to DRAFT and delete associated queue record
|
||||
if ($newsletter->status === Newsletter::STATUS_SCHEDULED && isset($options['isScheduled']) && empty($options['isScheduled'])) {
|
||||
if ($newsletterModel->status === Newsletter::STATUS_SCHEDULED && isset($options['isScheduled']) && empty($options['isScheduled'])) {
|
||||
$queue->delete();
|
||||
$newsletter->status = Newsletter::STATUS_DRAFT;
|
||||
$newsletter->save();
|
||||
$newsletterModel->status = Newsletter::STATUS_DRAFT;
|
||||
$newsletterModel->save();
|
||||
} else {
|
||||
$queue->newsletterRenderedBody = null;
|
||||
$queue->newsletterRenderedSubject = null;
|
||||
$newsletterQueueTask = new NewsletterQueueTask();
|
||||
$newsletterQueueTask->preProcessNewsletter($newsletter, $queue);
|
||||
$newsletterQueueTask->preProcessNewsletter($newsletterModel, $queue);
|
||||
}
|
||||
}
|
||||
|
||||
$this->wp->doAction('mailpoet_api_newsletters_save_after', $newsletter);
|
||||
$this->authorizedEmailsController->onNewsletterUpdate($newsletter, $oldNewsletter);
|
||||
$this->wp->doAction('mailpoet_api_newsletters_save_after', $newsletterModel);
|
||||
$this->authorizedEmailsController->onNewsletterUpdate($newsletterModel, $oldNewsletterModel);
|
||||
|
||||
$previewUrl = NewsletterUrl::getViewInBrowserUrl($newsletter);
|
||||
return [$newsletter->asArray(), ['preview_url' => $previewUrl]];
|
||||
$previewUrl = NewsletterUrl::getViewInBrowserUrl($newsletterModel);
|
||||
return [$newsletterModel->asArray(), ['preview_url' => $previewUrl]];
|
||||
}
|
||||
|
||||
private function getNewsletter(array $data): NewsletterEntity {
|
||||
if (!isset($data['id'])) {
|
||||
throw new UnexpectedValueException();
|
||||
}
|
||||
|
||||
$newsletter = $this->newslettersRepository->findOneById((int)$data['id']);
|
||||
if (!$newsletter) {
|
||||
throw new NotFoundException();
|
||||
}
|
||||
return $newsletter;
|
||||
}
|
||||
|
||||
private function updateNewsletter(NewsletterEntity $newsletter, array $data) {
|
||||
if (array_key_exists('type', $data)) {
|
||||
$newsletter->setType($data['type']);
|
||||
}
|
||||
|
||||
if (array_key_exists('subject', $data)) {
|
||||
$newsletter->setSubject($data['subject']);
|
||||
}
|
||||
|
||||
if (array_key_exists('preheader', $data)) {
|
||||
$newsletter->setPreheader($data['preheader']);
|
||||
}
|
||||
|
||||
if (array_key_exists('body', $data)) {
|
||||
$newsletter->setBody(json_decode($data['body'], true));
|
||||
}
|
||||
|
||||
if (array_key_exists('ga_campaign', $data)) {
|
||||
$newsletter->setGaCampaign($data['ga_campaign']);
|
||||
}
|
||||
|
||||
if (array_key_exists('sender_name', $data)) {
|
||||
$newsletter->setSenderName($data['sender_name'] ?? '');
|
||||
}
|
||||
|
||||
if (array_key_exists('sender_address', $data)) {
|
||||
$newsletter->setSenderAddress($data['sender_address'] ?? '');
|
||||
}
|
||||
|
||||
if (array_key_exists('reply_to_name', $data)) {
|
||||
$newsletter->setReplyToName($data['reply_to_name'] ?? '');
|
||||
}
|
||||
|
||||
if (array_key_exists('reply_to_address', $data)) {
|
||||
$newsletter->setReplyToAddress($data['reply_to_address'] ?? '');
|
||||
}
|
||||
|
||||
$this->newslettersRepository->flush();
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user