X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=src%2FWallabag%2FCoreBundle%2FController%2FWallabagRestController.php;h=27d11da5ec158c931f614186d51777a75f73fa3b;hb=f59f45d74093e92656f9717c8c5f4e37c56d2173;hp=eb41d0112ba4ffdfcdcf8cf4cd4dea6ada03ea47;hpb=27f15aa4ca4eb0eff11ddb3f3a2ce6fe945ba0e2;p=github%2Fwallabag%2Fwallabag.git diff --git a/src/Wallabag/CoreBundle/Controller/WallabagRestController.php b/src/Wallabag/CoreBundle/Controller/WallabagRestController.php index eb41d011..27d11da5 100644 --- a/src/Wallabag/CoreBundle/Controller/WallabagRestController.php +++ b/src/Wallabag/CoreBundle/Controller/WallabagRestController.php @@ -3,95 +3,194 @@ 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\Security\Core\Exception\AccessDeniedException; -use Wallabag\CoreBundle\Entity\Entries; -use Wallabag\CoreBundle\Entity\Tags; -use Wallabag\CoreBundle\Entity\Users; +use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; +use Wallabag\CoreBundle\Entity\Entry; +use Wallabag\CoreBundle\Entity\Tag; +use Wallabag\CoreBundle\Service\Extractor; -class WallabagRestController +class WallabagRestController extends Controller { + /** + * Retrieve salt for a giver user. + * + * @ApiDoc( + * parameters={ + * {"name"="username", "dataType"="string", "required"=true, "description"="username"} + * } + * ) + * @return string + */ + public function getSaltAction($username) + { + $user = $this + ->getDoctrine() + ->getRepository('WallabagCoreBundle:User') + ->findOneByUsername($username); + + if (is_null($user)) { + throw $this->createNotFoundException(); + } + return $user->getSalt(); + } /** - * Fetches all entries + * Retrieve all entries. It could be filtered by many options. * * @ApiDoc( + * 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."}, + * {"name"="perPage", "dataType"="integer", "required"=false, "format"="default'30'", "description"="results per page."}, + * {"name"="tags", "dataType"="string", "required"=false, "format"="api%2Crest", "description"="a list of tags url encoded. Will returns entries that matches ALL tags."}, + * } * ) - * @return Entries + * @return Entry */ public function getEntriesAction(Request $request) { - $isArchive = $request->query->get('archive'); - var_dump($isArchive); - $isStarred = $request->query->get('star'); - $isDeleted = $request->query->get('delete'); - $sort = $request->query->get('sort'); - $order = $request->query->get('order'); - $page = $request->query->get('page'); - $perPage = $request->query->get('perPage'); - $tags = $request->query->get('tags', array()); - - return 'plop'; + $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); + $perPage = $request->query->get('perPage', 30); + $tags = $request->query->get('tags', array()); + + $entries = $this + ->getDoctrine() + ->getRepository('WallabagCoreBundle:Entry') + ->findEntries($this->getUser()->getId(), $isArchived, $isStarred, $isDeleted, $sort, $order); + + if (!($entries)) { + throw $this->createNotFoundException(); + } + + return $entries; } /** - * Fetches an entry + * Retrieve a single entry * * @ApiDoc( * requirements={ * {"name"="entry", "dataType"="integer", "requirement"="\w+", "description"="The entry ID"} * } * ) - * @return Entries + * @return Entry */ - public function getEntryAction(Entries $entry) + public function getEntryAction(Entry $entry) { return $entry; } /** - * Deletes an entry + * Create an entry * * @ApiDoc( - * requirements={ - * {"name"="entry", "dataType"="integer", "requirement"="\w+", "description"="The entry ID"} - * } + * parameters={ + * {"name"="url", "dataType"="string", "required"=true, "format"="http://www.test.com/article.html", "description"="Url for the entry."}, + * {"name"="title", "dataType"="string", "required"=false, "description"="Optional, we'll get the title from the page."}, + * {"name"="tags", "dataType"="string", "required"=false, "format"="tag1,tag2,tag3", "description"="a comma-separated list of tags."}, + * } * ) + * @return Entry */ - public function deleteEntriesAction(Entries $entry) + public function postEntriesAction(Request $request) { + //TODO gérer si on passe les tags + $url = $request->request->get('url'); + + $content = Extractor::extract($url); + $entry = new Entry($this->getUser()); + $entry->setUrl($url); + $entry->setTitle($request->request->get('title') ?: $content->getTitle()); + $entry->setContent($content->getBody()); + $em = $this->getDoctrine()->getManager(); + $em->persist($entry); + $em->flush(); + return $entry; } /** - * Changes several properties of an entry. I.E tags, archived, starred and deleted status + * Change several properties of an entry * * @ApiDoc( * requirements={ * {"name"="entry", "dataType"="integer", "requirement"="\w+", "description"="The entry ID"} - * } + * }, + * 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"="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 */ - public function patchEntriesAction(Entries $entry) + public function patchEntriesAction(Entry $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->setArchived($isArchived); + } + + if (!is_null($isDeleted)) { + $entry->setDeleted($isDeleted); + } + if (!is_null($isStarred)) { + $entry->setStarred($isStarred); + } + + $em = $this->getDoctrine()->getManager(); + $em->flush(); + + return $entry; } /** - * Saves a new entry + * Delete **permanently** an entry * * @ApiDoc( + * requirements={ + * {"name"="entry", "dataType"="integer", "requirement"="\w+", "description"="The entry ID"} + * } * ) + * @return Entry */ - public function postEntriesAction() + public function deleteEntriesAction(Entry $entry) { + if ($entry->isDeleted()) { + throw new NotFoundHttpException('This entry is already deleted'); + } + + $em = $this->getDoctrine()->getManager(); + $entry->setDeleted(1); + $em->flush(); + return $entry; } /** - * Gets tags for an entry + * Retrieve all tags for an entry * * @ApiDoc( * requirements={ @@ -99,25 +198,28 @@ class WallabagRestController * } * ) */ - public function getEntriesTagsAction(Entries $entry) { - + public function getEntriesTagsAction(Entry $entry) + { } /** - * Saves new tag for an entry + * Add one or more tags to an entry * * @ApiDoc( * requirements={ * {"name"="entry", "dataType"="integer", "requirement"="\w+", "description"="The entry ID"} - * } + * }, + * parameters={ + * {"name"="tags", "dataType"="string", "required"=false, "format"="tag1,tag2,tag3", "description"="a comma-separated list of tags."}, + * } * ) */ - public function postEntriesTagsAction(Entries $entry) { - + public function postEntriesTagsAction(Entry $entry) + { } /** - * Remove tag for an entry + * Permanently remove one tag for an entry * * @ApiDoc( * requirements={ @@ -126,34 +228,35 @@ class WallabagRestController * } * ) */ - public function deleteEntriesTagsAction(Entries $entry, Tags $tag) + public function deleteEntriesTagsAction(Entry $entry, Tag $tag) { - } /** - * Gets tags for a user + * Retrieve all tags * * @ApiDoc( * ) */ - public function getTagsAction() { - + public function getTagsAction() + { } /** - * Gets one tag + * Retrieve a single tag * * @ApiDoc( + * requirements={ * {"name"="tag", "dataType"="string", "requirement"="\w+", "description"="The tag"} + * } * ) */ - public function getTagAction(Tags $tag) { - + public function getTagAction(Tag $tag) + { } /** - * Delete tag + * Permanently remove one tag from **every** entry * * @ApiDoc( * requirements={ @@ -161,8 +264,7 @@ class WallabagRestController * } * ) */ - public function deleteTagAction(Tags $tag) + public function deleteTagAction(Tag $tag) { - } -} \ No newline at end of file +}