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

Add getter for connect operand to SegmentEntity

Browse Source 
[MAILPOET-3469]
This commit is contained in:
Jan Lysý
2021-06-11 13:59:46 +02:00
committed by Veljko V
parent cb93b3f30d
commit 3fdbb050cd
3 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

13
lib/Entities/SegmentEntity.php
View File

@ -150,4 +150,17 @@ class SegmentEntity {
public function setAverageEngagementScoreUpdatedAt(?\DateTimeInterface $averageEngagementScoreUpdatedAt): void {
$this->averageEngagementScoreUpdatedAt = $averageEngagementScoreUpdatedAt;
}
/**
* Returns connect operand from the first filter, when doesn't exist, then returns a default value.
* @return string
*/
public function getFiltersConnectOperand(): string {
$firstFilter = $this->getDynamicFilters()->first();
$filterData = $firstFilter ? $firstFilter->getFilterData() : null;
if (!$firstFilter || !$filterData) {
return DynamicSegmentFilterData::CONNECT_TYPE_AND;
}
return $filterData->getParam('connect') ?: DynamicSegmentFilterData::CONNECT_TYPE_AND;
}
}

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

@ -59,11 +59,9 @@ class FilterHandler {
private function joinSubqueries(QueryBuilder $queryBuilder, SegmentEntity $segment, array $subQueries): QueryBuilder {
$filter = $segment->getDynamicFilters()->first();
if (!$filter) return $queryBuilder;
$filterData = $filter->getFilterData();
$data = $filterData->getData();
$subscribersTable = $this->entityManager->getClassMetadata(SubscriberEntity::class)->getTableName();
if (!isset($data['connect']) || $data['connect'] === DynamicSegmentFilterData::CONNECT_TYPE_OR) {
if ($segment->getFiltersConnectOperand() === 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
$queryBuilder->innerJoin(
$subscribersTable,