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

Refactor segments listings to doctrine

Browse Source 
[MAILPOET-3168]
This commit is contained in:
Pavel Dohnal
2021-01-05 13:32:43 +01:00
committed by Veljko V
parent 3318b218ec
commit d93b168116
4 changed files with 104 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
lib/API/JSON/ResponseBuilders/SegmentsResponseBuilder.php
View File

@ -21,4 +21,26 @@ class SegmentsResponseBuilder {
'deleted_at' => ($deletedAt = $segment->getDeletedAt()) ? $deletedAt->format(self::DATE_FORMAT) : null,
];
}
public function buildForListing(array $segments): array {
$data = [];
foreach ($segments as $segment) {
$data[] = $this->buildListingItem($segment);
}
return $data;
}
private function buildListingItem(SegmentEntity $segment): array {
return [
'id' => (string)$segment->getId(), // (string) for BC
'name' => $segment->getName(),
'type' => $segment->getType(),
'description' => $segment->getDescription(),
'created_at' => $segment->getCreatedAt()->format(self::DATE_FORMAT),
'updated_at' => $segment->getUpdatedAt()->format(self::DATE_FORMAT),
'deleted_at' => ($deletedAt = $segment->getDeletedAt()) ? $deletedAt->format(self::DATE_FORMAT) : null,
'automated_emails_subjects' => [], // TODO
'subscribers_count' => [], // TODO
];
}
}

55
lib/API/JSON/v1/Segments.php
View File

@ -13,6 +13,7 @@ use MailPoet\Entities\SubscriberEntity;
use MailPoet\Listing;
use MailPoet\Models\Segment;
use MailPoet\Newsletter\Segment\NewsletterSegmentRepository;
use MailPoet\Segments\SegmentListingRepository;
use MailPoet\Segments\SegmentSaveController;
use MailPoet\Segments\SegmentsRepository;
use MailPoet\Segments\WooCommerce;
@ -52,10 +53,14 @@ class Segments extends APIEndpoint {
/** @var WP */
private $wpSegment;
/** @var SegmentListingRepository */
private $segmentListingRepository;
public function __construct(
Listing\BulkActionController $bulkAction,
Listing\Handler $listingHandler,
SegmentsRepository $segmentsRepository,
SegmentListingRepository $segmentListingRepository,
SegmentsResponseBuilder $segmentsResponseBuilder,
SegmentSaveController $segmentSavecontroller,
SubscribersRepository $subscribersRepository,
@ -72,6 +77,7 @@ class Segments extends APIEndpoint {
$this->subscribersRepository = $subscribersRepository;
$this->newsletterSegmentRepository = $newsletterSegmentRepository;
$this->wpSegment = $wpSegment;
$this->segmentListingRepository = $segmentListingRepository;
}
public function get($data = []) {
@ -87,33 +93,32 @@ class Segments extends APIEndpoint {
}
public function listing($data = []) {
$listingData = $this->listingHandler->get('\MailPoet\Models\Segment', $data);
$definition = $this->listingHandler->getListingDefinition($data);
$items = $this->segmentListingRepository->getData($definition);
$count = $this->segmentListingRepository->getCount($definition);
$filters = $this->segmentListingRepository->getFilters($definition);
$groups = $this->segmentListingRepository->getGroups($definition);
$segments = $this->segmentsResponseBuilder->buildForListing($items);
$data = [];
$segmendIds = array_map(function(Segment $segment): int {
return (int)$segment->id;
}, $listingData['items']);
$scheduledNewsletterSubjectsMap = $this->newsletterSegmentRepository->getScheduledNewsletterSubjectsBySegmentIds($segmendIds);
// $data = [];
// foreach ($listingData['items'] as $segment) {
// $scheduledNewsletterSubjectsMap = $this->newsletterSegmentRepository->getScheduledNewsletterSubjectsBySegmentIds($segmendIds);
// $segment->subscribersUrl = WPFunctions::get()->adminUrl(
// 'admin.php?page=mailpoet-subscribers#/filter[segment=' . $segment->id . ']'
// );
//
// $segmentData = $segment
// ->withSubscribersCount()
// ->withAutomatedEmailsSubjects()
// ->asArray();
// $segmentData['scheduled_emails_subjects'] = $scheduledNewsletterSubjectsMap[$segment->id] ?? [];
//$data[] = $segmentData;
// }
foreach ($listingData['items'] as $segment) {
$segment->subscribersUrl = WPFunctions::get()->adminUrl(
'admin.php?page=mailpoet-subscribers#/filter[segment=' . $segment->id . ']'
);
$segmentData = $segment
->withSubscribersCount()
->withAutomatedEmailsSubjects()
->asArray();
$segmentData['scheduled_emails_subjects'] = $scheduledNewsletterSubjectsMap[$segment->id] ?? [];
$data[] = $segmentData;
}
return $this->successResponse($data, [
'count' => $listingData['count'],
'filters' => $listingData['filters'],
'groups' => $listingData['groups'],
return $this->successResponse($segments, [
'count' => $count,
'filters' => $filters,
'groups' => $groups,
]);
}