MAGETWO-64547: Bundle Products - The options you selected are not available

Author: Dmytro Voskoboinikov

lib/internal/Magento/Framework/EntityManager/Operation/Create.php

@@ -5,7 +5,9 @@
  */
 namespace Magento\Framework\EntityManager\Operation;
 
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\DB\Adapter\DuplicateException;
+use Magento\Framework\EntityManager\Sequence\SequenceApplier;
 use Magento\Framework\EntityManager\Operation\Create\CreateMain;
 use Magento\Framework\EntityManager\Operation\Create\CreateAttributes;
 use Magento\Framework\EntityManager\Operation\Create\CreateExtensions;
@@ -56,6 +58,11 @@ class Create implements CreateInterface
      */
     private $createExtensions;
 
+    /**
+     * @var SequenceApplier
+     */
+    private $sequenceApplier;
+
     /**
      * @param MetadataPool $metadataPool
      * @param TypeResolver $typeResolver
@@ -106,6 +113,8 @@ public function execute($entity, $arguments = [])
             );
             $this->eventManager->dispatchEntityEvent($entityType, 'save_before', ['entity' => $entity]);
 
+            $entity = $this->getSequenceApplier()->apply($entity);
+
             $entity = $this->createMain->execute($entity, $arguments);
             $entity = $this->createAttributes->execute($entity, $arguments);
             $entity = $this->createExtensions->execute($entity, $arguments);
@@ -127,4 +136,20 @@ public function execute($entity, $arguments = [])
         }
         return $entity;
     }
+
+    /**
+     * @return SequenceApplier
+     *
+     * @deprecated
+     */
+    private function getSequenceApplier()
+    {
+        if (!$this->sequenceApplier) {
+            $this->sequenceApplier = ObjectManager::getInstance()->get(
+                SequenceApplier::class
+            );
+        }
+
+        return $this->sequenceApplier;
+    }
 }

lib/internal/Magento/Framework/EntityManager/Operation/Create/CreateMain.php

@@ -5,11 +5,9 @@
  */
 namespace Magento\Framework\EntityManager\Operation\Create;
 
-use Magento\Framework\App\ObjectManager;
 use Magento\Framework\EntityManager\TypeResolver;
 use Magento\Framework\EntityManager\HydratorPool;
 use Magento\Framework\EntityManager\Db\CreateRow;
-use Magento\Framework\EntityManager\Sequence\SequenceApplier;
 
 /**
  * Class CreateMain
@@ -31,27 +29,19 @@ class CreateMain
      */
     private $createRow;
 
-    /**
-     * @var SequenceApplier
-     */
-    private $sequenceApplier;
-
     /**
      * @param TypeResolver $typeResolver
      * @param HydratorPool $hydratorPool
      * @param CreateRow $createRow
-     * @param SequenceApplier $sequenceApplier
      */
     public function __construct(
         TypeResolver $typeResolver,
         HydratorPool $hydratorPool,
-        CreateRow $createRow,
-        SequenceApplier $sequenceApplier = null
+        CreateRow $createRow
     ) {
         $this->typeResolver = $typeResolver;
         $this->hydratorPool = $hydratorPool;
         $this->createRow = $createRow;
-        $this->sequenceApplier = $sequenceApplier;
     }
 
     /**
@@ -61,28 +51,11 @@ public function __construct(
      */
     public function execute($entity, $arguments = [])
     {
-        $entity = $this->getSequenceApplier()->apply($entity);
         $entityType = $this->typeResolver->resolve($entity);
         $hydrator = $this->hydratorPool->getHydrator($entityType);
         $arguments = array_merge($hydrator->extract($entity), $arguments);
         $entityData = $this->createRow->execute($entityType, $arguments);
         $entity = $hydrator->hydrate($entity, $entityData);
         return $entity;
     }
-
-    /**
-     * @return SequenceApplier
-     *
-     * @deprecated
-     */
-    private function getSequenceApplier()
-    {
-        if (!$this->sequenceApplier) {
-            $this->sequenceApplier = ObjectManager::getInstance()->get(
-                SequenceApplier::class
-            );
-        }
-
-        return $this->sequenceApplier;
-    }
 }

lib/internal/Magento/Framework/EntityManager/Sequence/SequenceManager.php

@@ -53,33 +53,39 @@ public function __construct(
     }
 
     /**
-     * Force sequence value creation
+     * Forces creation of a sequence value.
      *
      * @param string $entityType
      * @param string|int $identifier
+     *
      * @return int
+     *
      * @throws \Exception
      */
     public function force($entityType, $identifier)
     {
-        $metadata = $this->metadataPool->getMetadata($entityType);
         $sequenceInfo = $this->sequenceRegistry->retrieve($entityType);
 
         if (!isset($sequenceInfo['sequenceTable'])) {
-            throw new \Exception('TODO: use correct Exception class' . PHP_EOL  . ' Sequence table doesnt exists');
+            throw new \Exception(
+                'TODO: use correct Exception class' . PHP_EOL  . ' Sequence table doesnt exists'
+            );
         }
 
         try {
-            $connection = $this->appResource->getConnectionByName($metadata->getEntityConnectionName());
-            $sequenceTable = $this->appResource->getTableName($sequenceInfo['sequenceTable']);
+            $metadata = $this->metadataPool->getMetadata($entityType);
 
-            if (!$this->isIdentifierExists($connection, $sequenceTable, $identifier)) {
-                return $connection->insert($sequenceTable, ['sequence_value' => $identifier]);
-            }
+            $connection = $this->appResource->getConnectionByName(
+                $metadata->getEntityConnectionName()
+            );
 
-            return $identifier;
+            return $connection->insert(
+                $this->appResource->getTableName($sequenceInfo['sequenceTable']),
+                ['sequence_value' => $identifier]
+            );
         } catch (\Exception $e) {
             $this->logger->critical($e->getMessage(), $e->getTrace());
+
             throw new \Exception('TODO: use correct Exception class' . PHP_EOL . $e->getMessage());
         }
     }
@@ -108,26 +114,4 @@ public function delete($entityType, $identifier)
             throw new \Exception('TODO: use correct Exception class' . PHP_EOL . $e->getMessage());
         }
     }
-
-    /**
-     * Checks whether given identifier exists in the corresponding sequence table.
-     *
-     * @param \Magento\Framework\DB\Adapter\AdapterInterface $connection
-     * @param string $sequenceTable
-     * @param int $identifier
-     *
-     * @return bool
-     */
-    private function isIdentifierExists(
-        \Magento\Framework\DB\Adapter\AdapterInterface $connection,
-        $sequenceTable,
-        $identifier
-    ) {
-        return (bool) $connection->fetchOne(
-            $connection->select()
-                ->from($sequenceTable, ['sequence_value'])
-                ->where('sequence_value = ?', $identifier)
-                ->limit(1)
-        );
-    }
 }