[framework] fixed EntityLogger to no longer empty collection that is …

…cleared and filled on every update (#3406)
shopsys · Sep 9, 2024 · 4a18f83 · 4a18f83
1 parent 923de7a
commit 4a18f83
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 12 deletions.
diff --git a/src/Component/EntityLog/EventListener/EntityLogEventListener.php b/src/Component/EntityLog/EventListener/EntityLogEventListener.php
@@ -27,14 +27,16 @@ class EntityLogEventListener implements ResetInterface
     protected array $logs = [];
 
     /**
-     * @param \Doctrine\ORM\EntityManagerInterface $em
+     * @param \Doctrine\ORM\EntityManagerInterface $entityLogEntityManager
+     * @param \Doctrine\ORM\EntityManagerInterface $applicationEntityManager
      * @param \Psr\Log\LoggerInterface $monolog
      * @param \Shopsys\FrameworkBundle\Component\EntityLog\Attribute\LoggableEntityConfigFactory $loggableEntityConfigFactory
      * @param \Shopsys\FrameworkBundle\Component\EntityLog\ChangeSet\ChangeSetResolver $changeSetResolver
      * @param \Shopsys\FrameworkBundle\Component\EntityLog\Model\EntityLogFacade $entityLogFacade
      */
     public function __construct(
-        protected readonly EntityManagerInterface $em,
+        protected readonly EntityManagerInterface $entityLogEntityManager,
+        protected readonly EntityManagerInterface $applicationEntityManager,
         protected readonly LoggerInterface $monolog,
         protected readonly LoggableEntityConfigFactory $loggableEntityConfigFactory,
         protected readonly ChangeSetResolver $changeSetResolver,
@@ -55,14 +57,13 @@ public function postFlush(PostFlushEventArgs $args): void
 
         foreach ($this->logs as $log) {
             $log->setLogCollectionNumber($logCollectionNumber);
-            $this->em->persist($log);
+            $this->entityLogEntityManager->persist($log);
         }
 
         $this->logs = [];
-        $this->em->flush();
+        $this->entityLogEntityManager->flush();
     }
 
-    //create
     /**
      * @param \Doctrine\ORM\Event\PostPersistEventArgs $args
      */
@@ -72,7 +73,6 @@ public function postPersist(PostPersistEventArgs $args): void
         $this->log(EntityLogActionEnum::CREATE, $entity);
     }
 
-    //update
     /**
      * @param \Doctrine\ORM\Event\PostUpdateEventArgs $args
      */
@@ -82,7 +82,6 @@ public function postUpdate(PostUpdateEventArgs $args): void
         $this->log(EntityLogActionEnum::UPDATE, $entity);
     }
 
-    //delete
     /**
      * @param \Doctrine\ORM\Event\PreRemoveEventArgs $args
      */
@@ -100,11 +99,11 @@ protected function log(string $action, object $entity): void
     {
         $loggableSetup = $this->loggableEntityConfigFactory->getLoggableSetupByEntity($entity);
 
-        try {
-            if (!$loggableSetup->isLoggable()) {
-                return;
-            }
+        if (!$loggableSetup->isLoggable()) {
+            return;
+        }
 
+        try {
             $this->registerLog($entity, $loggableSetup, $action);
         } catch (Throwable $exception) {
             $this->monolog->error($exception->getMessage());
@@ -141,7 +140,7 @@ protected function registerLog(
     protected function resolveUpdateChangeSet(object $entity): array
     {
         $resolvedChangeSet = [];
-        $unitOfWork = $this->em->getUnitOfWork();
+        $unitOfWork = $this->applicationEntityManager->getUnitOfWork();
 
         $scheduledCollectionUpdates = $unitOfWork->getScheduledCollectionUpdates();
 

diff --git a/src/Resources/config/services.yaml b/src/Resources/config/services.yaml
@@ -37,6 +37,14 @@ services:
             - '@doctrine.dbal.default_connection'
             - '@doctrine.orm.default_configuration'
 
+    doctrine.orm.entity_logging:
+        class: Doctrine\ORM\EntityManager
+        factory: [Doctrine\ORM\EntityManager, create]
+        public: true
+        arguments:
+            - '@doctrine.dbal.default_connection'
+            - '@doctrine.orm.default_configuration'
+
     doctrine.orm.entity_manager.abstract:
         synthetic: true
         public: true
@@ -1045,6 +1053,8 @@ services:
             $resettableServices: !tagged kernel.reset
 
     Shopsys\FrameworkBundle\Component\EntityLog\EventListener\EntityLogEventListener:
+        arguments:
+            $entityLogEntityManager: '@doctrine.orm.entity_logging'
         tags:
             - { name: doctrine.event_listener, event: postPersist, priority: 1 }
             - { name: doctrine.event_listener, event: postUpdate, priority: 1 }