refactor: data sync performance optimisation

Model/Connector/Category.php

@@ -0,0 +1,94 @@
+<?php
+
+namespace Dotdigitalgroup\Email\Model\Connector;
+
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\Catalog\Model\ResourceModel\Category as CategoryResource;
+use Magento\Catalog\Model\ResourceModel\Category\Collection;
+
+class Category
+{
+    /**
+     * @var array
+     */
+    private $categoryNames = [];
+
+    /**
+     * @var StoreManagerInterface
+     */
+    protected StoreManagerInterface $storeManager;
+
+    /**
+     * @var Collection
+     */
+    protected Collection $categoryCollection;
+
+    /**
+     * @var CategoryResource
+     */
+    protected CategoryResource $categoryResource;
+
+    /**
+     * @param StoreManagerInterface $storeManager
+     * @param Collection $categoryCollection
+     * @param CategoryResource $categoryResource
+     */
+    public function __construct(
+        StoreManagerInterface $storeManager,
+        Collection $categoryCollection,
+        CategoryResource $categoryResource
+    ) {
+        $this->storeManager = $storeManager;
+        $this->categoryCollection = $categoryCollection;
+        $this->categoryResource = $categoryResource;
+        $this->init();
+    }
+
+    /**
+     * @return Category
+     */
+    public function init()
+    {
+        foreach ($this->categoryCollection->setPageSize(10000)->load() as $category) {
+            /** @var Category $category */
+            foreach ($this->storeManager->getStores() as $store) {
+                $category->setStoreId($store->getId());
+                $this->categoryResource->load($category, $category->getId());
+                if (!array_key_exists($category->getId(), $this->categoryNames)) {
+                    $this->categoryNames[$category->getId()] = [];
+                }
+                if (!array_key_exists($store->getId(), $this->categoryNames[$category->getId()])) {
+                    $this->categoryNames[$category->getId()][$store->getId()] = null;
+                }
+                $this->categoryNames[$category->getId()][$store->getId()] = $category->getName();
+            }
+        }
+
+        return $this;
+    }
+
+    /**
+     *
+     * Get category names.
+     *
+     * @param array $categoryIds
+     * @return string
+     */
+    public function getCategoryNames($categoryIds, $storeId): string
+    {
+        $names = [];
+        foreach ($categoryIds as $id) {
+            if (array_key_exists($id, $this->categoryNames)
+                && array_key_exists($storeId, $this->categoryNames[$id])) {
+                $names[$id] = $this->categoryNames[$id][$storeId];
+            }
+        }
+
+        //comma separated category names
+        if (count($names)) {
+            return implode(',', $names);
+        }
+
+        return '';
+    }
+}

Model/Connector/ContactData.php

@@ -3,7 +3,9 @@
 namespace Dotdigitalgroup\Email\Model\Connector;
 
 use Dotdigitalgroup\Email\Logger\Logger;
+use Dotdigitalgroup\Email\Model\Connector\Category as ConnectorCategoryModel;
 use Dotdigitalgroup\Email\Model\Customer\DataField\Date;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Model\AbstractModel;
 
 /**
@@ -58,6 +60,11 @@ class ContactData
      */
     private $categoryFactory;
 
+    /**
+     * @var ConnectorCategoryModel
+     */
+    protected ConnectorCategoryModel $connectorCategoryModel;
+
     /**
      * @var \Magento\Catalog\Model\ResourceModel\Category
      */
@@ -118,6 +125,7 @@ class ContactData
      * @param \Magento\Sales\Model\ResourceModel\Order $orderResource
      * @param \Magento\Catalog\Api\Data\CategoryInterfaceFactory $categoryFactory
      * @param \Magento\Catalog\Model\ResourceModel\Category $categoryResource
+     * @param Category $connectorCategoryModel
      * @param \Dotdigitalgroup\Email\Helper\Config $configHelper
      * @param Logger $logger
      * @param Date $dateField
@@ -131,6 +139,7 @@ public function __construct(
         \Magento\Sales\Model\ResourceModel\Order $orderResource,
         \Magento\Catalog\Api\Data\CategoryInterfaceFactory $categoryFactory,
         \Magento\Catalog\Model\ResourceModel\Category $categoryResource,
+        ConnectorCategoryModel $connectorCategoryModel,
         \Dotdigitalgroup\Email\Helper\Config $configHelper,
         Logger $logger,
         Date $dateField,
@@ -142,6 +151,7 @@ public function __construct(
         $this->orderResource = $orderResource;
         $this->productFactory = $productFactory;
         $this->categoryFactory = $categoryFactory;
+        $this->connectorCategoryModel = $connectorCategoryModel;
         $this->productResource = $productResource;
         $this->categoryResource = $categoryResource;
         $this->logger = $logger;
@@ -441,19 +451,11 @@ private function getCategoryValue($categoryId)
      */
     public function getCategoryNames($categoryIds)
     {
-        $names = [];
-        foreach ($categoryIds as $id) {
-            if (! isset($this->categoryNames[$id])) {
-                $this->categoryNames[$id] = $this->getCategoryValue($id);
-            }
-            $names[$this->categoryNames[$id]] = $this->categoryNames[$id];
-        }
-        //comma separated category names
-        if (count($names)) {
-            return implode(',', $names);
+        if (!$this->connectorCategoryModel) {
+            $this->connectorCategoryModel = ObjectManager::getInstance()->get(ConnectorCategoryModel::class);
         }
 
-        return '';
+        return $this->connectorCategoryModel->getCategoryNames($categoryIds, $this->model->getStoreId());
     }
 
     /**

Model/ResourceModel/Order.php

@@ -3,9 +3,25 @@
 namespace Dotdigitalgroup\Email\Model\ResourceModel;
 
 use Dotdigitalgroup\Email\Setup\SchemaInterface as Schema;
+use Magento\Framework\Model\ResourceModel\Db\Context;
+use Psr\Log\LoggerInterface;
 
 class Order extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
+    /**
+     * @param Context $context
+     * @param LoggerInterface $_logger
+     * @param $connectionName
+     */
+    public function __construct(
+        Context $context,
+        LoggerInterface $_logger,
+        $connectionName = null
+    ) {
+        $this->_logger = $_logger;
+        parent::__construct($context, $connectionName);
+    }
+
     /**
      * Initialize resource.
      *

Model/Sync/Consent.php

@@ -117,7 +117,7 @@ public function sync(\DateTime $from = null)
                             'Error in consent sync for website id: %d',
                             $websiteId
                         ),
-                        [(string)$e]
+                        ['message' => $e->getMessage()]
                     );
                 }
             }

Setup/Install/Type/AbstractDataMigration.php

@@ -98,6 +98,8 @@ public function getTableName()
      */
     public function isEnabled(): bool
     {
-        return true;
+        //change applied to ensure no setup:upgrade induced data migration and sync
+        global $argv;
+        return (isset($argv) && is_array($argv) && in_array('dotdigital:migrate', $argv));
     }
 }

Setup/Install/Type/InsertEmailContactTableCustomerSales.php

@@ -124,6 +124,8 @@ protected function insertData(Select $selectStatement)
      */
     public function isEnabled(): bool
     {
-        return $this->config->isAccountSharingGlobal();
+        global $argv;
+        $status = (isset($argv) && is_array($argv) && in_array('dotdigital:migrate', $argv));
+        return $this->config->isAccountSharingGlobal() && $status;
     }
 }

Setup/Install/Type/UpdateEmailContactTableCustomerSales.php

@@ -88,7 +88,9 @@ public function getUpdateWhereClause($row)
      */
     public function isEnabled(): bool
     {
-        return $this->config->isAccountSharingGlobal();
+        global $argv;
+        $status = (isset($argv) && is_array($argv) && in_array('dotdigital:migrate', $argv));
+        return $this->config->isAccountSharingGlobal() && $status;
     }
 
     /**

Setup/Patch/Data/ProcessPendingAutomations.php

@@ -39,7 +39,7 @@ public function __construct(
      */
     public function apply()
     {
-        $this->automationFactory->create()->sync();
+        //$this->automationFactory->create()->sync();
     }
 
     /**

etc/db_schema.xml

@@ -59,6 +59,11 @@
         <index referenceId="EMAIL_CONTACT_UPDATED_AT" indexType="btree">
             <column name="updated_at"/>
         </index>
+        <index referenceId="EMAIL_CONTACT_CUST_IMPORT_WEBSITE" indexType="btree">
+            <column name="customer_id"/>
+            <column name="email_imported"/>
+            <column name="website_id"/>
+        </index>
     </table>
     <table name="email_order" resource="default" engine="innodb" comment="Transactional Order Data">
         <column xsi:type="int" name="email_order_id" padding="10" unsigned="true" nullable="false" identity="true" comment="Primary Key"/>
@@ -443,4 +448,10 @@
     <table name="salesrule_coupon" resource="default">
         <column xsi:type="smallint" name="generated_by_dotmailer" padding="6" unsigned="false" nullable="true" identity="false" comment="1 = Generated by dotmailer"/>
     </table>
+
+    <table name="quote">
+        <index referenceId="SALES_QUOTE_CUSTOMER_EMAIL" indexType="btree">
+            <column name="customer_email"/>
+        </index>
+    </table>
 </schema>