wrapper for $em - fixed case with entity creation

replace entity manager by registry
mdiyakov · Jun 17, 2018 · 3178196 · 3178196
1 parent 872d362
commit 3178196
Show file tree

Hide file tree

Showing 5 changed files with 57 additions and 39 deletions.
diff --git a/Command/ClearIndexCommand.php b/Command/ClearIndexCommand.php
@@ -2,7 +2,7 @@
 
 namespace Mdiyakov\DoctrineSolrBundle\Command;
 
-use Doctrine\ORM\EntityManager;
+use Doctrine\Bundle\DoctrineBundle\Registry;
 use Doctrine\ORM\EntityNotFoundException;
 use Mdiyakov\DoctrineSolrBundle\Config\Config;
 use Mdiyakov\DoctrineSolrBundle\Exception\EntityNotIndexedException;
@@ -31,25 +31,25 @@ class ClearIndexCommand extends Command
     private $updateQueryBuilder;
 
     /**
-     * @var EntityManager
+     * @var Registry
      */
-    private $em;
+    private $registry;
 
     /**
      * @param Config $config
      * @param UpdateQueryBuilder $updateQueryBuilder
-     * @param EntityManager $em
+     * @param Registry $registry
      */
     public function __construct(
         Config $config,
         UpdateQueryBuilder $updateQueryBuilder,
-        EntityManager $em
+        Registry $registry
     )
     {
         $this->config = $config;
         $this->possibleEntityTypes = array_keys($this->getAssocEntitiesClasses());
         $this->updateQueryBuilder = $updateQueryBuilder;
-        $this->em = $em;
+        $this->registry = $registry;
 
         parent::__construct();
     }
@@ -135,6 +135,7 @@ private function deleteByEntityConfig($entityConfig, $id = null)
         $schemaName = $entityConfig['schema'];
         $updateQuery = $this->updateQueryBuilder->buildUpdateQueryBySchemaName($schemaName);
         $schema = $this->config->getSchemaByName($schemaName);
+        $em = $this->registry->getManagerForClass($entityConfig['class']);
 
         if (empty($id)) {
             $discriminatorField = $schema->getDiscriminatorConfigField();
@@ -146,7 +147,7 @@ private function deleteByEntityConfig($entityConfig, $id = null)
             $message = sprintf('Removing of %s is completed successfully', $entityConfig['class']);
         } else {
             $entityClass = $entityConfig['class'];
-            $repository = $this->em->getRepository($entityClass);
+            $repository = $em->getRepository($entityClass);
             $entity = $repository->find($id);
 
             if (!$entity) {

diff --git a/Command/IndexEntitiesCommand.php b/Command/IndexEntitiesCommand.php
@@ -2,6 +2,7 @@
 
 namespace Mdiyakov\DoctrineSolrBundle\Command;
 
+use Doctrine\Bundle\DoctrineBundle\Registry;
 use Doctrine\ORM\EntityManager;
 use Doctrine\ORM\EntityRepository;
 use Symfony\Component\Console\Input\InputArgument;
@@ -17,9 +18,9 @@ class IndexEntitiesCommand extends Command
     const BUNCH_COUNT = 100;
 
     /**
-     * @var EntityManager
+     * @var Registry
      */
-    private $em;
+    private $registry;
 
     /**
      * @var Config
@@ -44,14 +45,14 @@ class IndexEntitiesCommand extends Command
     /**
      * @param Config $config
      * @param IndexProcessManager $indexProcessManager
-     * @param EntityManager $em
+     * @param Registry $registry
      */
-    public function __construct(Config $config, IndexProcessManager $indexProcessManager, EntityManager $em)
+    public function __construct(Config $config, IndexProcessManager $indexProcessManager, Registry $registry)
     {
         $this->config = $config;
         $this->indexProcessManager = $indexProcessManager;
         $this->possibleEntityTypes = array_keys($this->getAssocEntitiesClasses());
-        $this->em = $em;
+        $this->registry = $registry;
 
         parent::__construct();
     }
@@ -105,10 +106,16 @@ protected function execute(InputInterface $input, OutputInterface $output)
      * @param string $entityClass
      * @param int|null $id
      * @throws \Exception
+     * @throws \LogicException
      */
     private function indexEntityClass($entityClass, $id = null)
     {
-        $repository = $this->em->getRepository($entityClass);
+        $em = $this->registry->getManagerForClass($entityClass);
+        if (!$em instanceof EntityManager) {
+            throw new \LogicException('EntityManager must be instance of EntityManager');
+        }
+
+        $repository = $em->getRepository($entityClass);
         if ($id) {
             $entity = $repository->find($id);
             if (!$entity) {
@@ -118,21 +125,23 @@ private function indexEntityClass($entityClass, $id = null)
             }
             $this->processEntity($entity);
         } else {
-            $this->processRepository($repository);
+            $this->processRepository($repository, $em);
         }
     }
 
     /**
      * @param EntityRepository $repository
+     * @param EntityManager $em
      */
-    private function processRepository(EntityRepository $repository)
+    private function processRepository(EntityRepository $repository, EntityManager $em)
     {
         $offset = 0;
         while ($entities = $repository->findBy([],['id'=> 'asc'], self::BUNCH_COUNT, $offset)) {
             foreach ($entities as $entity) {
                 $this->processEntity($entity);
             }
-            $this->em->clear($repository->getClassName());
+
+            $em->clear($repository->getClassName());
             $offset += self::BUNCH_COUNT;
         }
     }

diff --git a/Manager/EntityManager.php b/Manager/EntityManager.php
@@ -29,21 +29,14 @@ public function __construct(
         $this->registry = $registry;
     }
 
-    /**
-     * @param object $entity
-     * @throws \InvalidArgumentException
-     */
-    public function persist($entity)
-    {
-        $this->getEm($entity)->persist($entity);
-    }
-
     /**
      * @param object[]|object $entity
-     * @throws \LogicException
+     * @throws \Doctrine\ORM\ORMException
      * @throws \InvalidArgumentException
+     * @throws \LogicException
+     * @throws \Exception
      */
-    public function flush($entity = null)
+    public function flush($entity)
     {
         if (!is_object($entity) && !is_array($entity)) {
             throw new \InvalidArgumentException('Entity must be an object or array of objects');
@@ -61,6 +54,7 @@ public function flush($entity = null)
             /** @var \Doctrine\ORM\EntityManager $em */
             $em = $this->getEm($object);
             try {
+                $em->persist($object);
                 $em->flush($object);
             } catch (\Exception $e) {
                 if (!$em->isOpen()) {
@@ -69,12 +63,14 @@ public function flush($entity = null)
                     );
                 }
 
-                $object = $em->getRepository(get_class($object))->find($object->getId());
-                if ($object) {
-                    $this->indexProcessManager->reindex($object);
+                $previousObject = $em->getRepository(get_class($object))->find($object->getId());
+                if ($previousObject) {
+                    $this->indexProcessManager->reindex($previousObject);
                 } else {
                     $this->indexProcessManager->remove($object);
                 }
+
+                throw $e;
             }
         }
     }

diff --git a/Query/Hydrator/HydratorBuilder.php b/Query/Hydrator/HydratorBuilder.php
@@ -2,39 +2,48 @@
 
 namespace Mdiyakov\DoctrineSolrBundle\Query\Hydrator;
 
+use Doctrine\Bundle\DoctrineBundle\Registry;
 use Doctrine\ORM\EntityManager;
 use Mdiyakov\DoctrineSolrBundle\Config\Config;
 
 class HydratorBuilder
 {
     /**
-     * @var EntityManager
+     * @var Registry
      */
-    private $em;
+    private $registry;
 
     /**
      * @var Config
      */
     private $config;
 
     /**
-     * @param EntityManager $em
+     * @param Registry $registry
      * @param Config $config
      */
-    public function __construct(EntityManager $em, Config $config)
+    public function __construct(Registry $registry, Config $config)
     {
-        $this->em = $em;
+        $this->registry = $registry;
         $this->config = $config;
     }
 
     /**
      * @param string $entityClass
      * @return SelectQueryHydrator
+     * @throws \LogicException
      */
     public function buildSelectQueryHydratorByClass($entityClass)
     {
+        $em = $this->registry->getManagerForClass($entityClass);
+        if (!$em instanceof EntityManager) {
+            throw new \LogicException(
+                'EntityManager must be instance of \Doctrine\ORM\EntityManager'
+            );
+        }
+
         return new SelectQueryHydrator(
-            $this->em->getRepository($entityClass),
+            $em->getRepository($entityClass),
             $this->config->getSchemaByEntityClass($entityClass),
             $this->config->getEntityConfig($entityClass)
         );

diff --git a/Resources/config/services.yml b/Resources/config/services.yml
@@ -41,7 +41,7 @@ services:
         arguments:
             - '@mdiyakov_doctrine_solr.config.config'
             - '@mdiyakov_doctrine_solr.manager.index_process_manager'
-            - '@doctrine.orm.default_entity_manager'
+            - '@doctrine'
         tags:
             - { name: console.command }
 
@@ -50,15 +50,15 @@ services:
         arguments:
             - '@mdiyakov_doctrine_solr.config.config'
             - '@mdiyakov_doctrine_solr.query.update_builder'
-            - '@doctrine.orm.default_entity_manager'
+            - '@doctrine'
         tags:
             - { name: console.command }
 
     mdiyakov_doctrine_solr.query.hydrator.builder:
         class: Mdiyakov\DoctrineSolrBundle\Query\Hydrator\HydratorBuilder
         public: false
         arguments:
-            - '@doctrine.orm.default_entity_manager'
+            - '@doctrine'
             - '@mdiyakov_doctrine_solr.config.config'
 
     mdiyakov_doctrine_solr.query.select_builder:
@@ -98,6 +98,9 @@ services:
             - '@mdiyakov_doctrine_solr.manager.index_process_manager'
             - '@doctrine'
 
+    ds.entity_manager:
+        alias: mdiyakov_doctrine_solr.manager.entity_manager
+
     ds.suggester:
         alias: mdiyakov_doctrine_solr.manager.suggester