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

Use Doctrine in Newsletters::get() API

Browse Source 
[MAILPOET-2216]
This commit is contained in:
Jan Jakeš
2019-07-25 17:25:44 +02:00
committed by M. Shull
parent 91dd0aa910
commit 19ee0734e2
5 changed files with 150 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,6 +5,7 @@ namespace MailPoet\API\JSON\v1;
use Carbon\Carbon;
use MailPoet\API\JSON\Endpoint as APIEndpoint;
use MailPoet\API\JSON\Error as APIError;
use MailPoet\API\JSON\ResponseBuilders\NewslettersResponseBuilder;
use MailPoet\Config\AccessControl;
use MailPoet\Cron\CronHelper;
use MailPoet\Cron\Workers\SendingQueue\Tasks\Newsletter as NewsletterQueueTask;
@@ -17,6 +18,7 @@ use MailPoet\Models\NewsletterTemplate;
use MailPoet\Models\SendingQueue;
use MailPoet\Models\Setting;
use MailPoet\Models\Subscriber;
use MailPoet\Newsletter\NewslettersRepository;
use MailPoet\Newsletter\Renderer\Renderer;
use MailPoet\Newsletter\Scheduler\Scheduler;
use MailPoet\Newsletter\Url as NewsletterUrl;
@@ -51,13 +53,21 @@ class Newsletters extends APIEndpoint {
'global' => AccessControl::PERMISSION_MANAGE_EMAILS,
];
/** @var NewslettersRepository */
private $newsletters_repository;
/** @var NewslettersResponseBuilder */
private $newsletters_response_builder;
function __construct(
Listing\BulkActionController $bulk_action,
Listing\Handler $listing_handler,
WPFunctions $wp,
WCHelper $woocommerce_helper,
SettingsController $settings,
AuthorizedEmailsController $authorized_emails_controller
AuthorizedEmailsController $authorized_emails_controller,
NewslettersRepository $newsletters_repository,
NewslettersResponseBuilder $newsletters_response_builder
) {
$this->bulk_action = $bulk_action;
$this->listing_handler = $listing_handler;
@@ -65,25 +75,28 @@ class Newsletters extends APIEndpoint {
$this->woocommerce_helper = $woocommerce_helper;
$this->settings = $settings;
$this->authorized_emails_controller = $authorized_emails_controller;
$this->newsletters_repository = $newsletters_repository;
$this->newsletters_response_builder = $newsletters_response_builder;
}
function get($data = []) {
$id = (isset($data['id']) ? (int)$data['id'] : false);
$newsletter = Newsletter::findOne($id);
if ($newsletter instanceof Newsletter) {
$newsletter = $newsletter
->withSegments()
->withOptions()
->withSendingQueue();
$newsletter = isset($data['id'])
? $this->newsletters_repository->findOneById((int)$data['id'])
: null;
if ($newsletter) {
$response = $this->newsletters_response_builder->build($newsletter);
$preview_url = NewsletterUrl::getViewInBrowserUrl(
NewsletterUrl::TYPE_LISTING_EDITOR,
$newsletter,
(object)[
'id' => $newsletter->getId(),
'hash' => $newsletter->getHash(),
],
Subscriber::getCurrentWPUser()
);
$newsletter = $this->wp->applyFilters('mailpoet_api_newsletters_get_after', $newsletter->asArray());
return $this->successResponse($newsletter, ['preview_url' => $preview_url]);
$response = $this->wp->applyFilters('mailpoet_api_newsletters_get_after', $response);
return $this->successResponse($response, ['preview_url' => $preview_url]);
} else {
return $this->errorResponse([
APIError::NOT_FOUND => WPFunctions::get()->__('This email does not exist.', 'mailpoet'),