114 Module simplification

Model/ResourceModel/Objects.php

@@ -26,6 +26,11 @@ class Objects extends AbstractDb
      */
     private $selectEntityIds;
 
+    /**
+     * @var \Magento\Framework\DB\Select
+     */
+    private $selectEntityIdsByType;
+
     /**
      * @var \Magento\Framework\DB\Select
      */
@@ -94,6 +99,14 @@ protected function _construct()
             ->where('website_id IN (:entity_website_id, :base_website_id)')
             ->order(new \Zend_Db_Expr('FIELD(website_id, :base_website_id, :entity_website_id)'));
 
+        $this->selectEntityIdsByType = $this->getConnection()->select()
+            ->from($this->getMainTable(), ['entity_id'])
+            ->where('magento_type = :magento_type')
+            ->where('salesforce_type = :salesforce_type')
+            ->where('object_id = :object_id')
+            ->where('website_id IN (:entity_website_id, :base_website_id)')
+            ->order(new \Zend_Db_Expr('FIELD(website_id, :base_website_id, :entity_website_id)'));
+
         $this->selectStatus = $this->getConnection()->select()
             ->from($this->getMainTable(), ['status'])
             ->where('magento_type = :magento_type')
@@ -317,4 +330,23 @@ public function unsetPendingStatus($entityId, $magentoType, $websiteId, $salesfo
             $where
         );
     }
+
+    /**
+     * @param string $objectId
+     * @param string $magentoType
+     * @param string $salesforceType
+     * @param int $websiteId
+     *
+     * @return array
+     */
+    public function loadEntityIdsByType($objectId, $magentoType, $salesforceType, $websiteId)
+    {
+        return $this->getConnection()->fetchCol($this->selectEntityIdsByType, [
+            'magento_type' => $magentoType,
+            'salesforce_type' => $salesforceType,
+            'object_id' => $objectId,
+            'entity_website_id' => $websiteId,
+            'base_website_id' => $this->baseWebsiteId($websiteId),
+        ]);
+    }
 }

Plugin/FixMissedWebsites.php

@@ -0,0 +1,64 @@
+<?php
+
+
+namespace TNW\Salesforce\Plugin;
+
+
+use Magento\Framework\Model\AbstractModel;
+use Magento\Store\Api\Data\GroupInterface;
+use Magento\Store\Model\StoreManagerInterface;
+use TNW\Salesforce\Synchronize\Entity\DivideEntityByWebsiteOrg;
+
+class FixMissedWebsites
+{
+
+    /** @var StoreManagerInterface  */
+    protected $storeManager;
+
+    /**
+     * FixMissedWebsites constructor.
+     * @param StoreManagerInterface $storeManager
+     */
+    public function __construct(
+        StoreManagerInterface $storeManager
+    ) {
+        $this->storeManager = $storeManager;
+    }
+
+    /**
+     * @param $website
+     * @return int
+     */
+    public function getDefaultStoreId($website)
+    {
+
+        $defaultGroupId = $website->getDefaultGroupId();
+        /** @var GroupInterface $defaultGroup */
+        $defaultGroup = $this->storeManager->getGroup($defaultGroupId);
+        return $defaultGroup->getDefaultStoreId();
+    }
+
+    /**
+     * @param AbstractModel $entity
+     * @param $result
+     * @param $entity
+     */
+    public function afterGetEntityWebsiteIds(
+        DivideEntityByWebsiteOrg $subject,
+        $result,
+        $entity
+    ) {
+
+        if (in_array(0, $result)) {
+            $result = array_filter($result);
+            if (empty($result)) {
+                $defaultWebsite = $this->storeManager->getWebsite(true);
+                $result[] = $defaultWebsite->getId();
+                $entity->setWebsiteId($defaultWebsite->getId());
+                $entity->setStoreId($this->getDefaultStoreId($defaultWebsite));
+            }
+        }
+
+        return $result;
+    }
+}

Plugin/Synchronize/Queue/Website/FixMissedWebsites.php

@@ -0,0 +1,77 @@
+<?php
+
+
+namespace TNW\Salesforce\Plugin\Synchronize\Queue\Website;
+
+
+use Magento\Store\Api\Data\GroupInterface;
+use Magento\Store\Model\StoreManagerInterface;
+use TNW\Salesforce\Synchronize\Queue\CreateInterface;
+use TNW\Salesforce\Synchronize\Queue\Website\CreateByBase;
+
+class FixMissedWebsites
+{
+
+    /** @var StoreManagerInterface  */
+    protected $storeManager;
+
+    /**
+     * FixMissedWebsites constructor.
+     * @param StoreManagerInterface $storeManager
+     */
+    public function __construct(
+        StoreManagerInterface $storeManager
+    ) {
+        $this->storeManager = $storeManager;
+    }
+
+    /**
+     * @param $website
+     * @return int
+     */
+    public function getDefaultStoreId($website)
+    {
+
+        $defaultGroupId = $website->getDefaultGroupId();
+        /** @var GroupInterface $defaultGroup */
+        $defaultGroup = $this->storeManager->getGroup($defaultGroupId);
+        return $defaultGroup->getDefaultStoreId();
+    }
+
+    /**
+     * @param CreateInterface $subject
+     * @param $result
+     * @param int[] $entityIds
+     * @param array $additional
+     * @param callable $create
+     * @param int $websiteId
+     */
+    public function afterProcess(
+        CreateInterface $subject,
+        $result,
+        array $entityIds,
+        array $additional,
+        callable $create,
+        $websiteId
+    ) {
+
+        foreach ($result as $k => $item) {
+            if (empty($item->getEntityId())) {
+                $defaultWebsite = $this->storeManager->getWebsite(true);
+
+                $baseEntityIds = $item->getData('_base_entity_id');
+                $baseEntityId = reset($baseEntityIds);
+                $result[] = $create(
+                    'website',
+                    $defaultWebsite->getId(),
+                    $baseEntityId,
+                    ['website' => $defaultWebsite->getId()]
+                );
+
+                unset($result[$k]);
+            }
+        }
+
+        return $result;
+    }
+}

Plugin/Synchronize/Unit/Mapping/CheckOwnerField.php

@@ -12,7 +12,7 @@
 use TNW\Salesforce\Model\ResourceModel\Mapper\Collection;
 use TNW\Salesforce\Synchronize\Unit\Mapping;
 
-class CheckOwnerField
+class CheckOwnerField extends Mapping
 {
     const OWNER_ID_FIELD = 'OwnerId';
 
@@ -51,7 +51,10 @@ public function __construct(
      */
     public function checkOwner($value, $entity)
     {
+        $value = $this->correctSalesforceId($value);
         $actualOwners = $this->salesforceOwners->toOptionArray();
+        $actualOwners = $this->correctSalesforceIdKey($actualOwners);
+
         if (!isset($actualOwners[$value])) {
             $this->logger->messageDebug('The owner %s is not valid anymore, the default owner %s used instead', $value, $this->customerConfig->defaultOwner($entity->getData('config_website')));
             $value = $this->customerConfig->defaultOwner($entity->getData('config_website'));
@@ -60,6 +63,21 @@ public function checkOwner($value, $entity)
         return $value;
     }
 
+    /**
+     * @param $actualOwners
+     * @return array
+     */
+    public function correctSalesforceIdKey($actualOwners)
+    {
+        $result= [];
+        foreach ($actualOwners as $salesforceId => $value) {
+            $salesforceId = $this->correctSalesforceId($salesforceId);
+            $result[$salesforceId] = $value;
+        }
+
+        return $result;
+    }
+
     /**
      * @param Mapping $subject
      * @param callable $proceed

Synchronize/Group.php

@@ -123,8 +123,9 @@ protected function createUnits(array $queues)
     {
         /** @var Units $units */
         $units = $this->unitsFactory->create();
-        foreach ($this->units as $instanceName) {
+        foreach ($this->units as $key => $instanceName) {
             $units->add($this->objectManager->create($instanceName, [
+                'name' => $key,
                 'group' => $this,
                 'queues' => $queues,
                 'units' => $units

Synchronize/Queue.php

@@ -145,7 +145,6 @@ public function synchronize($collection, $websiteId, $syncJobs = [])
                 $lastPageNumber = (int)$groupCollection->getLastPageNumber();
                 for ($i = 1; $i <= $lastPageNumber; $i++) {
                     $groupCollection->clear();
-                    $groupCollection->setCurPage($i);
 
                     $group->messageDebug(
                         'Start job "%s", phase "%s" for website %s',
@@ -213,6 +212,9 @@ public function sortGroup($syncJobs = null)
 
                 $description[] = sprintf('%s <- %s;', $group->code(), $dependent);
 
+                if ($group->code() == $dependent) {
+                    continue;
+                }
                 if (isset($sortGroups[$dependent])) {
                     continue;
                 }