From 2c093b03de92fb050a50cd4db183ba55abd4ff84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Thu, 5 Feb 2015 18:21:31 +0100 Subject: [PATCH 1/2] PATCH method, boolean for some parameters and change entity methods name --- .../Controller/WallabagRestController.php | 41 +++++++++++++++---- src/Wallabag/CoreBundle/Entity/Entries.php | 12 +++--- 2 files changed, 40 insertions(+), 13 deletions(-) diff --git a/src/Wallabag/CoreBundle/Controller/WallabagRestController.php b/src/Wallabag/CoreBundle/Controller/WallabagRestController.php index 55906ce06..711e7bb29 100644 --- 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."}, @@ -109,14 +109,41 @@ 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->persist($entry); + $em->flush(); + + return $entry; } /** diff --git a/src/Wallabag/CoreBundle/Entity/Entries.php b/src/Wallabag/CoreBundle/Entity/Entries.php index 6eb1efc06..ab5b859b8 100644 --- 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; } From c0284f6182a7421d2352e9288205d70b81185a7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Thu, 5 Feb 2015 21:36:39 +0100 Subject: [PATCH 2/2] remove persist() for PATCH and DELETE --- src/Wallabag/CoreBundle/Controller/WallabagRestController.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/Wallabag/CoreBundle/Controller/WallabagRestController.php b/src/Wallabag/CoreBundle/Controller/WallabagRestController.php index 711e7bb29..fae633fa4 100644 --- a/src/Wallabag/CoreBundle/Controller/WallabagRestController.php +++ b/src/Wallabag/CoreBundle/Controller/WallabagRestController.php @@ -140,7 +140,6 @@ class WallabagRestController extends Controller } $em = $this->getDoctrine()->getManager(); - $em->persist($entry); $em->flush(); return $entry; @@ -163,7 +162,6 @@ class WallabagRestController extends Controller $em = $this->getDoctrine()->getManager(); $entry->setDeleted(1); - $em->persist($entry); $em->flush(); return $entry;