mirror of
https://github.com/wallabag/wallabag.git
synced 2024-11-26 11:01:04 +00:00
Fixes [wallabag/wallabag#2611] Add a basic Search REST endpoint
- Adds a new `search` key to `src/Wallabag/ApiBundle/Resources/config/routing_rest.yml` - Reuses the `getBuilderForSearchByUser` method from the EntryRepository - Supports, `term`, `page`, and `perPage` query parameters - Some very basic tests
This commit is contained in:
parent
3527c30021
commit
b32057980e
3 changed files with 169 additions and 0 deletions
91
src/Wallabag/ApiBundle/Controller/SearchRestController.php
Normal file
91
src/Wallabag/ApiBundle/Controller/SearchRestController.php
Normal file
|
@ -0,0 +1,91 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
namespace Wallabag\ApiBundle\Controller;
|
||||||
|
|
||||||
|
use Hateoas\Configuration\Route;
|
||||||
|
use Hateoas\Representation\Factory\PagerfantaFactory;
|
||||||
|
use JMS\Serializer\SerializationContext;
|
||||||
|
use Nelmio\ApiDocBundle\Annotation\ApiDoc;
|
||||||
|
use Pagerfanta\Adapter\DoctrineORMAdapter;
|
||||||
|
use Pagerfanta\Pagerfanta;
|
||||||
|
use Symfony\Component\HttpFoundation\JsonResponse;
|
||||||
|
use Symfony\Component\HttpFoundation\Request;
|
||||||
|
use Symfony\Component\HttpFoundation\Response;
|
||||||
|
use Symfony\Component\HttpKernel\Exception\HttpException;
|
||||||
|
use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
|
||||||
|
use Wallabag\CoreBundle\Entity\Entry;
|
||||||
|
use Wallabag\CoreBundle\Entity\Tag;
|
||||||
|
use Wallabag\CoreBundle\Event\EntryDeletedEvent;
|
||||||
|
use Wallabag\CoreBundle\Event\EntrySavedEvent;
|
||||||
|
|
||||||
|
class SearchRestController extends WallabagRestController
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* Search all entries by term.
|
||||||
|
*
|
||||||
|
* @ApiDoc(
|
||||||
|
* parameters={
|
||||||
|
* {"name"="term", "dataType"="string", "required"=false, "format"="any", "description"="Any query term"},
|
||||||
|
* {"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."}
|
||||||
|
* }
|
||||||
|
* )
|
||||||
|
*
|
||||||
|
* @return JsonResponse
|
||||||
|
*/
|
||||||
|
public function getSearchAction(Request $request)
|
||||||
|
{
|
||||||
|
$this->validateAuthentication();
|
||||||
|
|
||||||
|
$term = $request->query->get('term');
|
||||||
|
$page = (int) $request->query->get('page', 1);
|
||||||
|
$perPage = (int) $request->query->get('perPage', 30);
|
||||||
|
|
||||||
|
$qb = $this->get('wallabag_core.entry_repository')
|
||||||
|
->getBuilderForSearchByUser(
|
||||||
|
$this->getUser()->getId(),
|
||||||
|
$term,
|
||||||
|
null
|
||||||
|
);
|
||||||
|
|
||||||
|
$pagerAdapter = new DoctrineORMAdapter($qb->getQuery(), true, false);
|
||||||
|
$pager = new Pagerfanta($pagerAdapter);
|
||||||
|
|
||||||
|
$pager->setMaxPerPage($perPage);
|
||||||
|
$pager->setCurrentPage($page);
|
||||||
|
|
||||||
|
$pagerfantaFactory = new PagerfantaFactory('page', 'perPage');
|
||||||
|
$paginatedCollection = $pagerfantaFactory->createRepresentation(
|
||||||
|
$pager,
|
||||||
|
new Route(
|
||||||
|
'api_get_search',
|
||||||
|
[
|
||||||
|
'term' => $term,
|
||||||
|
'page' => $page,
|
||||||
|
'perPage' => $perPage,
|
||||||
|
],
|
||||||
|
UrlGeneratorInterface::ABSOLUTE_URL
|
||||||
|
)
|
||||||
|
);
|
||||||
|
|
||||||
|
return $this->sendResponse($paginatedCollection);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Shortcut to send data serialized in json.
|
||||||
|
*
|
||||||
|
* @param mixed $data
|
||||||
|
*
|
||||||
|
* @return JsonResponse
|
||||||
|
*/
|
||||||
|
private function sendResponse($data)
|
||||||
|
{
|
||||||
|
// https://github.com/schmittjoh/JMSSerializerBundle/issues/293
|
||||||
|
$context = new SerializationContext();
|
||||||
|
$context->setSerializeNull(true);
|
||||||
|
|
||||||
|
$json = $this->get('jms_serializer')->serialize($data, 'json', $context);
|
||||||
|
|
||||||
|
return (new JsonResponse())->setJson($json);
|
||||||
|
}
|
||||||
|
}
|
|
@ -3,6 +3,11 @@ entry:
|
||||||
resource: "WallabagApiBundle:EntryRest"
|
resource: "WallabagApiBundle:EntryRest"
|
||||||
name_prefix: api_
|
name_prefix: api_
|
||||||
|
|
||||||
|
search:
|
||||||
|
type: rest
|
||||||
|
resource: "WallabagApiBundle:SearchRest"
|
||||||
|
name_prefix: api_
|
||||||
|
|
||||||
tag:
|
tag:
|
||||||
type: rest
|
type: rest
|
||||||
resource: "WallabagApiBundle:TagRest"
|
resource: "WallabagApiBundle:TagRest"
|
||||||
|
|
|
@ -0,0 +1,73 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
namespace Tests\Wallabag\ApiBundle\Controller;
|
||||||
|
|
||||||
|
use Tests\Wallabag\ApiBundle\WallabagApiTestCase;
|
||||||
|
use Wallabag\CoreBundle\Entity\Entry;
|
||||||
|
use Wallabag\CoreBundle\Entity\Tag;
|
||||||
|
use Wallabag\CoreBundle\Helper\ContentProxy;
|
||||||
|
use Wallabag\UserBundle\Entity\User;
|
||||||
|
|
||||||
|
class SearchRestControllerTest extends WallabagApiTestCase
|
||||||
|
{
|
||||||
|
public function testGetSearchWithFullOptions()
|
||||||
|
{
|
||||||
|
$this->client->request('GET', '/api/search', [
|
||||||
|
'page' => 1,
|
||||||
|
'perPage' => 2,
|
||||||
|
'term' => 'entry' // 6 results
|
||||||
|
]);
|
||||||
|
|
||||||
|
$this->assertSame(200, $this->client->getResponse()->getStatusCode());
|
||||||
|
|
||||||
|
$content = json_decode($this->client->getResponse()->getContent(), true);
|
||||||
|
|
||||||
|
$this->assertGreaterThanOrEqual(1, count($content));
|
||||||
|
$this->assertArrayHasKey('items', $content['_embedded']);
|
||||||
|
$this->assertGreaterThanOrEqual(0, $content['total']);
|
||||||
|
$this->assertSame(1, $content['page']);
|
||||||
|
$this->assertSame(2, $content['limit']);
|
||||||
|
$this->assertGreaterThanOrEqual(1, $content['pages']);
|
||||||
|
|
||||||
|
$this->assertArrayHasKey('_links', $content);
|
||||||
|
$this->assertArrayHasKey('self', $content['_links']);
|
||||||
|
$this->assertArrayHasKey('first', $content['_links']);
|
||||||
|
$this->assertArrayHasKey('last', $content['_links']);
|
||||||
|
|
||||||
|
foreach (['self', 'first', 'last'] as $link) {
|
||||||
|
$this->assertArrayHasKey('href', $content['_links'][$link]);
|
||||||
|
$this->assertContains('term=entry', $content['_links'][$link]['href']);
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->assertSame('application/json', $this->client->getResponse()->headers->get('Content-Type'));
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testGetSearchWithNoLimit()
|
||||||
|
{
|
||||||
|
$this->client->request('GET', '/api/search', [
|
||||||
|
'term' => 'entry'
|
||||||
|
]);
|
||||||
|
|
||||||
|
$this->assertSame(200, $this->client->getResponse()->getStatusCode());
|
||||||
|
|
||||||
|
$content = json_decode($this->client->getResponse()->getContent(), true);
|
||||||
|
|
||||||
|
$this->assertGreaterThanOrEqual(1, count($content));
|
||||||
|
$this->assertArrayHasKey('items', $content['_embedded']);
|
||||||
|
$this->assertGreaterThanOrEqual(0, $content['total']);
|
||||||
|
$this->assertSame(1, $content['page']);
|
||||||
|
$this->assertGreaterThanOrEqual(1, $content['pages']);
|
||||||
|
|
||||||
|
$this->assertArrayHasKey('_links', $content);
|
||||||
|
$this->assertArrayHasKey('self', $content['_links']);
|
||||||
|
$this->assertArrayHasKey('first', $content['_links']);
|
||||||
|
$this->assertArrayHasKey('last', $content['_links']);
|
||||||
|
|
||||||
|
foreach (['self', 'first', 'last'] as $link) {
|
||||||
|
$this->assertArrayHasKey('href', $content['_links'][$link]);
|
||||||
|
$this->assertContains('term=entry', $content['_links'][$link]['href']);
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->assertSame('application/json', $this->client->getResponse()->headers->get('Content-Type'));
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in a new issue