->findOneByLabel($label);
if (is_null($tagEntity)) {
- $tagEntity = new Tag($this->getUser());
+ $tagEntity = new Tag();
$tagEntity->setLabel($label);
}
* }
* )
*
- * @return Entry
+ * @return Response
*/
public function getEntriesAction(Request $request)
{
$perPage = (int) $request->query->get('perPage', 30);
$tags = $request->query->get('tags', []);
- $pager = $this
- ->getDoctrine()
+ $pager = $this->getDoctrine()
->getRepository('WallabagCoreBundle:Entry')
->findEntries($this->getUser()->getId(), $isArchived, $isStarred, $sort, $order);
* }
* )
*
- * @return Entry
+ * @return Response
*/
public function getEntryAction(Entry $entry)
{
* }
* )
*
- * @return Entry
+ * @return Response
*/
public function postEntriesAction(Request $request)
{
* }
* )
*
- * @return Entry
+ * @return Response
*/
public function patchEntriesAction(Entry $entry, Request $request)
{
$this->validateUserAccess($entry->getUser()->getId());
$title = $request->request->get('title');
- $isArchived = $request->request->get('is_archived');
- $isStarred = $request->request->get('is_starred');
+ $isArchived = $request->request->get('archive');
+ $isStarred = $request->request->get('star');
if (!is_null($title)) {
$entry->setTitle($title);
* }
* )
*
- * @return Entry
+ * @return Response
*/
public function deleteEntriesAction(Entry $entry)
{
* {"name"="entry", "dataType"="integer", "requirement"="\w+", "description"="The entry ID"}
* }
* )
+ *
+ * @return Response
*/
public function getEntriesTagsAction(Entry $entry)
{
* {"name"="tags", "dataType"="string", "required"=false, "format"="tag1,tag2,tag3", "description"="a comma-separated list of tags."},
* }
* )
+ *
+ * @return Response
*/
public function postEntriesTagsAction(Request $request, Entry $entry)
{
* {"name"="entry", "dataType"="integer", "requirement"="\w+", "description"="The entry ID"}
* }
* )
+ *
+ * @return Response
*/
public function deleteEntriesTagsAction(Entry $entry, Tag $tag)
{
* Retrieve all tags.
*
* @ApiDoc()
+ *
+ * @return Response
*/
public function getTagsAction()
{
$this->validateAuthentication();
- $json = $this->get('serializer')->serialize($this->getUser()->getTags(), 'json');
+
+ $tags = $this->getDoctrine()
+ ->getRepository('WallabagCoreBundle:Tag')
+ ->findAllTags($this->getUser()->getId());
+
+ $json = $this->get('serializer')->serialize($tags, 'json');
return $this->renderJsonResponse($json);
}
* {"name"="tag", "dataType"="integer", "requirement"="\w+", "description"="The tag"}
* }
* )
+ *
+ * @return Response
*/
public function deleteTagAction(Tag $tag)
{
$this->validateAuthentication();
- $this->validateUserAccess($tag->getUser()->getId());
- $em = $this->getDoctrine()->getManager();
- $em->remove($tag);
- $em->flush();
+ $this->getDoctrine()
+ ->getRepository('WallabagCoreBundle:Entry')
+ ->removeTag($this->getUser()->getId(), $tag);
$json = $this->get('serializer')->serialize($tag, 'json');