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

Remove condition for extra data on the response builder

Browse Source 
[MAILPOET-3820]
This commit is contained in:
Brezo Cordero
2021-12-03 10:38:46 -06:00
committed by Veljko V
parent 81e0772459
commit 98df610639
2 changed files with 9 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
lib/API/JSON/ResponseBuilders/SubscribersResponseBuilder.php
View File

@ -69,12 +69,12 @@ class SubscribersResponseBuilder {
]; ];
} }
public function build(SubscriberEntity $subscriberEntity, bool $isMPAPI = false): array { public function build(SubscriberEntity $subscriberEntity): array {
$data = [ $data = [
'id' => (string)$subscriberEntity->getId(), 'id' => (string)$subscriberEntity->getId(),
'wp_user_id' => $subscriberEntity->getWpUserId(), 'wp_user_id' => $subscriberEntity->getWpUserId(),
'is_woocommerce_user' => $subscriberEntity->getIsWoocommerceUser(), 'is_woocommerce_user' => $subscriberEntity->getIsWoocommerceUser(),
'subscriptions' => $this->buildSubscriptions($subscriberEntity, $isMPAPI), 'subscriptions' => $this->buildSubscriptions($subscriberEntity),
'unsubscribes' => $this->buildUnsubscribes($subscriberEntity), 'unsubscribes' => $this->buildUnsubscribes($subscriberEntity),
'status' => $subscriberEntity->getStatus(), 'status' => $subscriberEntity->getStatus(),
'last_name' => $subscriberEntity->getLastName(), 'last_name' => $subscriberEntity->getLastName(),
@ -97,27 +97,20 @@ class SubscribersResponseBuilder {
return $this->buildCustomFields($subscriberEntity, $data); return $this->buildCustomFields($subscriberEntity, $data);
} }
private function buildSubscriptions(SubscriberEntity $subscriberEntity, bool $isMPAPI = false): array { private function buildSubscriptions(SubscriberEntity $subscriberEntity): array {
$result = []; $result = [];
$subscriptions = $this->subscriberSegmentRepository->findBy(['subscriber' => $subscriberEntity]); $subscriptions = $this->subscriberSegmentRepository->findBy(['subscriber' => $subscriberEntity]);
foreach ($subscriptions as $subscription) { foreach ($subscriptions as $subscription) {
$segment = $subscription->getSegment(); $segment = $subscription->getSegment();
if ($segment instanceof SegmentEntity) { if ($segment instanceof SegmentEntity) {
$extraData = []; $result[] = [
if ( $isMPAPI ) { 'id' => $subscription->getId(),
$extraData = [ 'subscriber_id' => (string)$subscriberEntity->getId(),
'id' => $subscription->getId(), 'created_at' => $subscription->getCreatedAt()->format(self::DATE_FORMAT),
'subscriber_id' => (string)$subscriberEntity->getId(),
'created_at' => $subscription->getCreatedAt()->format(self::DATE_FORMAT),
];
}
$result[] = array_merge(
$extraData,
[
'segment_id' => (string)$segment->getId(), 'segment_id' => (string)$segment->getId(),
'status' => $subscription->getStatus(), 'status' => $subscription->getStatus(),
'updated_at' => $subscription->getUpdatedAt()->format(self::DATE_FORMAT), 'updated_at' => $subscription->getUpdatedAt()->format(self::DATE_FORMAT),
]); ];
} }
} }
return $result; return $result;

2
lib/API/MP/v1/Subscribers.php
View File

@ -161,7 +161,7 @@ class Subscribers {
} }
$this->subscribersRepository->refresh($subscriber); $this->subscribersRepository->refresh($subscriber);
return $this->subscribersResponseBuilder->build($subscriber, true ); return $this->subscribersResponseBuilder->build($subscriber);
} }
/** /**