X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=src%2FWallabag%2FCoreBundle%2FController%2FWallabagRestController.php;h=fae633fa4b58725cbe7a027d33e958ca8ba9fe58;hb=refs%2Fpull%2F1055%2Fhead;hp=eec8d32c4704c5f7d0ee8ea6dfa09f31218bd254;hpb=a8c90c5c1b60d0c258ce56f2a8e382859e70e8d3;p=github%2Fwallabag%2Fwallabag.git diff --git a/src/Wallabag/CoreBundle/Controller/WallabagRestController.php b/src/Wallabag/CoreBundle/Controller/WallabagRestController.php index eec8d32c..fae633fa 100644 --- a/src/Wallabag/CoreBundle/Controller/WallabagRestController.php +++ b/src/Wallabag/CoreBundle/Controller/WallabagRestController.php @@ -3,23 +3,23 @@ namespace Wallabag\CoreBundle\Controller; use Nelmio\ApiDocBundle\Annotation\ApiDoc; -use FOS\RestBundle\Controller\Annotations\View; use Symfony\Bundle\FrameworkBundle\Controller\Controller; use Symfony\Component\HttpFoundation\Request; +use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; use Wallabag\CoreBundle\Entity\Entries; use Wallabag\CoreBundle\Entity\Tags; +use Wallabag\CoreBundle\Service\Extractor; class WallabagRestController extends Controller { - /** * Retrieve all entries. It could be filtered by many options. * * @ApiDoc( * parameters={ - * {"name"="archive", "dataType"="integer", "required"=false, "format"="'0' or '1', default '0'", "description"="filter by archived status."}, - * {"name"="star", "dataType"="integer", "required"=false, "format"="'0' or '1', default '0'", "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."}, @@ -31,8 +31,8 @@ class WallabagRestController extends Controller */ public function getEntriesAction(Request $request) { - $isArchived = $request->query->get('archive', 0); - $isStarred = $request->query->get('star', 0); + $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'); @@ -43,14 +43,13 @@ class WallabagRestController extends Controller $entries = $this ->getDoctrine() ->getRepository('WallabagCoreBundle:Entries') - ->findEntries(1, (int)$isArchived, (int)$isStarred, (int)$isDeleted, $sort, $order); + ->findEntries(1, $isArchived, $isStarred, $isDeleted, $sort, $order); - if(!is_array($entries)) { + if (!is_array($entries)) { throw $this->createNotFoundException(); } return $entries; - } /** @@ -79,9 +78,25 @@ class WallabagRestController extends Controller * } * ) */ - public function postEntriesAction() + public function postEntriesAction(Request $request) { + //TODO la récup ne marche pas + //TODO gérer si on passe le titre + //TODO gérer si on passe les tags + //TODO ne pas avoir du code comme ça qui doit se trouver dans le Repository + $url = $request->request->get('url'); + + $content = Extractor::extract($url); + $entry = new Entries(); + $entry->setUserId(1); + $entry->setUrl($url); + $entry->setTitle($content->getTitle()); + $entry->setContent($content->getBody()); + $em = $this->getDoctrine()->getManager(); + $em->persist($entry); + $em->flush(); + return $entry; } /** @@ -94,15 +109,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; } /** @@ -116,9 +156,16 @@ class WallabagRestController extends Controller */ public function deleteEntriesAction(Entries $entry) { + if ($entry->isDeleted()) { + throw new NotFoundHttpException('This entry is already deleted'); + } - } + $em = $this->getDoctrine()->getManager(); + $entry->setDeleted(1); + $em->flush(); + return $entry; + } /** * Retrieve all tags for an entry @@ -129,8 +176,8 @@ class WallabagRestController extends Controller * } * ) */ - public function getEntriesTagsAction(Entries $entry) { - + public function getEntriesTagsAction(Entries $entry) + { } /** @@ -145,8 +192,8 @@ class WallabagRestController extends Controller * } * ) */ - public function postEntriesTagsAction(Entries $entry) { - + public function postEntriesTagsAction(Entries $entry) + { } /** @@ -161,7 +208,6 @@ class WallabagRestController extends Controller */ public function deleteEntriesTagsAction(Entries $entry, Tags $tag) { - } /** @@ -170,8 +216,8 @@ class WallabagRestController extends Controller * @ApiDoc( * ) */ - public function getTagsAction() { - + public function getTagsAction() + { } /** @@ -183,8 +229,8 @@ class WallabagRestController extends Controller * } * ) */ - public function getTagAction(Tags $tag) { - + public function getTagAction(Tags $tag) + { } /** @@ -198,6 +244,5 @@ class WallabagRestController extends Controller */ public function deleteTagAction(Tags $tag) { - } -} \ No newline at end of file +}