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

Replace remaining usages of NewsletterTemplate model with Doctrine, remove the model

Browse Source 
[MAILPOET-2647]
This commit is contained in:
Jan Jakeš
2020-03-06 14:09:28 +01:00
committed by Veljko V
parent a88cc069a7
commit 2a6c777b96
2 changed files with 8 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/API/JSON/v1/Newsletters.php
View File

@ -9,6 +9,7 @@ use MailPoet\API\JSON\ResponseBuilders\NewslettersResponseBuilder;
use MailPoet\Config\AccessControl; use MailPoet\Config\AccessControl;
use MailPoet\Cron\CronHelper; use MailPoet\Cron\CronHelper;
use MailPoet\Cron\Workers\SendingQueue\Tasks\Newsletter as NewsletterQueueTask; use MailPoet\Cron\Workers\SendingQueue\Tasks\Newsletter as NewsletterQueueTask;
use MailPoet\DI\ContainerWrapper;
use MailPoet\Listing; use MailPoet\Listing;
use MailPoet\Mailer\Mailer as MailerFactory; use MailPoet\Mailer\Mailer as MailerFactory;
use MailPoet\Mailer\MetaInfo; use MailPoet\Mailer\MetaInfo;
@ -16,7 +17,6 @@ use MailPoet\Models\Newsletter;
use MailPoet\Models\NewsletterOption; use MailPoet\Models\NewsletterOption;
use MailPoet\Models\NewsletterOptionField; use MailPoet\Models\NewsletterOptionField;
use MailPoet\Models\NewsletterSegment; use MailPoet\Models\NewsletterSegment;
use MailPoet\Models\NewsletterTemplate;
use MailPoet\Models\SendingQueue; use MailPoet\Models\SendingQueue;
use MailPoet\Models\Subscriber; use MailPoet\Models\Subscriber;
use MailPoet\Newsletter\Listing\NewsletterListingRepository; use MailPoet\Newsletter\Listing\NewsletterListingRepository;
@ -25,6 +25,7 @@ use MailPoet\Newsletter\Renderer\Renderer;
use MailPoet\Newsletter\Scheduler\PostNotificationScheduler; use MailPoet\Newsletter\Scheduler\PostNotificationScheduler;
use MailPoet\Newsletter\Scheduler\Scheduler; use MailPoet\Newsletter\Scheduler\Scheduler;
use MailPoet\Newsletter\Url as NewsletterUrl; use MailPoet\Newsletter\Url as NewsletterUrl;
use MailPoet\NewsletterTemplates\NewsletterTemplatesRepository;
use MailPoet\Services\AuthorizedEmailsController; use MailPoet\Services\AuthorizedEmailsController;
use MailPoet\Settings\SettingsController; use MailPoet\Settings\SettingsController;
use MailPoet\Tasks\Sending as SendingTask; use MailPoet\Tasks\Sending as SendingTask;
@ -183,9 +184,9 @@ class Newsletters extends APIEndpoint {
} }
if (!empty($data['template_id'])) { if (!empty($data['template_id'])) {
$template = NewsletterTemplate::whereEqual('id', $data['template_id'])->findOne(); $template = ContainerWrapper::getInstance()->get(NewsletterTemplatesRepository::class)->findOneById($data['template_id']);
if ($template instanceof NewsletterTemplate) { if ($template) {
$data['body'] = $template->body; $data['body'] = json_encode($template->getBody());
} }
unset($data['template_id']); unset($data['template_id']);
} }
@ -582,9 +583,9 @@ class Newsletters extends APIEndpoint {
} else { } else {
// try to load template data // try to load template data
$templateId = (isset($data['template']) ? (int)$data['template'] : false); $templateId = (isset($data['template']) ? (int)$data['template'] : false);
$template = NewsletterTemplate::findOne($templateId); $template = ContainerWrapper::getInstance()->get(NewsletterTemplatesRepository::class)->findOneById($templateId);
if ($template instanceof NewsletterTemplate) { if ($template) {
$newsletter->body = $template->body; $newsletter->body = json_encode($template->getBody());
} else { } else {
$newsletter->body = []; $newsletter->body = [];
} }

32
lib/Models/NewsletterTemplate.php
View File

@ -1,32 +0,0 @@
<?php
namespace MailPoet\Models;
use MailPoet\WP\Functions as WPFunctions;
/**
* @property string $name
* @property int|null $newsletterId
* @property string $categories
* @property string $description
* @property string|null $body
* @property string|null $thumbnail
* @property int|null $readonly
*/
class NewsletterTemplate extends Model {
public static $_table = MP_NEWSLETTER_TEMPLATES_TABLE; // phpcs:ignore PSR2.Classes.PropertyDeclaration
const RECENTLY_SENT_CATEGORIES = '["recent"]';
const RECENTLY_SENT_COUNT = 12;
public function __construct() {
parent::__construct();
$this->addValidations('name', [
'required' => WPFunctions::get()->__('Please specify a name.', 'mailpoet'),
]);
$this->addValidations('body', [
'required' => WPFunctions::get()->__('The template body cannot be empty.', 'mailpoet'),
]);
}
}