Merge pull request #2393 from wallabag/api-urls-exist

Ability to check multiple urls in API
This commit is contained in:
Nicolas Lœuillet 2016-10-08 13:31:31 +02:00 committed by GitHub
commit 4ad6f5878a
2 changed files with 37 additions and 1 deletions

View file

@ -27,7 +27,8 @@ class WallabagRestController extends FOSRestController
* *
* @ApiDoc( * @ApiDoc(
* parameters={ * parameters={
* {"name"="url", "dataType"="string", "required"=true, "format"="An url", "description"="Url to check if it exists"} * {"name"="url", "dataType"="string", "required"=true, "format"="An url", "description"="Url to check if it exists"},
* {"name"="urls", "dataType"="string", "required"=false, "format"="An array of urls (?urls[]=http...&urls[]=http...)", "description"="Urls (as an array) to check if it exists"}
* } * }
* ) * )
* *
@ -37,6 +38,25 @@ class WallabagRestController extends FOSRestController
{ {
$this->validateAuthentication(); $this->validateAuthentication();
$urls = $request->query->get('urls', []);
// handle multiple urls first
if (!empty($urls)) {
$results = [];
foreach ($urls as $url) {
$res = $this->getDoctrine()
->getRepository('WallabagCoreBundle:Entry')
->findByUrlAndUserId($url, $this->getUser()->getId());
$results[$url] = false === $res ? false : true;
}
$json = $this->get('serializer')->serialize($results, 'json');
return (new JsonResponse())->setJson($json);
}
// let's see if it is a simple url?
$url = $request->query->get('url', ''); $url = $request->query->get('url', '');
if (empty($url)) { if (empty($url)) {

View file

@ -803,6 +803,22 @@ class WallabagRestControllerTest extends WallabagApiTestCase
$this->assertEquals(true, $content['exists']); $this->assertEquals(true, $content['exists']);
} }
public function testGetEntriesExistsWithManyUrls()
{
$url1 = 'http://0.0.0.0/entry2';
$url2 = 'http://0.0.0.0/entry10';
$this->client->request('GET', '/api/entries/exists?urls[]='.$url1.'&urls[]='.$url2);
$this->assertEquals(200, $this->client->getResponse()->getStatusCode());
$content = json_decode($this->client->getResponse()->getContent(), true);
$this->assertArrayHasKey($url1, $content);
$this->assertArrayHasKey($url2, $content);
$this->assertEquals(true, $content[$url1]);
$this->assertEquals(false, $content[$url2]);
}
public function testGetEntriesExistsWhichDoesNotExists() public function testGetEntriesExistsWhichDoesNotExists()
{ {
$this->client->request('GET', '/api/entries/exists?url=http://google.com/entry2'); $this->client->request('GET', '/api/entries/exists?url=http://google.com/entry2');