Fix `findOneByUrl` side effect in tests

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

diff --git a/src/Wallabag/CoreBundle/Controller/EntryController.php b/src/Wallabag/CoreBundle/Controller/EntryController.php
index 9097810c22ff4dd3a88f3e8edba3f95d67fda4bf..1949bdf8ffb5490f2cfc835898418d874f607477 100644 (file)
--- a/src/Wallabag/CoreBundle/Controller/EntryController.php
+++ b/src/Wallabag/CoreBundle/Controller/EntryController.php
@@ -41,7 +41,6 @@ class EntryController extends Controller
      */
     public function addEntryFormAction(Request $request)
     {
-        $em = $this->getDoctrine()->getManager();
         $entry = new Entry($this->getUser());
 
         $form = $this->createForm(new NewEntryType(), $entry);
@@ -49,17 +48,16 @@ class EntryController extends Controller
         $form->handleRequest($request);
 
         if ($form->isValid()) {
-            $existingEntry = $em
-                ->getRepository('WallabagCoreBundle:Entry')
-                ->findOneByUrlAndUserId($entry->getUrl(), $this->getUser()->getId());
+            // check for existing entry, if it exists, redirect to it with a message
+            $existingEntry = $this->get('wallabag_core.entry_repository')->findByUrlAndUserId($entry->getUrl(), $this->getUser()->getId());
 
-            if (count($existingEntry) > 0) {
+            if (false !== $existingEntry) {
                 $this->get('session')->getFlashBag()->add(
                     'notice',
-                    'Entry already saved on '.$existingEntry[0]->getCreatedAt()->format('d-m-Y')
+                    'Entry already saved on '.$existingEntry['createdAt']->format('d-m-Y')
                 );
 
-                return $this->redirect($this->generateUrl('view', array('id' => $existingEntry[0]->getId())));
+                return $this->redirect($this->generateUrl('view', array('id' => $existingEntry['id'])));
             }
 
             $this->updateEntry($entry);
@@ -167,6 +165,11 @@ class EntryController extends Controller
      */
     public function showUnreadAction(Request $request, $page)
     {
+        // load the quickstart if no entry in database
+        if ($page == 1 && $this->get('wallabag_core.entry_repository')->countAllEntriesByUsername($this->getUser()->getId()) == 0) {
+            return $this->redirect($this->generateUrl('quickstart'));
+        }
+
         return $this->showEntries('unread', $request, $page);
     }
 
@@ -212,7 +215,7 @@ class EntryController extends Controller
      */
     private function showEntries($type, Request $request, $page)
     {
-        $repository = $this->getDoctrine()->getRepository('WallabagCoreBundle:Entry');
+        $repository = $this->get('wallabag_core.entry_repository');
 
         switch ($type) {
             case 'starred':