Merge branch 'MAUT-12558' into development

Author: fedys

Config/config.php

@@ -837,9 +837,8 @@
                 'class'     => \MauticPlugin\CustomObjectsBundle\EventListener\DynamicContentSubscriber::class,
                 'arguments' => [
                     'custom_object.query.filter.factory',
-                    'custom_object.query.filter.helper',
                     'custom_object.config.provider',
-                    'monolog.logger.mautic',
+                    'custom_object.helper.contact_filter_matcher',
                 ],
             ],
             'custom_object.serializer.subscriber' => [
@@ -863,12 +862,11 @@
                     'custom_object.query.filter.factory',
                     'mautic.custom.model.object',
                     'mautic.custom.model.item',
-                    'mautic.custom.model.field',
                     'custom_object.token.parser',
                     'mautic.campaign.model.event',
                     'event_dispatcher',
                     'custom_object.helper.token_formatter',
-                    '%mautic.custom_item_fetch_limit_per_lead%',
+                    'custom_object.helper.contact_filter_matcher',
                 ],
             ],
             'custom_object.segments.decorator_delegate.subscriber'   => [
@@ -1177,6 +1175,18 @@
                     'mautic.custom.model.item',
                 ],
             ],
+            'custom_object.helper.contact_filter_matcher' => [
+                'class'     => \MauticPlugin\CustomObjectsBundle\Helper\ContactFilterMatcher::class,
+                'arguments' => [
+                    'mautic.custom.model.field',
+                    'mautic.custom.model.object',
+                    'mautic.custom.model.item',
+                    'mautic.lead.repository.lead_list',
+                    'mautic.lead.repository.company',
+                    'doctrine.dbal.default_connection',
+                    '%mautic.custom_item_fetch_limit_per_lead%',
+                ],
+            ],
         ],
         'validators' => [
             'custom_object.allow.unique_identifier.validator' => [

EventListener/DynamicContentSubscriber.php

@@ -6,57 +6,30 @@
 
 use Mautic\DynamicContentBundle\DynamicContentEvents;
 use Mautic\DynamicContentBundle\Event\ContactFiltersEvaluateEvent;
-use Mautic\EmailBundle\EventListener\MatchFilterForLeadTrait;
-use MauticPlugin\CustomObjectsBundle\Exception\InvalidArgumentException;
 use MauticPlugin\CustomObjectsBundle\Exception\InvalidSegmentFilterException;
-use MauticPlugin\CustomObjectsBundle\Exception\NotFoundException;
-use MauticPlugin\CustomObjectsBundle\Helper\QueryFilterHelper;
+use MauticPlugin\CustomObjectsBundle\Helper\ContactFilterMatcher;
 use MauticPlugin\CustomObjectsBundle\Provider\ConfigProvider;
-use MauticPlugin\CustomObjectsBundle\Repository\DbalQueryTrait;
 use MauticPlugin\CustomObjectsBundle\Segment\Query\Filter\QueryFilterFactory;
-use PDOException;
-use Psr\Log\LoggerInterface;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
 class DynamicContentSubscriber implements EventSubscriberInterface
 {
-    use MatchFilterForLeadTrait;
-    use DbalQueryTrait;
-
-    /**
-     * @var QueryFilterFactory
-     */
-    private $queryFilterFactory;
-
-    /**
-     * @var QueryFilterHelper
-     */
-    private $queryFilterHelper;
-
-    /**
-     * @var ConfigProvider
-     */
-    private $configProvider;
-
-    /**
-     * @var LoggerInterface
-     */
-    private $logger;
+    private QueryFilterFactory $queryFilterFactory;
+    private ConfigProvider $configProvider;
+    private ContactFilterMatcher $contactFilterMatcher;
 
     public function __construct(
         QueryFilterFactory $queryFilterFactory,
-        QueryFilterHelper $queryFilterHelper,
         ConfigProvider $configProvider,
-        LoggerInterface $logger
+        ContactFilterMatcher $contactFilterMatcher
     ) {
-        $this->queryFilterFactory = $queryFilterFactory;
-        $this->queryFilterHelper  = $queryFilterHelper;
-        $this->configProvider     = $configProvider;
-        $this->logger             = $logger;
+        $this->queryFilterFactory   = $queryFilterFactory;
+        $this->configProvider       = $configProvider;
+        $this->contactFilterMatcher = $contactFilterMatcher;
     }
 
     /**
-     * @return mixed[]
+     * @return array<string,array{string,int}>
      */
     public static function getSubscribedEvents(): array
     {
@@ -65,47 +38,37 @@ public static function getSubscribedEvents(): array
         ];
     }
 
-    /**
-     * @throws InvalidArgumentException
-     * @throws NotFoundException
-     */
     public function evaluateFilters(ContactFiltersEvaluateEvent $event): void
     {
-        if (!$this->configProvider->pluginIsEnabled()) {
-            return;
-        }
-
-        $eventFilters = $event->getFilters();
-
-        if ($event->isEvaluated()) {
+        if ($event->isEvaluated()
+            || !$this->configProvider->pluginIsEnabled()
+            || !$this->hasCustomObjectFilters($event->getFilters())
+        ) {
             return;
         }
 
-        foreach ($eventFilters as $key => $eventFilter) {
-            $queryAlias = "filter_{$key}";
-
-            try {
-                $filterQueryBuilder = $this->queryFilterFactory->configureQueryBuilderFromSegmentFilter($eventFilter, $queryAlias);
-            } catch (InvalidSegmentFilterException $e) {
-                continue;
-            }
-
-            $this->queryFilterHelper->addContactIdRestriction($filterQueryBuilder, $queryAlias, (int) $event->getContact()->getId());
+        $event->setIsEvaluated(true);
+        $event->stopPropagation();
+        $event->setIsMatched($this->contactFilterMatcher->match(
+            $event->getFilters(),
+            $event->getContact()->getProfileFields()
+        ));
+    }
 
+    /**
+     * @param mixed[] $filters
+     */
+    private function hasCustomObjectFilters(array $filters): bool
+    {
+        foreach ($filters as $filter) {
             try {
-                if ($this->executeSelect($filterQueryBuilder)->rowCount()) {
-                    $event->setIsEvaluated(true);
-                    $event->setIsMatched(true);
-                } else {
-                    $event->setIsEvaluated(true);
-                }
-            } catch (PDOException $e) {
-                $this->logger->addError('Failed to evaluate dynamic content for custom object '.$e->getMessage());
+                $this->queryFilterFactory->configureQueryBuilderFromSegmentFilter($filter, 'filter');
 
-                throw $e;
+                return true;
+            } catch (InvalidSegmentFilterException $e) {
             }
-
-            $event->stopPropagation();  // The filter is ours, we won't allow no more processing
         }
+
+        return false;
     }
 }