Merge pull request magento#1120 from magento-engcom/1117-Fix-hard-dep…

…endency-InventoryCache-module-on-Inventory Fix hard dependency InventoryCache module on Inventory module
VitaliyBoyko · May 12, 2018 · b50a893 · b50a893
2 parents 045d9a5 + 7dc538c
commit b50a893
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 6 deletions.
diff --git a/app/code/Magento/InventoryCache/Model/ResourceModel/GetProductIdsBySourceItemIds.php b/app/code/Magento/InventoryCache/Model/ResourceModel/GetProductIdsBySourceItemIds.php
@@ -10,7 +10,6 @@
 use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\EntityManager\MetadataPool;
-use Magento\Inventory\Model\ResourceModel\SourceItem;
 
 /**
  * Provides product ids related to specified source items ids.
@@ -27,16 +26,34 @@ class GetProductIdsBySourceItemIds
      */
     private $metadataPool;
 
+    /**
+     * @var string
+     */
+    private $tableNameSourceItem;
+
+    /**
+     * @var string
+     */
+    private $sourceItemIdFieldName;
+
     /**
      * GetProductIdsByStockIds constructor.
      *
      * @param ResourceConnection $resource
      * @param MetadataPool $metadataPool
+     * @param string $tableNameSourceItem
+     * @param string $sourceItemIdFieldName
      */
-    public function __construct(ResourceConnection $resource, MetadataPool $metadataPool)
-    {
+    public function __construct(
+        ResourceConnection $resource,
+        MetadataPool $metadataPool,
+        $tableNameSourceItem,
+        $sourceItemIdFieldName
+    ) {
         $this->resource = $resource;
         $this->metadataPool = $metadataPool;
+        $this->tableNameSourceItem = $tableNameSourceItem;
+        $this->sourceItemIdFieldName = $sourceItemIdFieldName;
     }
 
     /**
@@ -50,13 +67,13 @@ public function execute(array $sourceItemIds): array
     {
         $productLinkField = $this->metadataPool->getMetadata(ProductInterface::class)->getLinkField();
         $connection = $this->resource->getConnection();
-        $sourceItemTable = $this->resource->getTableName(SourceItem::TABLE_NAME_SOURCE_ITEM);
+        $sourceItemTable = $this->resource->getTableName($this->tableNameSourceItem);
         $select = $connection->select()
             ->from(
                 ['source_items_table' => $sourceItemTable],
                 []
             )->where(
-                SourceItem::ID_FIELD_NAME . ' IN (?)',
+                $this->sourceItemIdFieldName . ' IN (?)',
                 $sourceItemIds
             )->join(
                 ['product_table' => $this->resource->getTableName('catalog_product_entity')],

diff --git a/app/code/Magento/InventoryCache/composer.json b/app/code/Magento/InventoryCache/composer.json
@@ -5,10 +5,12 @@
         "php": "~7.1.3||~7.2.0",
         "magento/framework": "*",
         "magento/module-catalog": "*",
-        "magento/module-inventory": "*",
         "magento/module-inventory-catalog-api": "*",
         "magento/module-inventory-indexer": "*"
     },
+    "suggest": {
+        "magento/module-inventory": "*"
+    },
     "type": "magento2-module",
     "license": [
         "OSL-3.0",

diff --git a/app/code/Magento/InventoryCache/etc/di.xml b/app/code/Magento/InventoryCache/etc/di.xml
@@ -12,4 +12,10 @@
     <type name="Magento\InventoryIndexer\Indexer\SourceItem\SourceItemIndexer">
         <plugin name="invalidate_products_cache" type="Magento\InventoryCache\Plugin\InventoryIndexer\Indexer\Source\SourceItemIndexer\CacheFlush"/>
     </type>
+    <type name="Magento\InventoryCache\Model\ResourceModel\GetProductIdsBySourceItemIds">
+        <arguments>
+            <argument name="tableNameSourceItem" xsi:type="const">Magento\Inventory\Model\ResourceModel\SourceItem::TABLE_NAME_SOURCE_ITEM</argument>
+            <argument name="sourceItemIdFieldName" xsi:type="const">Magento\Inventory\Model\ResourceModel\SourceItem::ID_FIELD_NAME</argument>
+        </arguments>
+    </type>
 </config>