MAGETWO-64120: Error processing your request when placing reorder for simple product of configurable if attribute is changed

Author: olysenko

app/code/Magento/ConfigurableProduct/Model/Order/Reorder/OrderedProductAvailability.php renamed to app/code/Magento/ConfigurableProduct/Model/Order/Reorder/OrderedProductAvailabilityChecker.php

@@ -5,17 +5,17 @@
  */
 namespace Magento\ConfigurableProduct\Model\Order\Reorder;
 
-use Magento\Sales\Model\Order\Reorder\OrderedProductAvailabilityInterface;
+use Magento\Sales\Model\Order\Reorder\OrderedProductAvailabilityCheckerInterface;
 use Magento\Sales\Model\Order\Item;
 use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Store\Model\Store;
 
 /**
- * Class OrderedProductAvailability
+ * Class OrderedProductAvailabilityChecker
  */
-class OrderedProductAvailability implements OrderedProductAvailabilityInterface
+class OrderedProductAvailabilityChecker implements OrderedProductAvailabilityCheckerInterface
 {
     /**
      * @var ResourceConnection
@@ -42,7 +42,7 @@ public function __construct(
     /**
      * @inheritdoc
      */
-    public function checkAvailability(Item $item)
+    public function isAvailable(Item $item)
     {
         $buyRequest = $item->getBuyRequest();
         $superAttribute = $buyRequest->getData()['super_attribute'];
@@ -94,7 +94,7 @@ public function checkAvailability(Item $item)
                     $attributeValue
                 );
         }
-        return $connection->fetchCol($select);
+        return (bool)$connection->fetchCol($select);
     }
 
     /**

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

@@ -185,10 +185,10 @@
             <argument name="connectionName" xsi:type="string">indexer</argument>
         </arguments>
     </type>
-    <type name="Magento\Sales\Model\Order\Reorder\OrderedProductAvailability">
+    <type name="Magento\Sales\Model\Order\Reorder\OrderedProductAvailabilityChecker">
         <arguments>
             <argument name="productAvailabilityChecks" xsi:type="array">
-                <item name="configurable" xsi:type="object">Magento\ConfigurableProduct\Model\Order\Reorder\OrderedProductAvailability</item>
+                <item name="configurable" xsi:type="object">Magento\ConfigurableProduct\Model\Order\Reorder\OrderedProductAvailabilityChecker</item>
             </argument>
         </arguments>
     </type>

app/code/Magento/Sales/Controller/Adminhtml/Order/Create/Reorder.php

@@ -8,32 +8,32 @@
 use Magento\Backend\App\Action;
 use Magento\Backend\Model\View\Result\ForwardFactory;
 use Magento\Framework\View\Result\PageFactory;
-use \Magento\Sales\Model\Order\Reorder\HasUnavailableProduct;
+use \Magento\Sales\Model\Order\Reorder\UnavailableProductsProvider;
 
 class Reorder extends \Magento\Sales\Controller\Adminhtml\Order\Create
 {
     /**
-     * @var HasUnavailableProduct
+     * @var UnavailableProductsProvider
      */
-    private $hasUnavailableProduct;
+    private $unavailableProductsProvider;
 
     /**
-     * @param HasUnavailableProduct $hasUnavailableProduct
+     * @param UnavailableProductsProvider $unavailableProductsProvider
      * @param Action\Context $context
      * @param \Magento\Catalog\Helper\Product $productHelper
      * @param \Magento\Framework\Escaper $escaper
      * @param PageFactory $resultPageFactory
      * @param ForwardFactory $resultForwardFactory
      */
     public function __construct(
-        HasUnavailableProduct $hasUnavailableProduct,
+        UnavailableProductsProvider $unavailableProductsProvider,
         Action\Context $context,
         \Magento\Catalog\Helper\Product $productHelper,
         \Magento\Framework\Escaper $escaper,
         PageFactory $resultPageFactory,
         ForwardFactory $resultForwardFactory
     ) {
-        $this->hasUnavailableProduct = $hasUnavailableProduct;
+        $this->unavailableProductsProvider = $unavailableProductsProvider;
         parent::__construct(
             $context,
             $productHelper,
@@ -61,7 +61,7 @@ public function execute()
             $resultRedirect->setPath('sales/order/');
         }
 
-        $unavailableProducts = $this->hasUnavailableProduct->hasUnavailableProducts($order);
+        $unavailableProducts = $this->unavailableProductsProvider->getForOrder($order);
         if (count($unavailableProducts) > 0) {
             foreach ($unavailableProducts as $sku) {
                 $this->messageManager->addNoticeMessage(

app/code/Magento/Sales/Model/Order/Reorder/OrderedProductAvailability.php renamed to app/code/Magento/Sales/Model/Order/Reorder/OrderedProductAvailabilityChecker.php

@@ -11,13 +11,13 @@
 /**
  * @api
  *
- * Class OrderedProductAvailability
+ * Class OrderedProductAvailabilityChecker
  */
-class OrderedProductAvailability implements OrderedProductAvailabilityInterface
+class OrderedProductAvailabilityChecker implements OrderedProductAvailabilityCheckerInterface
 {
 
     /**
-     * @var OrderedProductAvailabilityInterface[]
+     * @var OrderedProductAvailabilityCheckerInterface[]
      */
     private $productAvailabilityChecks;
 
@@ -32,19 +32,18 @@ public function __construct(array $productAvailabilityChecks)
     /**
      * @inheritdoc
      */
-    public function checkAvailability(Item $item)
+    public function isAvailable(Item $item)
     {
         if ($item->getParentItem()
             && isset($this->productAvailabilityChecks[$item->getParentItem()->getProductType()])
         ) {
-
             $checkForType = $this->productAvailabilityChecks[$item->getParentItem()->getProductType()];
-            if (!$checkForType instanceof OrderedProductAvailabilityInterface) {
+            if (!$checkForType instanceof OrderedProductAvailabilityCheckerInterface) {
                 throw new ConfigurationMismatchException(__('Received check doesn\'t match interface'));
             }
             return $checkForType->checkAvailability($item);
         } else {
             return true;
         }
     }
-}
+}

app/code/Magento/Sales/Model/Order/Reorder/OrderedProductAvailabilityInterface.php renamed to app/code/Magento/Sales/Model/Order/Reorder/OrderedProductAvailabilityCheckerInterface.php

@@ -7,14 +7,17 @@
 
 use Magento\Sales\Model\Order\Item;
 
-interface OrderedProductAvailabilityInterface
+/**
+ * Interface OrderedProductAvailabilityCheckerInterface
+ */
+interface OrderedProductAvailabilityCheckerInterface
 {
     /**
-     * Check that the selected options of order item are still presented in Catalog
-     * Returns true if the previously ordered item configuration is still available
+     * Checks that the selected options of order item are still presented in Catalog.
+     * Returns true if the previously ordered item configuration is still available.
      *
      * @param Item $item
      * @return bool
      */
-    public function checkAvailability(Item $item);
+    public function isAvailable(Item $item);
 }

app/code/Magento/Sales/Model/Order/Reorder/HasUnavailableProduct.php renamed to app/code/Magento/Sales/Model/Order/Reorder/UnavailableProductsProvider.php

@@ -7,43 +7,45 @@
 
 use Magento\Sales\Model\Config;
 
-class HasUnavailableProduct
+/**
+ * Class UnavailableProductsProvider
+ */
+class UnavailableProductsProvider
 {
     /**
      * @var Config
      */
     private $salesConfig;
 
     /**
-     * @var OrderedProductAvailability
+     * @var OrderedProductAvailabilityChecker
      */
-    private $orderedProductAvailability;
+    private $orderedProductAvailabilityChecker;
 
     /**
      * @param Config $salesConfig
-     * @param OrderedProductAvailability $orderedProductAvailability
+     * @param OrderedProductAvailabilityChecker $orderedProductAvailabilityChecker
      */
     public function __construct(
         Config $salesConfig,
-        OrderedProductAvailability $orderedProductAvailability
-
+        OrderedProductAvailabilityChecker $orderedProductAvailabilityChecker
     ) {
         $this->salesConfig = $salesConfig;
-        $this->orderedProductAvailability = $orderedProductAvailability;
+        $this->orderedProductAvailabilityChecker = $orderedProductAvailabilityChecker;
     }
 
     /**
-     *  Check if order has products that unavailable for now.
+     * Gets products that are unavailable for the order.
      *
      * @param \Magento\Sales\Model\Order $order
      * @return array
      */
-    public function hasUnavailableProducts($order)
+    public function getForOrder($order)
     {
         $unavailableProducts = [];
         foreach ($order->getItemsCollection($this->salesConfig->getAvailableProductTypes(), false) as $orderItem) {
             /** @var \Magento\Sales\Model\Order\Item $orderItem */
-            if (!$this->orderedProductAvailability->checkAvailability($orderItem)) {
+            if (!$this->orderedProductAvailabilityChecker->isAvailable($orderItem)) {
                 $unavailableProducts[] = $orderItem->getSku();
             }
         }