}
/**
- * Handles an entries list and add / delete to them some tags.
+ * Handles an entries list delete tags from them.
*
* @ApiDoc(
* parameters={
- * {"name"="list", "dataType"="string", "required"=true, "format"="A JSON array of urls [{'url': 'http://...','tags': 'tag1, tag2','action': 'delete'}, {'url': 'http://...','tags': 'tag1, tag2','action': 'add'}]", "description"="Urls (as an array) to handle."}
+ * {"name"="list", "dataType"="string", "required"=true, "format"="A JSON array of urls [{'url': 'http://...','tags': 'tag1, tag2'}, {'url': 'http://...','tags': 'tag1, tag2'}]", "description"="Urls (as an array) to handle."}
* }
* )
*
* @return JsonResponse
*/
- public function postEntriesTagsListAction(Request $request)
+ public function deleteEntriesTagsListAction(Request $request)
{
$this->validateAuthentication();
);
$results[$key]['url'] = $element->url;
- $results[$key]['action'] = $element->action;
$results[$key]['entry'] = $entry instanceof Entry ? $entry->getId() : false;
$tags = $element->tags;
if (false !== $entry && !(empty($tags))) {
- switch ($element->action) {
- case 'delete':
- $tags = explode(',', $tags);
- foreach ($tags as $label) {
- $label = trim($label);
-
- $tag = $this->getDoctrine()
- ->getRepository('WallabagCoreBundle:Tag')
- ->findOneByLabel($label);
-
- if (false !== $tag) {
- $entry->removeTag($tag);
- }
- }
-
- break;
- case 'add':
- $this->get('wallabag_core.content_proxy')->assignTagsToEntry($entry, $tags);
-
- break;
+ $tags = explode(',', $tags);
+ foreach ($tags as $label) {
+ $label = trim($label);
+
+ $tag = $this->getDoctrine()
+ ->getRepository('WallabagCoreBundle:Tag')
+ ->findOneByLabel($label);
+
+ if (false !== $tag) {
+ $entry->removeTag($tag);
+ }
}
$em = $this->getDoctrine()->getManager();
return (new JsonResponse())->setJson($json);
}
+
+ /**
+ * Handles an entries list and add tags to them.
+ *
+ * @ApiDoc(
+ * parameters={
+ * {"name"="list", "dataType"="string", "required"=true, "format"="A JSON array of urls [{'url': 'http://...','tags': 'tag1, tag2'}, {'url': 'http://...','tags': 'tag1, tag2'}]", "description"="Urls (as an array) to handle."}
+ * }
+ * )
+ *
+ * @return JsonResponse
+ */
+ public function postEntriesTagsListAction(Request $request)
+ {
+ $this->validateAuthentication();
+
+ $list = json_decode($request->query->get('list', []));
+ $results = [];
+
+ // handle multiple urls
+ if (!empty($list)) {
+ $results = [];
+ foreach ($list as $key => $element) {
+ $entry = $this->get('wallabag_core.entry_repository')->findByUrlAndUserId(
+ $element->url,
+ $this->getUser()->getId()
+ );
+
+ $results[$key]['url'] = $element->url;
+ $results[$key]['entry'] = $entry instanceof Entry ? $entry->getId() : false;
+
+ $tags = $element->tags;
+
+ if (false !== $entry && !(empty($tags))) {
+ $this->get('wallabag_core.content_proxy')->assignTagsToEntry($entry, $tags);
+
+ $em = $this->getDoctrine()->getManager();
+ $em->persist($entry);
+ $em->flush();
+ }
+ }
+ }
+
+ $json = $this->get('serializer')->serialize($results, 'json');
+
+ return (new JsonResponse())->setJson($json);
+ }
}
}
/**
- * Permanently remove one tag from **every** entry.
+ * Permanently remove one tag from **every** entry by passing the Tag label.
*
* @ApiDoc(
* requirements={
}
/**
- * Permanently remove one tag from **every** entry.
+ * Permanently remove one tag from **every** entry by passing the Tag ID.
*
* @ApiDoc(
* requirements={
public function testPostEntriesTagsListAction()
{
+ $entry = $this->client->getContainer()->get('doctrine.orm.entity_manager')
+ ->getRepository('WallabagCoreBundle:Entry')
+ ->findByUrlAndUserId('http://0.0.0.0/entry2', 1);
+
+ $tags = $entry->getTags();
+
+ $this->assertCount(4, $tags);
+
$list = [
[
- 'url' => 'http://0.0.0.0/entry1',
- 'tags' => 'foo bar, baz',
- 'action' => 'delete',
+ 'url' => 'http://0.0.0.0/entry2',
+ 'tags' => 'new tag 1, new tag 2',
],
+ ];
+
+ $this->client->request('POST', '/api/entries/tags/lists?list='.json_encode($list));
+
+ $this->assertEquals(200, $this->client->getResponse()->getStatusCode());
+
+ $content = json_decode($this->client->getResponse()->getContent(), true);
+
+ $this->assertInternalType('int', $content[0]['entry']);
+ $this->assertEquals('http://0.0.0.0/entry2', $content[0]['url']);
+
+ $entry = $this->client->getContainer()->get('doctrine.orm.entity_manager')
+ ->getRepository('WallabagCoreBundle:Entry')
+ ->findByUrlAndUserId('http://0.0.0.0/entry2', 1);
+
+ $tags = $entry->getTags();
+ $this->assertCount(6, $tags);
+ }
+
+ public function testDeleteEntriesTagsListAction()
+ {
+ $entry = $this->client->getContainer()->get('doctrine.orm.entity_manager')
+ ->getRepository('WallabagCoreBundle:Entry')
+ ->findByUrlAndUserId('http://0.0.0.0/entry2', 1);
+
+ $tags = $entry->getTags();
+
+ $this->assertCount(6, $tags);
+
+ $list = [
[
'url' => 'http://0.0.0.0/entry2',
'tags' => 'new tag 1, new tag 2',
- 'action' => 'add',
],
];
- $this->client->request('POST', '/api/entries/tags/lists?list='.json_encode($list));
+ $this->client->request('DELETE', '/api/entries/tags/list?list='.json_encode($list));
$this->assertEquals(200, $this->client->getResponse()->getStatusCode());
$content = json_decode($this->client->getResponse()->getContent(), true);
+ $this->assertInternalType('int', $content[0]['entry']);
+ $this->assertEquals('http://0.0.0.0/entry2', $content[0]['url']);
- $this->assertFalse($content[0]['entry']);
- $this->assertEquals('http://0.0.0.0/entry1', $content[0]['url']);
- $this->assertEquals('delete', $content[0]['action']);
+ $entry = $this->client->getContainer()->get('doctrine.orm.entity_manager')
+ ->getRepository('WallabagCoreBundle:Entry')
+ ->findByUrlAndUserId('http://0.0.0.0/entry2', 1);
- $this->assertInternalType('int', $content[1]['entry']);
- $this->assertEquals('http://0.0.0.0/entry2', $content[1]['url']);
- $this->assertEquals('add', $content[1]['action']);
+ $tags = $entry->getTags();
+ $this->assertCount(4, $tags);
}
}