Merge remote-tracking branch 'origin/master' into 2.3

[github/wallabag/wallabag.git] / src / Wallabag / CoreBundle / Controller / ConfigController.php

diff --git a/src/Wallabag/CoreBundle/Controller/ConfigController.php b/src/Wallabag/CoreBundle/Controller/ConfigController.php
index 7dbe3f1875902d88e3f65df80ccd14a8f5dd9a85..1a80cc1ac12f61cd1d9512bd4d9177636b55e4f6 100644 (file)
--- a/src/Wallabag/CoreBundle/Controller/ConfigController.php
+++ b/src/Wallabag/CoreBundle/Controller/ConfigController.php
@@ -284,14 +284,13 @@ class ConfigController extends Controller
     }
 
     /**
-     * Remove all tags for a given user and cleanup orphan tags.
+     * Remove all tags for given tags and a given user and cleanup orphan tags.
      *
-     * @param int $userId
+     * @param array $tags
+     * @param int   $userId
      */
-    private function removeAllTagsByUserId($userId)
+    private function removeAllTagsByStatusAndUserId($tags, $userId)
     {
-        $tags = $this->getDoctrine()->getRepository('WallabagCoreBundle:Tag')->findAllTags($userId);
-
         if (empty($tags)) {
             return;
         }
@@ -317,28 +316,21 @@ class ConfigController extends Controller
      *
      * @param int $userId
      */
-    private function removeTagsForArchivedByUserId($userId)
+    private function removeAllTagsByUserId($userId)
     {
-        $tags = $this->getDoctrine()->getRepository('WallabagCoreBundle:Tag')->findTagsForArchivedArticles($userId);
-
-        if (empty($tags)) {
-            return;
-        }
-
-        $this->getDoctrine()
-            ->getRepository('WallabagCoreBundle:Entry')
-            ->removeTags($userId, $tags);
-
-        // cleanup orphan tags
-        $em = $this->getDoctrine()->getManager();
-
-        foreach ($tags as $tag) {
-            if (count($tag->getEntries()) === 0) {
-                $em->remove($tag);
-            }
-        }
+        $tags = $this->getDoctrine()->getRepository('WallabagCoreBundle:Tag')->findAllTags($userId);
+        $this->removeAllTagsByStatusAndUserId($tags, $userId);
+    }
 
-        $em->flush();
+    /**
+     * Remove all tags for a given user and cleanup orphan tags.
+     *
+     * @param int $userId
+     */
+    private function removeTagsForArchivedByUserId($userId)
+    {
+        $tags = $this->getDoctrine()->getRepository('WallabagCoreBundle:Tag')->findForArchivedArticlesByUser($userId);
+        $this->removeAllTagsByStatusAndUserId($tags, $userId);
     }
 
     private function removeAnnotationsForArchivedByUserId($userId)
@@ -347,7 +339,7 @@ class ConfigController extends Controller
 
         $archivedEntriesAnnotations = $this->getDoctrine()
             ->getRepository('WallabagAnnotationBundle:Annotation')
-            ->findAllByArchivedEntriesAndUserId($userId);
+            ->findAllArchivedEntriesByUser($userId);
 
         foreach ($archivedEntriesAnnotations as $archivedEntriesAnnotation) {
             $em->remove($archivedEntriesAnnotation);