MAGETWO-36828: Api service should not return custom attribute for catalog inventory

-- move to catalog inventory module

Author: vzabaznov

app/code/Magento/Catalog/etc/di.xml

@@ -46,16 +46,6 @@
     <type name="Magento\Customer\Model\ResourceModel\Visitor">
         <plugin name="catalogLog" type="Magento\Catalog\Model\Plugin\Log" />
     </type>
-    <type name="Magento\Catalog\Model\Product\Attribute\Repository">
-        <plugin name="filterCustomAttribute" type="Magento\Catalog\Model\Plugin\FilterCustomAttribute" />
-    </type>
-    <type name="Magento\Catalog\Model\Plugin\FilterCustomAttribute">
-        <arguments>
-            <argument name="blackList" xsi:type="array">
-                <item name="quantity_and_stock_status" xsi:type="string">quantity_and_stock_status</item>
-            </argument>
-        </arguments>
-    </type>
     <type name="Magento\Indexer\Model\Indexer\State">
         <plugin name="setStatusForIndexer" type="Magento\Catalog\Model\Indexer\Category\Product\Plugin\IndexerState" />
     </type>

app/code/Magento/Catalog/Model/Plugin/FilterCustomAttribute.php renamed to app/code/Magento/CatalogInventory/Model/Plugin/FilterCustomAttribute.php

@@ -5,7 +5,7 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Catalog\Model\Plugin;
+namespace Magento\CatalogInventory\Model\Plugin;
 
 use Magento\Catalog\Model\Product\Attribute\Repository;
 

app/code/Magento/CatalogInventory/etc/di.xml

@@ -32,7 +32,16 @@
     <preference for="Magento\CatalogInventory\Model\Spi\StockStateProviderInterface" type="Magento\CatalogInventory\Model\StockStateProvider" />
 
     <preference for="Magento\CatalogInventory\Model\ResourceModel\QtyCounterInterface" type="\Magento\CatalogInventory\Model\ResourceModel\Stock" />
-
+    <type name="Magento\Catalog\Model\Product\Attribute\Repository">
+        <plugin name="filterCustomAttribute" type="Magento\CatalogInventory\Model\Plugin\FilterCustomAttribute" />
+    </type>
+    <type name="Magento\CatalogInventory\Model\Plugin\FilterCustomAttribute">
+        <arguments>
+            <argument name="blackList" xsi:type="array">
+                <item name="quantity_and_stock_status" xsi:type="string">quantity_and_stock_status</item>
+            </argument>
+        </arguments>
+    </type>
     <type name="Magento\CatalogInventory\Observer\UpdateItemsStockUponConfigChangeObserver">
         <arguments>
             <argument name="resourceStock" xsi:type="object">Magento\CatalogInventory\Model\ResourceModel\Stock\Proxy</argument>

dev/tests/api-functional/testsuite/Magento/CatalogInventory/Api/ProductRepositoryInterfaceTest.php

@@ -204,12 +204,7 @@ protected function findCustomAttributeQty($customAttributes)
     {
         $qty = false;
         $qtyAndStockStatus = [];
-        foreach ($customAttributes as $customAttribute) {
-            if ($customAttribute[self::KEY_ATTRIBUTE_CODE] == self::CODE_QUANTITY_AND_STOCK_STATUS) {
-                $qtyAndStockStatus = $customAttribute['value'];
-                break;
-            }
-        }
+
         if (!empty($qtyAndStockStatus) && is_array($qtyAndStockStatus)) {
 
             if (array_key_exists('any_type', $qtyAndStockStatus)) {