diff --git a/lib/API/JSON/ResponseBuilders/SegmentsResponseBuilder.php b/lib/API/JSON/ResponseBuilders/SegmentsResponseBuilder.php index 553ed2692b..4f94adfe8b 100644 --- a/lib/API/JSON/ResponseBuilders/SegmentsResponseBuilder.php +++ b/lib/API/JSON/ResponseBuilders/SegmentsResponseBuilder.php @@ -1,8 +1,7 @@ -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(), ]; } diff --git a/lib/Entities/SegmentEntity.php b/lib/Entities/SegmentEntity.php index c4a43c1cc2..f5cc51dd93 100644 --- a/lib/Entities/SegmentEntity.php +++ b/lib/Entities/SegmentEntity.php @@ -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; + } } diff --git a/lib/Segments/DynamicSegments/FilterHandler.php b/lib/Segments/DynamicSegments/FilterHandler.php index 4c45e94f9f..7045ff4b8c 100644 --- a/lib/Segments/DynamicSegments/FilterHandler.php +++ b/lib/Segments/DynamicSegments/FilterHandler.php @@ -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,