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

Refactor public API getSubscriber to doctrine

Browse Source 
[MAILPOET-4295]
This commit is contained in:
Rostislav Wolny
2022-08-29 15:50:05 +02:00
committed by Aschepikov
parent 3d4ca982a6
commit 1dac2522c6
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mailpoet/lib/API/MP/v1/API.php
View File

@ -3,7 +3,6 @@
namespace MailPoet\API\MP\v1; namespace MailPoet\API\MP\v1;
use MailPoet\Config\Changelog; use MailPoet\Config\Changelog;
use MailPoet\Models\Subscriber;
/** /**
* API used by other plugins * API used by other plugins
@ -82,12 +81,7 @@ class API {
} }
public function getSubscriber($subscriberEmail) { public function getSubscriber($subscriberEmail) {
$subscriber = Subscriber::findOne($subscriberEmail); return $this->subscribers->getSubscriber($subscriberEmail);
// throw exception when subscriber does not exist
if (!$subscriber) {
throw new APIException(__('This subscriber does not exist.', 'mailpoet'), APIException::SUBSCRIBER_NOT_EXISTS);
}
return $subscriber->withCustomFields()->withSubscriptions()->asArray();
} }
public function isSetupComplete() { public function isSetupComplete() {

5
mailpoet/lib/API/MP/v1/Subscribers.php
View File

@ -88,6 +88,11 @@ class Subscribers {
$this->wp = $wp; $this->wp = $wp;
} }
public function getSubscriber($subscriberIdOrEmail): array {
$subscriber = $this->findSubscriber($subscriberIdOrEmail);
return $this->subscribersResponseBuilder->build($subscriber);
}
public function addSubscriber(array $data, array $listIds = [], array $options = []): array { public function addSubscriber(array $data, array $listIds = [], array $options = []): array {
$sendConfirmationEmail = !(isset($options['send_confirmation_email']) && $options['send_confirmation_email'] === false); $sendConfirmationEmail = !(isset($options['send_confirmation_email']) && $options['send_confirmation_email'] === false);
$scheduleWelcomeEmail = !(isset($options['schedule_welcome_email']) && $options['schedule_welcome_email'] === false); $scheduleWelcomeEmail = !(isset($options['schedule_welcome_email']) && $options['schedule_welcome_email'] === false);