X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=src%2FWallabag%2FCoreBundle%2FController%2FWallabagRestController.php;h=cb68784d55d02080d5262ae3bdac5b61d4d8474c;hb=2691cf04384239c546e141af6cc3c22b210dae58;hp=3cfb8a77803920eb7771cf9ca7427567fc2b19dd;hpb=874e3e10a45a5b3c662bac1112bbdc1acb0adb95;p=github%2Fwallabag%2Fwallabag.git

diff --git a/src/Wallabag/CoreBundle/Controller/WallabagRestController.php b/src/Wallabag/CoreBundle/Controller/WallabagRestController.php
index 3cfb8a77..cb68784d 100644
--- a/src/Wallabag/CoreBundle/Controller/WallabagRestController.php
+++ b/src/Wallabag/CoreBundle/Controller/WallabagRestController.php
@@ -5,7 +5,7 @@ namespace Wallabag\CoreBundle\Controller;
 use Nelmio\ApiDocBundle\Annotation\ApiDoc;
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+use Symfony\Component\HttpFoundation\Response;
 use Wallabag\CoreBundle\Entity\Entry;
 use Wallabag\CoreBundle\Entity\Tag;
 use Wallabag\CoreBundle\Service\Extractor;
@@ -33,7 +33,7 @@ class WallabagRestController extends Controller
             throw $this->createNotFoundException();
         }
 
-        return array($user->getSalt());
+        return array($user->getSalt() ?: null);
     }
     /**
      * Retrieve all entries. It could be filtered by many options.
@@ -42,7 +42,6 @@ class WallabagRestController extends Controller
      *       parameters={
      *          {"name"="archive", "dataType"="boolean", "required"=false, "format"="true or false, all entries by default", "description"="filter by archived status."},
      *          {"name"="star", "dataType"="boolean", "required"=false, "format"="true or false, all entries by default", "description"="filter by starred status."},
-     *          {"name"="delete", "dataType"="boolean", "required"=false, "format"="true or false, default '0'", "description"="filter by deleted status."},
      *          {"name"="sort", "dataType"="string", "required"=false, "format"="'created' or 'updated', default 'created'", "description"="sort entries by date."},
      *          {"name"="order", "dataType"="string", "required"=false, "format"="'asc' or 'desc', default 'desc'", "description"="order of sort."},
      *          {"name"="page", "dataType"="integer", "required"=false, "format"="default '1'", "description"="what page you want."},
@@ -56,7 +55,6 @@ class WallabagRestController extends Controller
     {
         $isArchived = $request->query->get('archive');
         $isStarred  = $request->query->get('star');
-        $isDeleted  = $request->query->get('delete', 0);
         $sort       = $request->query->get('sort', 'created');
         $order      = $request->query->get('order', 'desc');
         $page       = $request->query->get('page', 1);
@@ -66,13 +64,15 @@ class WallabagRestController extends Controller
         $entries = $this
             ->getDoctrine()
             ->getRepository('WallabagCoreBundle:Entry')
-            ->findEntries($this->getUser()->getId(), $isArchived, $isStarred, $isDeleted, $sort, $order);
+            ->findEntries($this->getUser()->getId(), $isArchived, $isStarred, $sort, $order);
 
         if (!($entries)) {
             throw $this->createNotFoundException();
         }
 
-        return $entries;
+        $json = $this->get('serializer')->serialize($entries, 'json');
+
+        return new Response($json, 200, array('application/json'));
     }
 
     /**
@@ -87,7 +87,9 @@ class WallabagRestController extends Controller
      */
     public function getEntryAction(Entry $entry)
     {
-        return $entry;
+        $json = $this->get('serializer')->serialize($entry, 'json');
+
+        return new Response($json, 200, array('application/json'));
     }
 
     /**
@@ -116,7 +118,9 @@ class WallabagRestController extends Controller
         $em->persist($entry);
         $em->flush();
 
-        return $entry;
+        $json = $this->get('serializer')->serialize($entry, 'json');
+
+        return new Response($json, 200, array('application/json'));
     }
 
     /**
@@ -131,8 +135,7 @@ class WallabagRestController extends Controller
      *          {"name"="tags", "dataType"="string", "required"=false, "format"="tag1,tag2,tag3", "description"="a comma-separated list of tags."},
      *          {"name"="archive", "dataType"="boolean", "required"=false, "format"="true or false", "description"="archived the entry."},
      *          {"name"="star", "dataType"="boolean", "required"=false, "format"="true or false", "description"="starred the entry."},
-     *          {"name"="delete", "dataType"="boolean", "required"=false, "format"="true or false", "description"="flag as deleted. Default false. In case that you don't want to *really* remove it.."},
-     *       }
+     *      }
      * )
      * @return Entry
      */
@@ -141,7 +144,6 @@ class WallabagRestController extends Controller
         $title      = $request->request->get("title");
         $tags       = $request->request->get("tags", array());
         $isArchived = $request->request->get("archive");
-        $isDeleted  = $request->request->get("delete");
         $isStarred  = $request->request->get("star");
 
         if (!is_null($title)) {
@@ -152,10 +154,6 @@ class WallabagRestController extends Controller
             $entry->setArchived($isArchived);
         }
 
-        if (!is_null($isDeleted)) {
-            $entry->setDeleted($isDeleted);
-        }
-
         if (!is_null($isStarred)) {
             $entry->setStarred($isStarred);
         }
@@ -178,15 +176,13 @@ class WallabagRestController extends Controller
      */
     public function deleteEntriesAction(Entry $entry)
     {
-        if ($entry->isDeleted()) {
-            throw new NotFoundHttpException('This entry is already deleted');
-        }
-
         $em = $this->getDoctrine()->getManager();
-        $entry->setDeleted(1);
+        $em->remove($entry);
         $em->flush();
 
-        return $entry;
+        $json = $this->get('serializer')->serialize($entry, 'json');
+
+        return new Response($json, 200, array('application/json'));
     }
 
     /**
@@ -247,12 +243,24 @@ class WallabagRestController extends Controller
      *
      * @ApiDoc(
      *       requirements={
-     *          {"name"="tag", "dataType"="string", "requirement"="\w+", "description"="The tag"}
+     *          {"name"="label", "dataType"="string", "requirement"="\w+", "description"="Label of the tag"}
      *       }
      * )
      */
-    public function getTagAction(Tag $tag)
+    public function getTagAction($label)
     {
+        $tag = $this
+            ->getDoctrine()
+            ->getRepository('WallabagCoreBundle:Tag')
+            ->findOneByLabel($label);
+
+        if (is_null($tag)) {
+            throw $this->createNotFoundException();
+        }
+
+        $json = $this->get('serializer')->serialize($tag, 'json');
+
+        return new Response($json, 200, array('application/json'));
     }
 
     /**