Merge pull request #1055 from wallabag/v2-api-patch-methid

PATCH method, boolean for some parameters and change entity methods name

diff --git a/src/Wallabag/CoreBundle/Controller/WallabagRestController.php b/src/Wallabag/CoreBundle/Controller/WallabagRestController.php
index abbf54373da203a21186bb41ec76947b3e2141a0..f14f821b153b322f301c74ff2cd0293d4f271f7c 100644 (file)
--- a/src/Wallabag/CoreBundle/Controller/WallabagRestController.php
+++ b/src/Wallabag/CoreBundle/Controller/WallabagRestController.php
@@ -17,9 +17,9 @@ class WallabagRestController extends Controller
      *
      * @ApiDoc(
      *       parameters={
-     *          {"name"="archive", "dataType"="integer", "required"=false, "format"="'0' or '1', all entries by default", "description"="filter by archived status."},
-     *          {"name"="star", "dataType"="integer", "required"=false, "format"="'0' or '1', all entries by default", "description"="filter by starred status."},
-     *          {"name"="delete", "dataType"="integer", "required"=false, "format"="'0' or '1', default '0'", "description"="filter by deleted status."},
+     *          {"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."},
@@ -106,14 +106,40 @@ class WallabagRestController extends Controller
      *      parameters={
      *          {"name"="title", "dataType"="string", "required"=false},
      *          {"name"="tags", "dataType"="string", "required"=false, "format"="tag1,tag2,tag3", "description"="a comma-separated list of tags."},
-     *          {"name"="archive", "dataType"="integer", "required"=false, "format"="'0' or '1', default '0'", "description"="archived the entry."},
-     *          {"name"="star", "dataType"="integer", "required"=false, "format"="'0' or '1', default '0'", "description"="starred the entry."},
-     *          {"name"="delete", "dataType"="integer", "required"=false, "format"="'0' or '1', default '0'", "description"="flag as deleted. Default false. In case that you don't want to *really* remove it.."},
+     *          {"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.."},
      *       }
      * )
      */
-    public function patchEntriesAction(Entries $entry)
+    public function patchEntriesAction(Entries $entry, Request $request)
     {
+        $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)) {
+            $entry->setTitle($title);
+        }
+
+        if (!is_null($isArchived)) {
+            $entry->setRead($isArchived);
+        }
+
+        if (!is_null($isDeleted)) {
+            $entry->setDeleted($isDeleted);
+        }
+
+        if (!is_null($isStarred)) {
+            $entry->setFav($isStarred);
+        }
+
+        $em = $this->getDoctrine()->getManager();
+        $em->flush();
+
+        return $entry;
     }
 
     /**
@@ -133,7 +159,6 @@ class WallabagRestController extends Controller
 
         $em = $this->getDoctrine()->getManager();
         $entry->setDeleted(1);
-        $em->persist($entry);
         $em->flush();
 
         return $entry;

diff --git a/src/Wallabag/CoreBundle/Entity/Entries.php b/src/Wallabag/CoreBundle/Entity/Entries.php
index 6eb1efc06936ae61488e1dc3f26d85cb72a8ef18..ab5b859b87ac8c405e79c90c0429d13d5fed58f4 100644 (file)
--- a/src/Wallabag/CoreBundle/Entity/Entries.php
+++ b/src/Wallabag/CoreBundle/Entity/Entries.php
@@ -185,7 +185,7 @@ class Entries
      * @param  string  $isRead
      * @return Entries
      */
-    public function setIsRead($isRead)
+    public function setRead($isRead)
     {
         $this->isRead = $isRead;
 
@@ -197,7 +197,7 @@ class Entries
      *
      * @return string
      */
-    public function getIsRead()
+    public function isRead()
     {
         return $this->isRead;
     }
@@ -215,7 +215,7 @@ class Entries
      * @param  string  $isFav
      * @return Entries
      */
-    public function setIsFav($isFav)
+    public function setFav($isFav)
     {
         $this->isFav = $isFav;
 
@@ -227,7 +227,7 @@ class Entries
      *
      * @return string
      */
-    public function getIsFav()
+    public function isFav()
     {
         return $this->isFav;
     }
@@ -402,7 +402,7 @@ class Entries
     /**
      * @return boolean
      */
-    public function isIsPublic()
+    public function isPublic()
     {
         return $this->isPublic;
     }
@@ -410,7 +410,7 @@ class Entries
     /**
      * @param boolean $isPublic
      */
-    public function setIsPublic($isPublic)
+    public function setPublic($isPublic)
     {
         $this->isPublic = $isPublic;
     }