Merge branch 'MAUT-11460' into development

Author: Avikarsha Saha

Config/config.php

@@ -868,6 +868,7 @@
                     'mautic.campaign.model.event',
                     'event_dispatcher',
                     'custom_object.helper.token_formatter',
+                    '%mautic.custom_item_fetch_limit_per_lead%',
                 ],
             ],
             'custom_object.segments.decorator_delegate.subscriber'   => [
@@ -1189,10 +1190,11 @@
         ],
     ],
     'parameters' => [
-        ConfigProvider::CONFIG_PARAM_ENABLED                                  => true,
-        ConfigProvider::CONFIG_PARAM_ITEM_VALUE_TO_CONTACT_RELATION_LIMIT     => ConfigProvider::CONFIG_PARAM_ITEM_VALUE_TO_CONTACT_RELATION_DEFAULT_LIMIT,
-        'custom_item_export_dir'                                              => '%kernel.root_dir%/../media/files/temp',
-        'custom_object_merge_filter'                                          => false,
+        ConfigProvider::CONFIG_PARAM_ENABLED                                           => true,
+        ConfigProvider::CONFIG_PARAM_ITEM_VALUE_TO_CONTACT_RELATION_LIMIT              => ConfigProvider::CONFIG_PARAM_ITEM_VALUE_TO_CONTACT_RELATION_DEFAULT_LIMIT,
+        'custom_item_export_dir'                                                       => '%kernel.root_dir%/../media/files/temp',
+        'custom_object_merge_filter'                                                   => false,
+        'custom_item_fetch_limit_per_lead'                                             => 15,
     ],
 ];
 

EventListener/TokenSubscriber.php

@@ -98,6 +98,11 @@ class TokenSubscriber implements EventSubscriberInterface
      */
     private $tokenFormatter;
 
+    /**
+     * @var int
+     */
+    private $leadCustomItemFetchLimit;
+
     public function __construct(
         ConfigProvider $configProvider,
         QueryFilterHelper $queryFilterHelper,
@@ -108,18 +113,20 @@ public function __construct(
         TokenParser $tokenParser,
         EventModel $eventModel,
         EventDispatcherInterface $eventDispatcher,
-        TokenFormatter $tokenFormatter
+        TokenFormatter $tokenFormatter,
+        int $leadCustomItemFetchLimit
     ) {
-        $this->configProvider     = $configProvider;
-        $this->queryFilterHelper  = $queryFilterHelper;
-        $this->queryFilterFactory = $queryFilterFactory;
-        $this->customObjectModel  = $customObjectModel;
-        $this->customItemModel    = $customItemModel;
-        $this->customFieldModel   = $customFieldModel;
-        $this->tokenParser        = $tokenParser;
-        $this->eventModel         = $eventModel;
-        $this->eventDispatcher    = $eventDispatcher;
-        $this->tokenFormatter     = $tokenFormatter;
+        $this->configProvider                    = $configProvider;
+        $this->queryFilterHelper                 = $queryFilterHelper;
+        $this->queryFilterFactory                = $queryFilterFactory;
+        $this->customObjectModel                 = $customObjectModel;
+        $this->customItemModel                   = $customItemModel;
+        $this->customFieldModel                  = $customFieldModel;
+        $this->tokenParser                       = $tokenParser;
+        $this->eventModel                        = $eventModel;
+        $this->eventDispatcher                   = $eventDispatcher;
+        $this->tokenFormatter                    = $tokenFormatter;
+        $this->leadCustomItemFetchLimit          = $leadCustomItemFetchLimit;
     }
 
     /**
@@ -462,7 +469,7 @@ private function getCustomItems(CustomObject $customObject, string $leadId): arr
         $orderBy  = CustomItem::TABLE_ALIAS.'.id';
         $orderDir = 'DESC';
 
-        $tableConfig = new TableConfig(15, 1, $orderBy, $orderDir);
+        $tableConfig = new TableConfig($this->leadCustomItemFetchLimit, 1, $orderBy, $orderDir);
         $tableConfig->addParameter('customObjectId', $customObject->getId());
         $tableConfig->addParameter('filterEntityType', 'contact');
         $tableConfig->addParameter('filterEntityId', $leadId);

Tests/Unit/EventListener/TokenSubscriberTest.php

@@ -135,7 +135,8 @@ protected function setUp(): void
             $this->tokenParser,
             $this->eventModel,
             $this->eventDispatcher,
-            $this->tokenFormatter
+            $this->tokenFormatter,
+            15
         );
 
         $this->builderEvent                 = $this->createMock(BuilderEvent::class);
@@ -857,7 +858,8 @@ private function constructWithDependencies(): void
             $this->tokenParser,
             $this->eventModel,
             $this->eventDispatcher,
-            new TokenFormatter()
+            new TokenFormatter(),
+            15
         );
     }
 }