User existing service instead of getDoctrine

[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..d4170d398e58dd77c1de3f7c287f0ae9b8f8af27 100644 (file)
--- a/src/Wallabag/CoreBundle/Controller/ConfigController.php
+++ b/src/Wallabag/CoreBundle/Controller/ConfigController.php
@@ -151,9 +151,8 @@ class ConfigController extends Controller
                 'token' => $config->getRssToken(),
             ],
             'twofactor_auth' => $this->getParameter('twofactor_auth'),
-            'wallabag_url' => $this->get('craue_config')->get('wallabag_url'),
-            'enabled_users' => $this->getDoctrine()
-                ->getRepository('WallabagUserBundle:User')
+            'wallabag_url' => $this->getParameter('domain_name'),
+            'enabled_users' => $this->get('wallabag_user.user_repository')
                 ->getSumEnabledUsers(),
         ]);
     }
@@ -250,28 +249,24 @@ class ConfigController extends Controller
             case 'entries':
                 // SQLite doesn't care about cascading remove, so we need to manually remove associated stuff
                 // otherwise they won't be removed ...
-                if ($this->get('doctrine')->getConnection()->getDriver() instanceof \Doctrine\DBAL\Driver\PDOSqlite\Driver) {
+                if ($this->get('doctrine')->getConnection()->getDatabasePlatform() instanceof \Doctrine\DBAL\Platforms\SqlitePlatform) {
                     $this->getDoctrine()->getRepository('WallabagAnnotationBundle:Annotation')->removeAllByUserId($this->getUser()->getId());
                 }
 
                 // manually remove tags to avoid orphan tag
                 $this->removeAllTagsByUserId($this->getUser()->getId());
 
-                $this->getDoctrine()
-                    ->getRepository('WallabagCoreBundle:Entry')
-                    ->removeAllByUserId($this->getUser()->getId());
+                $this->get('wallabag_core.entry_repository')->removeAllByUserId($this->getUser()->getId());
                 break;
             case 'archived':
-                if ($this->get('doctrine')->getConnection()->getDriver() instanceof \Doctrine\DBAL\Driver\PDOSqlite\Driver) {
+                if ($this->get('doctrine')->getConnection()->getDatabasePlatform() instanceof \Doctrine\DBAL\Platforms\SqlitePlatform) {
                     $this->removeAnnotationsForArchivedByUserId($this->getUser()->getId());
                 }
 
                 // manually remove tags to avoid orphan tag
                 $this->removeTagsForArchivedByUserId($this->getUser()->getId());
 
-                $this->getDoctrine()
-                    ->getRepository('WallabagCoreBundle:Entry')
-                    ->removeArchivedByUserId($this->getUser()->getId());
+                $this->get('wallabag_core.entry_repository')->removeArchivedByUserId($this->getUser()->getId());
                 break;
         }
 
@@ -284,20 +279,18 @@ 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;
         }
 
-        $this->getDoctrine()
-            ->getRepository('WallabagCoreBundle:Entry')
+        $this->get('wallabag_core.entry_repository')
             ->removeTags($userId, $tags);
 
         // cleanup orphan tags
@@ -317,28 +310,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->get('wallabag_core.tag_repository')->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->get('wallabag_core.tag_repository')->findForArchivedArticlesByUser($userId);
+        $this->removeAllTagsByStatusAndUserId($tags, $userId);
     }
 
     private function removeAnnotationsForArchivedByUserId($userId)
@@ -347,7 +333,7 @@ class ConfigController extends Controller
 
         $archivedEntriesAnnotations = $this->getDoctrine()
             ->getRepository('WallabagAnnotationBundle:Annotation')
-            ->findAllByArchivedEntriesAndUserId($userId);
+            ->findAllArchivedEntriesByUser($userId);
 
         foreach ($archivedEntriesAnnotations as $archivedEntriesAnnotation) {
             $em->remove($archivedEntriesAnnotation);
@@ -401,8 +387,7 @@ class ConfigController extends Controller
      */
     public function deleteAccountAction(Request $request)
     {
-        $enabledUsers = $this->getDoctrine()
-            ->getRepository('WallabagUserBundle:User')
+        $enabledUsers = $this->get('wallabag_user.user_repository')
             ->getSumEnabledUsers();
 
         if ($enabledUsers <= 1) {