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

Add dynamic filter connect type to response

Browse Source 
[MAILPOET-3469]
This commit is contained in:
Jan Lysý
2021-06-07 12:13:38 +02:00
committed by Veljko V
parent 9a66f36236
commit f4c2e4880a
3 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,6 +2,7 @@
namespace MailPoet\API\JSON\ResponseBuilders; namespace MailPoet\API\JSON\ResponseBuilders;
use MailPoet\Entities\DynamicSegmentFilterData;
use MailPoet\Entities\SegmentEntity; use MailPoet\Entities\SegmentEntity;
use MailPoet\Segments\SegmentSubscribersRepository; use MailPoet\Segments\SegmentSubscribersRepository;
use MailPoet\WP\Functions; use MailPoet\WP\Functions;
@ -24,6 +25,7 @@ class SegmentsResponseBuilder {
} }
public function build(SegmentEntity $segment): array { public function build(SegmentEntity $segment): array {
$firstFilter = $segment->getDynamicFilters()->first();
return [ return [
'id' => (string)$segment->getId(), // (string) for BC 'id' => (string)$segment->getId(), // (string) for BC
'name' => $segment->getName(), 'name' => $segment->getName(),
@ -33,6 +35,7 @@ class SegmentsResponseBuilder {
'updated_at' => $segment->getUpdatedAt()->format(self::DATE_FORMAT), 'updated_at' => $segment->getUpdatedAt()->format(self::DATE_FORMAT),
'deleted_at' => ($deletedAt = $segment->getDeletedAt()) ? $deletedAt->format(self::DATE_FORMAT) : null, 'deleted_at' => ($deletedAt = $segment->getDeletedAt()) ? $deletedAt->format(self::DATE_FORMAT) : null,
'average_engagement_score' => $segment->getAverageEngagementScore(), 'average_engagement_score' => $segment->getAverageEngagementScore(),
'filters_connect' => $firstFilter && isset($firstFilter->getFilterData['connect']) ? $firstFilter->getFilterData['connect'] : DynamicSegmentFilterData::CONNECT_TYPE_AND,
]; ];
} }

3
lib/Entities/DynamicSegmentFilterData.php
View File

@ -13,6 +13,9 @@ class DynamicSegmentFilterData {
const TYPE_WOOCOMMERCE = 'woocommerce'; const TYPE_WOOCOMMERCE = 'woocommerce';
const TYPE_WOOCOMMERCE_SUBSCRIPTION = 'woocommerceSubscription'; const TYPE_WOOCOMMERCE_SUBSCRIPTION = 'woocommerceSubscription';
public const CONNECT_TYPE_AND = 'and';
public const CONNECT_TYPE_OR = 'or';
/** /**
* @ORM\Column(type="serialized_array") * @ORM\Column(type="serialized_array")
* @var array|null * @var array|null

3
lib/Segments/DynamicSegments/FilterHandler.php
View File

@ -2,6 +2,7 @@
namespace MailPoet\Segments\DynamicSegments; namespace MailPoet\Segments\DynamicSegments;
use MailPoet\Entities\DynamicSegmentFilterData;
use MailPoet\Entities\SegmentEntity; use MailPoet\Entities\SegmentEntity;
use MailPoet\Entities\SubscriberEntity; use MailPoet\Entities\SubscriberEntity;
use MailPoet\Segments\SegmentDependencyValidator; use MailPoet\Segments\SegmentDependencyValidator;
@ -62,7 +63,7 @@ class FilterHandler {
$data = $filterData->getData(); $data = $filterData->getData();
$subscribersTable = $this->entityManager->getClassMetadata(SubscriberEntity::class)->getTableName(); $subscribersTable = $this->entityManager->getClassMetadata(SubscriberEntity::class)->getTableName();
if (!isset($data['connect']) || $data['connect'] === 'or') { if (!isset($data['connect']) || $data['connect'] === DynamicSegmentFilterData::CONNECT_TYPE_OR) {
// the final query: SELECT * FROM subscribers INNER JOIN (filter_select1 UNION filter_select2) filtered_subscribers ON filtered_subscribers.inner_subscriber_id = id // the final query: SELECT * FROM subscribers INNER JOIN (filter_select1 UNION filter_select2) filtered_subscribers ON filtered_subscribers.inner_subscriber_id = id
$queryBuilder->innerJoin( $queryBuilder->innerJoin(
$subscribersTable, $subscribersTable,