From 401135852c6b25c8d5ab97beaefb02d1bd023ec9 Mon Sep 17 00:00:00 2001
From: Jeremy Benoist <jeremy.benoist@gmail.com>
Date: Sun, 25 Sep 2016 11:26:15 +0200
Subject: Use scheduled entity insertions to avoid tag duplicate

Using `getScheduledEntityInsertions()` we can retrieve not yet flushed but already persisted entities and then avoid tags duplication on import.
---
 src/Wallabag/CoreBundle/Helper/ContentProxy.php    | 25 +++++++++++++++++-----
 src/Wallabag/ImportBundle/Import/PocketImport.php  |  3 ++-
 .../ImportBundle/Import/WallabagImport.php         |  3 ++-
 3 files changed, 24 insertions(+), 7 deletions(-)

(limited to 'src/Wallabag')

diff --git a/src/Wallabag/CoreBundle/Helper/ContentProxy.php b/src/Wallabag/CoreBundle/Helper/ContentProxy.php
index 5dd684f2..a65a21e8 100644
--- a/src/Wallabag/CoreBundle/Helper/ContentProxy.php
+++ b/src/Wallabag/CoreBundle/Helper/ContentProxy.php
@@ -96,13 +96,24 @@ class ContentProxy
      *
      * @param Entry        $entry
      * @param array|string $tags  An array of tag or a string coma separated of tag
+     * @param array $entitiesReady Entities from the EntityManager which are persisted but not yet flushed
+     *                             It is mostly to fix duplicate tag on import
+     *                             @see http://stackoverflow.com/a/7879164/569101
      */
-    public function assignTagsToEntry(Entry $entry, $tags)
+    public function assignTagsToEntry(Entry $entry, $tags, array $entitiesReady = [])
     {
         if (!is_array($tags)) {
             $tags = explode(',', $tags);
         }
 
+        // keeps only Tag entity from the "not yet flushed entities"
+        $tagsNotYetFlushed = [];
+        foreach ($entitiesReady as $entity) {
+            if ($entity instanceof Tag) {
+                $tagsNotYetFlushed[$entity->getLabel()] = $entity;
+            }
+        }
+
         foreach ($tags as $label) {
             $label = trim($label);
 
@@ -111,11 +122,15 @@ class ContentProxy
                 continue;
             }
 
-            $tagEntity = $this->tagRepository->findOneByLabel($label);
+            if (isset($tagsNotYetFlushed[$label])) {
+                $tagEntity = $tagsNotYetFlushed[$label];
+            } else {
+                $tagEntity = $this->tagRepository->findOneByLabel($label);
 
-            if (is_null($tagEntity)) {
-                $tagEntity = new Tag();
-                $tagEntity->setLabel($label);
+                if (is_null($tagEntity)) {
+                    $tagEntity = new Tag();
+                    $tagEntity->setLabel($label);
+                }
             }
 
             // only add the tag on the entry if the relation doesn't exist
diff --git a/src/Wallabag/ImportBundle/Import/PocketImport.php b/src/Wallabag/ImportBundle/Import/PocketImport.php
index e00eb44b..327e2500 100644
--- a/src/Wallabag/ImportBundle/Import/PocketImport.php
+++ b/src/Wallabag/ImportBundle/Import/PocketImport.php
@@ -227,7 +227,8 @@ class PocketImport extends AbstractImport
         if (isset($importedEntry['tags']) && !empty($importedEntry['tags'])) {
             $this->contentProxy->assignTagsToEntry(
                 $entry,
-                array_keys($importedEntry['tags'])
+                array_keys($importedEntry['tags']),
+                $this->em->getUnitOfWork()->getScheduledEntityInsertions()
             );
         }
 
diff --git a/src/Wallabag/ImportBundle/Import/WallabagImport.php b/src/Wallabag/ImportBundle/Import/WallabagImport.php
index 043bb0a2..3754e4a9 100644
--- a/src/Wallabag/ImportBundle/Import/WallabagImport.php
+++ b/src/Wallabag/ImportBundle/Import/WallabagImport.php
@@ -111,7 +111,8 @@ abstract class WallabagImport extends AbstractImport
         if (array_key_exists('tags', $data)) {
             $this->contentProxy->assignTagsToEntry(
                 $entry,
-                $data['tags']
+                $data['tags'],
+                $this->em->getUnitOfWork()->getScheduledEntityInsertions()
             );
         }
 
-- 
cgit v1.2.3