use Hateoas\Configuration\Route;
use Hateoas\Representation\Factory\PagerfantaFactory;
use Nelmio\ApiDocBundle\Annotation\ApiDoc;
+use Symfony\Component\HttpKernel\Exception\HttpException;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\JsonResponse;
use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
->getRepository('WallabagCoreBundle:Entry')
->findByUrlAndUserId($url, $this->getUser()->getId());
- $results[$url] = false === $res ? false : true;
+ $results[$url] = $res instanceof Entry ? $res->getId() : false;
}
- $json = $this->get('serializer')->serialize($results, 'json');
-
- return (new JsonResponse())->setJson($json);
+ return $this->sendResponse($results);
}
// let's see if it is a simple url?
->getRepository('WallabagCoreBundle:Entry')
->findByUrlAndUserId($url, $this->getUser()->getId());
- $exists = false === $res ? false : true;
-
- $json = $this->get('serializer')->serialize(['exists' => $exists], 'json');
+ $exists = $res instanceof Entry ? $res->getId() : false;
- return (new JsonResponse())->setJson($json);
+ return $this->sendResponse(['exists' => $exists]);
}
/**
$tags = $request->query->get('tags', '');
$since = $request->query->get('since', 0);
+ /** @var \Pagerfanta\Pagerfanta $pager */
$pager = $this->getDoctrine()
->getRepository('WallabagCoreBundle:Entry')
->findEntries($this->getUser()->getId(), $isArchived, $isStarred, $sort, $order, $since, $tags);
- $pager->setCurrentPage($page);
$pager->setMaxPerPage($perPage);
+ $pager->setCurrentPage($page);
$pagerfantaFactory = new PagerfantaFactory('page', 'perPage');
$paginatedCollection = $pagerfantaFactory->createRepresentation(
)
);
- $json = $this->get('serializer')->serialize($paginatedCollection, 'json');
-
- return (new JsonResponse())->setJson($json);
+ return $this->sendResponse($paginatedCollection);
}
/**
$this->validateAuthentication();
$this->validateUserAccess($entry->getUser()->getId());
- $json = $this->get('serializer')->serialize($entry, 'json');
-
- return (new JsonResponse())->setJson($json);
+ return $this->sendResponse($entry);
}
/**
->exportAs($request->attributes->get('_format'));
}
+ /**
+ * Handles an entries list and delete URL.
+ *
+ * @ApiDoc(
+ * parameters={
+ * {"name"="urls", "dataType"="string", "required"=true, "format"="A JSON array of urls [{'url': 'http://...'}, {'url': 'http://...'}]", "description"="Urls (as an array) to delete."}
+ * }
+ * )
+ *
+ * @return JsonResponse
+ */
+ public function deleteEntriesListAction(Request $request)
+ {
+ $this->validateAuthentication();
+
+ $urls = json_decode($request->query->get('urls', []));
+
+ if (empty($urls)) {
+ return $this->sendResponse([]);
+ }
+
+ $results = [];
+
+ // handle multiple urls
+ foreach ($urls as $key => $url) {
+ $entry = $this->get('wallabag_core.entry_repository')->findByUrlAndUserId(
+ $url,
+ $this->getUser()->getId()
+ );
+
+ $results[$key]['url'] = $url;
+
+ if (false !== $entry) {
+ $em = $this->getDoctrine()->getManager();
+ $em->remove($entry);
+ $em->flush();
+
+ // entry deleted, dispatch event about it!
+ $this->get('event_dispatcher')->dispatch(EntryDeletedEvent::NAME, new EntryDeletedEvent($entry));
+ }
+
+ $results[$key]['entry'] = $entry instanceof Entry ? true : false;
+ }
+
+ return $this->sendResponse($results);
+ }
+
+ /**
+ * Handles an entries list and create URL.
+ *
+ * @ApiDoc(
+ * parameters={
+ * {"name"="urls", "dataType"="string", "required"=true, "format"="A JSON array of urls [{'url': 'http://...'}, {'url': 'http://...'}]", "description"="Urls (as an array) to create."}
+ * }
+ * )
+ *
+ * @return JsonResponse
+ *
+ * @throws HttpException When limit is reached
+ */
+ public function postEntriesListAction(Request $request)
+ {
+ $this->validateAuthentication();
+
+ $urls = json_decode($request->query->get('urls', []));
+ $results = [];
+
+ $limit = $this->container->getParameter('wallabag_core.api_limit_mass_actions');
+
+ if (count($urls) > $limit) {
+ throw new HttpException(400, 'API limit reached');
+ }
+
+ // handle multiple urls
+ if (!empty($urls)) {
+ foreach ($urls as $key => $url) {
+ $entry = $this->get('wallabag_core.entry_repository')->findByUrlAndUserId(
+ $url,
+ $this->getUser()->getId()
+ );
+
+ $results[$key]['url'] = $url;
+
+ if (false === $entry) {
+ $entry = $this->get('wallabag_core.content_proxy')->updateEntry(
+ new Entry($this->getUser()),
+ $url
+ );
+ }
+
+ $em = $this->getDoctrine()->getManager();
+ $em->persist($entry);
+ $em->flush();
+
+ $results[$key]['entry'] = $entry instanceof Entry ? $entry->getId() : false;
+
+ // entry saved, dispatch event about it!
+ $this->get('event_dispatcher')->dispatch(EntrySavedEvent::NAME, new EntrySavedEvent($entry));
+ }
+ }
+
+ return $this->sendResponse($results);
+ }
+
/**
* Create an entry.
*
// entry saved, dispatch event about it!
$this->get('event_dispatcher')->dispatch(EntrySavedEvent::NAME, new EntrySavedEvent($entry));
- $json = $this->get('serializer')->serialize($entry, 'json');
-
- return (new JsonResponse())->setJson($json);
+ return $this->sendResponse($entry);
}
/**
$em = $this->getDoctrine()->getManager();
$em->flush();
- $json = $this->get('serializer')->serialize($entry, 'json');
-
- return (new JsonResponse())->setJson($json);
+ return $this->sendResponse($entry);
}
/**
// entry saved, dispatch event about it!
$this->get('event_dispatcher')->dispatch(EntrySavedEvent::NAME, new EntrySavedEvent($entry));
- $json = $this->get('serializer')->serialize($entry, 'json');
-
- return (new JsonResponse())->setJson($json);
+ return $this->sendResponse($entry);
}
/**
// entry deleted, dispatch event about it!
$this->get('event_dispatcher')->dispatch(EntryDeletedEvent::NAME, new EntryDeletedEvent($entry));
- $json = $this->get('serializer')->serialize($entry, 'json');
-
- return (new JsonResponse())->setJson($json);
+ return $this->sendResponse($entry);
}
/**
$this->validateAuthentication();
$this->validateUserAccess($entry->getUser()->getId());
- $json = $this->get('serializer')->serialize($entry->getTags(), 'json');
-
- return (new JsonResponse())->setJson($json);
+ return $this->sendResponse($entry->getTags());
}
/**
$em->persist($entry);
$em->flush();
- $json = $this->get('serializer')->serialize($entry, 'json');
-
- return (new JsonResponse())->setJson($json);
+ return $this->sendResponse($entry);
}
/**
$em->persist($entry);
$em->flush();
- $json = $this->get('serializer')->serialize($entry, 'json');
+ return $this->sendResponse($entry);
+ }
+
+ /**
+ * 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'}, {'url': 'http://...','tags': 'tag1, tag2'}]", "description"="Urls (as an array) to handle."}
+ * }
+ * )
+ *
+ * @return JsonResponse
+ */
+ public function deleteEntriesTagsListAction(Request $request)
+ {
+ $this->validateAuthentication();
+
+ $list = json_decode($request->query->get('list', []));
+
+ if (empty($list)) {
+ return $this->sendResponse([]);
+ }
+
+ // handle multiple urls
+ $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))) {
+ $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();
+ $em->persist($entry);
+ $em->flush();
+ }
+ }
+
+ return $this->sendResponse($results);
+ }
+
+ /**
+ * 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', []));
+
+ if (empty($list)) {
+ return $this->sendResponse([]);
+ }
+
+ $results = [];
+
+ // handle multiple urls
+ 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();
+ }
+ }
+
+ return $this->sendResponse($results);
+ }
+
+ /**
+ * Shortcut to send data serialized in json.
+ *
+ * @param mixed $data
+ *
+ * @return JsonResponse
+ */
+ private function sendResponse($data)
+ {
+ $json = $this->get('serializer')->serialize($data, 'json');
return (new JsonResponse())->setJson($json);
}
$this->assertEquals('application/json', $this->client->getResponse()->headers->get('Content-Type'));
}
+ public function testGetEntriesOnPageTwo()
+ {
+ $this->client->request('GET', '/api/entries', [
+ 'page' => 2,
+ 'perPage' => 2,
+ ]);
+
+ $this->assertEquals(200, $this->client->getResponse()->getStatusCode());
+
+ $content = json_decode($this->client->getResponse()->getContent(), true);
+
+ $this->assertGreaterThanOrEqual(0, $content['total']);
+ $this->assertEquals(2, $content['page']);
+ $this->assertEquals(2, $content['limit']);
+ }
+
public function testGetStarredEntries()
{
$this->client->request('GET', '/api/entries', ['starred' => 1, 'sort' => 'updated']);
$entry = $this->client->getContainer()
->get('doctrine.orm.entity_manager')
->getRepository('WallabagCoreBundle:Entry')
- ->findOneByUser(1);
+ ->findOneByUser(1, ['id' => 'asc']);
if (!$entry) {
$this->markTestSkipped('No content found in db.');
$this->assertEquals(false, $content['is_starred']);
$this->assertEquals('New title for my article', $content['title']);
$this->assertEquals(1, $content['user_id']);
- $this->assertCount(1, $content['tags']);
+ $this->assertCount(2, $content['tags']);
}
public function testPostSameEntry()
$this->assertEquals('http://www.lemonde.fr/pixels/article/2015/03/28/plongee-dans-l-univers-d-ingress-le-jeu-de-google-aux-frontieres-du-reel_4601155_4408996.html', $content['url']);
$this->assertEquals(true, $content['is_archived']);
$this->assertEquals(false, $content['is_starred']);
- $this->assertCount(2, $content['tags']);
+ $this->assertCount(3, $content['tags']);
}
public function testPostArchivedAndStarredEntry()
$content = json_decode($this->client->getResponse()->getContent(), true);
- $this->assertEquals(true, $content['exists']);
+ $this->assertEquals(2, $content['exists']);
}
public function testGetEntriesExistsWithManyUrls()
$this->assertArrayHasKey($url1, $content);
$this->assertArrayHasKey($url2, $content);
- $this->assertEquals(true, $content[$url1]);
+ $this->assertEquals(2, $content[$url1]);
$this->assertEquals(false, $content[$url2]);
}
$this->assertEquals('application/json', $this->client->getResponse()->headers->get('Content-Type'));
}
+
+ public function testPostEntriesTagsListAction()
+ {
+ $entry = $this->client->getContainer()->get('doctrine.orm.entity_manager')
+ ->getRepository('WallabagCoreBundle:Entry')
+ ->findByUrlAndUserId('http://0.0.0.0/entry4', 1);
+
+ $tags = $entry->getTags();
+
+ $this->assertCount(2, $tags);
+
+ $list = [
+ [
+ 'url' => 'http://0.0.0.0/entry4',
+ '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/entry4', $content[0]['url']);
+
+ $entry = $this->client->getContainer()->get('doctrine.orm.entity_manager')
+ ->getRepository('WallabagCoreBundle:Entry')
+ ->findByUrlAndUserId('http://0.0.0.0/entry4', 1);
+
+ $tags = $entry->getTags();
+ $this->assertCount(4, $tags);
+ }
+
+ public function testDeleteEntriesTagsListAction()
+ {
+ $entry = $this->client->getContainer()->get('doctrine.orm.entity_manager')
+ ->getRepository('WallabagCoreBundle:Entry')
+ ->findByUrlAndUserId('http://0.0.0.0/entry4', 1);
+
+ $tags = $entry->getTags();
+
+ $this->assertCount(4, $tags);
+
+ $list = [
+ [
+ 'url' => 'http://0.0.0.0/entry4',
+ 'tags' => 'new tag 1, new tag 2',
+ ],
+ ];
+
+ $this->client->request('DELETE', '/api/entries/tags/list?list='.json_encode($list));
+ }
+
+ public function testPostEntriesListAction()
+ {
+ $list = [
+ 'http://www.lemonde.fr/musiques/article/2017/04/23/loin-de-la-politique-le-printemps-de-bourges-retombe-en-enfance_5115862_1654986.html',
+ 'http://0.0.0.0/entry2',
+ ];
+
+ $this->client->request('POST', '/api/entries/lists?urls='.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://www.lemonde.fr/musiques/article/2017/04/23/loin-de-la-politique-le-printemps-de-bourges-retombe-en-enfance_5115862_1654986.html', $content[0]['url']);
+
+ $this->assertInternalType('int', $content[1]['entry']);
+ $this->assertEquals('http://0.0.0.0/entry2', $content[1]['url']);
+ }
+
+ public function testDeleteEntriesListAction()
+ {
+ $list = [
+ 'http://www.lemonde.fr/musiques/article/2017/04/23/loin-de-la-politique-le-printemps-de-bourges-retombe-en-enfance_5115862_1654986.html',
+ 'http://0.0.0.0/entry3',
+ ];
+
+ $this->client->request('DELETE', '/api/entries/list?urls='.json_encode($list));
+
+ $this->assertEquals(200, $this->client->getResponse()->getStatusCode());
+
+ $content = json_decode($this->client->getResponse()->getContent(), true);
+
+ $this->assertTrue($content[0]['entry']);
+ $this->assertEquals('http://www.lemonde.fr/musiques/article/2017/04/23/loin-de-la-politique-le-printemps-de-bourges-retombe-en-enfance_5115862_1654986.html', $content[0]['url']);
+
+ $this->assertFalse($content[1]['entry']);
+ $this->assertEquals('http://0.0.0.0/entry3', $content[1]['url']);
+ }
+
+ public function testLimitBulkAction()
+ {
+ $list = [
+ 'http://0.0.0.0/entry1',
+ 'http://0.0.0.0/entry1',
+ 'http://0.0.0.0/entry1',
+ 'http://0.0.0.0/entry1',
+ 'http://0.0.0.0/entry1',
+ 'http://0.0.0.0/entry1',
+ 'http://0.0.0.0/entry1',
+ 'http://0.0.0.0/entry1',
+ 'http://0.0.0.0/entry1',
+ 'http://0.0.0.0/entry1',
+ 'http://0.0.0.0/entry1',
+ ];
+
+ $this->client->request('POST', '/api/entries/lists?urls='.json_encode($list));
+
+ $this->assertEquals(400, $this->client->getResponse()->getStatusCode());
+ $this->assertContains('API limit reached', $this->client->getResponse()->getContent());
+ }
}
projects / github / wallabag / wallabag.git / commitdiff
