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

Refactor dynamic segments get endpoint to doctrine

Browse Source 
[MAILPOET-3177]
This commit is contained in:
Rostislav Wolny
2021-03-02 16:27:08 +01:00
committed by Veljko V
parent d42752fa99
commit bd63ae508f
4 changed files with 83 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/API/JSON/ResponseBuilders/DynamicSegmentsResponseBuilder.php
View File

@ -2,6 +2,7 @@
namespace MailPoet\API\JSON\ResponseBuilders;
use MailPoet\Entities\DynamicSegmentFilterEntity;
use MailPoet\Entities\SegmentEntity;
use MailPoet\Entities\SubscriberEntity;
use MailPoet\Segments\SegmentSubscribersRepository;
@ -29,6 +30,16 @@ class DynamicSegmentsResponseBuilder {
$this->wp = $wp;
}
public function build(SegmentEntity $segmentEntity) {
$data = $this->segmentsResponseBuilder->build($segmentEntity);
// So far we allow dynamic segments to have only one filter
$filter = $segmentEntity->getDynamicFilters()->first();
if (!$filter instanceof DynamicSegmentFilterEntity) {
return $data;
}
return array_merge($data, $filter->getFilterData() ?? []);
}
public function buildForListing(array $segments): array {
$data = [];
foreach ($segments as $segment) {

22
lib/API/JSON/v1/DynamicSegments.php
View File

@ -13,10 +13,12 @@ use MailPoet\DynamicSegments\Mappers\DBMapper;
use MailPoet\DynamicSegments\Mappers\FormDataMapper;
use MailPoet\DynamicSegments\Persistence\Loading\SingleSegmentLoader;
use MailPoet\DynamicSegments\Persistence\Saver;
use MailPoet\Entities\SegmentEntity;
use MailPoet\Listing\BulkActionController;
use MailPoet\Listing\Handler;
use MailPoet\Models\Model;
use MailPoet\Segments\DynamicSegments\DynamicSegmentsListingRepository;
use MailPoet\Segments\SegmentsRepository;
use MailPoet\WP\Functions as WPFunctions;
class DynamicSegments extends APIEndpoint {
@ -43,6 +45,9 @@ class DynamicSegments extends APIEndpoint {
/** @var DynamicSegmentsListingRepository */
private $dynamicSegmentsListingRepository;
/** @var SegmentsRepository */
private $segmentsRepository;
/** @var DynamicSegmentsResponseBuilder */
private $segmentsResponseBuilder;
@ -51,6 +56,7 @@ class DynamicSegments extends APIEndpoint {
Handler $handler,
DynamicSegmentsListingRepository $dynamicSegmentsListingRepository,
DynamicSegmentsResponseBuilder $segmentsResponseBuilder,
SegmentsRepository $segmentsRepository,
$mapper = null,
$saver = null,
$dynamicSegmentsLoader = null
@ -62,6 +68,7 @@ class DynamicSegments extends APIEndpoint {
$this->dynamicSegmentsLoader = $dynamicSegmentsLoader ?: new SingleSegmentLoader(new DBMapper());
$this->dynamicSegmentsListingRepository = $dynamicSegmentsListingRepository;
$this->segmentsResponseBuilder = $segmentsResponseBuilder;
$this->segmentsRepository = $segmentsRepository;
}
public function get($data = []) {
@ -73,21 +80,14 @@ class DynamicSegments extends APIEndpoint {
]);
}
try {
$segment = $this->dynamicSegmentsLoader->load($id);
$filters = $segment->getFilters();
return $this->successResponse(array_merge([
'name' => $segment->name,
'description' => $segment->description,
'id' => $segment->id,
], $filters[0]->toArray()));
} catch (\InvalidArgumentException $e) {
$segment = $this->segmentsRepository->findOneById($id);
if (!$segment instanceof SegmentEntity) {
return $this->errorResponse([
Error::NOT_FOUND => WPFunctions::get()->__('This segment does not exist.', 'mailpoet'),
]);
}
return $this->successResponse($this->segmentsResponseBuilder->build($segment));
}
public function save($data) {