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

Extract NewsletterEntity lookup to a private method

Browse Source 
[MAILPOET-2646]
This commit is contained in:
Jan Jakeš
2020-04-30 13:28:15 +02:00
committed by Veljko V
parent 81dc5ad480
commit edf4f5b29a
1 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -108,10 +108,7 @@ class Newsletters extends APIEndpoint {
} }
public function get($data = []) { public function get($data = []) {
$newsletter = isset($data['id']) $newsletter = $this->getNewsletter($data);
? $this->newslettersRepository->findOneById((int)$data['id'])
: null;
if ($newsletter) { if ($newsletter) {
$response = $this->newslettersResponseBuilder->build($newsletter, [ $response = $this->newslettersResponseBuilder->build($newsletter, [
NewslettersResponseBuilder::RELATION_SEGMENTS, NewslettersResponseBuilder::RELATION_SEGMENTS,
@ -129,9 +126,7 @@ class Newsletters extends APIEndpoint {
} }
public function getWithStats($data = []) { public function getWithStats($data = []) {
$newsletter = isset($data['id']) $newsletter = $this->getNewsletter($data);
? $this->newslettersRepository->findOneById((int)$data['id'])
: null;
if ($newsletter) { if ($newsletter) {
$response = $this->newslettersResponseBuilder->build($newsletter, [ $response = $this->newslettersResponseBuilder->build($newsletter, [
NewslettersResponseBuilder::RELATION_SEGMENTS, NewslettersResponseBuilder::RELATION_SEGMENTS,
@ -408,10 +403,7 @@ class Newsletters extends APIEndpoint {
]); ]);
} }
$newsletter = isset($data['id']) $newsletter = $this->getNewsletter($data);
? $this->newslettersRepository->findOneById((int)$data['id'])
: null;
if (!$newsletter) { if (!$newsletter) {
return $this->errorResponse([ return $this->errorResponse([
APIError::NOT_FOUND => __('This email does not exist.', 'mailpoet'), APIError::NOT_FOUND => __('This email does not exist.', 'mailpoet'),
@ -549,6 +541,13 @@ class Newsletters extends APIEndpoint {
} }
} }
/** @return NewsletterEntity|null */
private function getNewsletter(array $data) {
return isset($data['id'])
? $this->newslettersRepository->findOneById((int)$data['id'])
: null;
}
private function getViewInBrowserUrl(NewsletterEntity $newsletter): string { private function getViewInBrowserUrl(NewsletterEntity $newsletter): string {
$url = NewsletterUrl::getViewInBrowserUrl( $url = NewsletterUrl::getViewInBrowserUrl(
(object)[ (object)[