mirror of
https://github.com/wallabag/wallabag.git
synced 2024-10-31 22:28:54 +00:00
Splitted the endpoint in two
This commit is contained in:
parent
1eca7831a6
commit
a7abcc7b7a
2 changed files with 95 additions and 70 deletions
|
@ -173,37 +173,34 @@ class EntryRestController extends WallabagRestController
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Handles an entries list and create or remove URL.
|
* Handles an entries list and delete URL.
|
||||||
*
|
*
|
||||||
* @ApiDoc(
|
* @ApiDoc(
|
||||||
* parameters={
|
* parameters={
|
||||||
* {"name"="list", "dataType"="string", "required"=true, "format"="A JSON array of urls [{'url': 'http://...', 'action': 'delete'}, {'url': 'http://...', 'action': 'add'}]", "description"="Urls (as an array) to handle."}
|
* {"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
|
* @return JsonResponse
|
||||||
*/
|
*/
|
||||||
public function postEntriesListAction(Request $request)
|
public function deleteEntriesListAction(Request $request)
|
||||||
{
|
{
|
||||||
$this->validateAuthentication();
|
$this->validateAuthentication();
|
||||||
|
|
||||||
$list = json_decode($request->query->get('list', []));
|
$urls = json_decode($request->query->get('urls', []));
|
||||||
$results = [];
|
$results = [];
|
||||||
|
|
||||||
// handle multiple urls
|
// handle multiple urls
|
||||||
if (!empty($list)) {
|
if (!empty($urls)) {
|
||||||
$results = [];
|
$results = [];
|
||||||
foreach ($list as $key => $element) {
|
foreach ($urls as $key => $url) {
|
||||||
$entry = $this->get('wallabag_core.entry_repository')->findByUrlAndUserId(
|
$entry = $this->get('wallabag_core.entry_repository')->findByUrlAndUserId(
|
||||||
$element->url,
|
$url,
|
||||||
$this->getUser()->getId()
|
$this->getUser()->getId()
|
||||||
);
|
);
|
||||||
|
|
||||||
$results[$key]['url'] = $element->url;
|
$results[$key]['url'] = $url;
|
||||||
$results[$key]['action'] = $element->action;
|
|
||||||
|
|
||||||
switch ($element->action) {
|
|
||||||
case 'delete':
|
|
||||||
if (false !== $entry) {
|
if (false !== $entry) {
|
||||||
$em = $this->getDoctrine()->getManager();
|
$em = $this->getDoctrine()->getManager();
|
||||||
$em->remove($entry);
|
$em->remove($entry);
|
||||||
|
@ -214,13 +211,47 @@ class EntryRestController extends WallabagRestController
|
||||||
}
|
}
|
||||||
|
|
||||||
$results[$key]['entry'] = $entry instanceof Entry ? true : false;
|
$results[$key]['entry'] = $entry instanceof Entry ? true : false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
$json = $this->get('serializer')->serialize($results, 'json');
|
||||||
|
|
||||||
|
return (new JsonResponse())->setJson($json);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 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
|
||||||
|
*/
|
||||||
|
public function postEntriesListAction(Request $request)
|
||||||
|
{
|
||||||
|
$this->validateAuthentication();
|
||||||
|
|
||||||
|
$urls = json_decode($request->query->get('urls', []));
|
||||||
|
$results = [];
|
||||||
|
|
||||||
|
// handle multiple urls
|
||||||
|
if (!empty($urls)) {
|
||||||
|
$results = [];
|
||||||
|
foreach ($urls as $key => $url) {
|
||||||
|
$entry = $this->get('wallabag_core.entry_repository')->findByUrlAndUserId(
|
||||||
|
$url,
|
||||||
|
$this->getUser()->getId()
|
||||||
|
);
|
||||||
|
|
||||||
|
$results[$key]['url'] = $url;
|
||||||
|
|
||||||
break;
|
|
||||||
case 'add':
|
|
||||||
if (false === $entry) {
|
if (false === $entry) {
|
||||||
$entry = $this->get('wallabag_core.content_proxy')->updateEntry(
|
$entry = $this->get('wallabag_core.content_proxy')->updateEntry(
|
||||||
new Entry($this->getUser()),
|
new Entry($this->getUser()),
|
||||||
$element->url
|
$url
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -232,9 +263,6 @@ class EntryRestController extends WallabagRestController
|
||||||
|
|
||||||
// entry saved, dispatch event about it!
|
// entry saved, dispatch event about it!
|
||||||
$this->get('event_dispatcher')->dispatch(EntrySavedEvent::NAME, new EntrySavedEvent($entry));
|
$this->get('event_dispatcher')->dispatch(EntrySavedEvent::NAME, new EntrySavedEvent($entry));
|
||||||
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -769,28 +769,35 @@ class EntryRestControllerTest extends WallabagApiTestCase
|
||||||
$this->client->request('DELETE', '/api/entries/tags/list?list=' . json_encode($list));
|
$this->client->request('DELETE', '/api/entries/tags/list?list=' . json_encode($list));
|
||||||
}
|
}
|
||||||
|
|
||||||
public function testPostMassEntriesAction()
|
|
||||||
|
public function testPostEntriesListAction()
|
||||||
{
|
{
|
||||||
$list = [
|
$list = [
|
||||||
[
|
'http://www.lemonde.fr/musiques/article/2017/04/23/loin-de-la-politique-le-printemps-de-bourges-retombe-en-enfance_5115862_1654986.html',
|
||||||
'url' => 'http://0.0.0.0/entry2',
|
'http://0.0.0.0/entry6',
|
||||||
'action' => 'delete',
|
|
||||||
],
|
|
||||||
[
|
|
||||||
'url' => 'http://www.lemonde.fr/musiques/article/2017/04/23/loin-de-la-politique-le-printemps-de-bourges-retombe-en-enfance_5115862_1654986.html',
|
|
||||||
'action' => 'add',
|
|
||||||
],
|
|
||||||
[
|
|
||||||
'url' => 'http://0.0.0.0/entry3',
|
|
||||||
'action' => 'delete',
|
|
||||||
],
|
|
||||||
[
|
|
||||||
'url' => 'http://0.0.0.0/entry6',
|
|
||||||
'action' => 'add',
|
|
||||||
],
|
|
||||||
];
|
];
|
||||||
|
|
||||||
$this->client->request('POST', '/api/entries/lists?list='.json_encode($list));
|
$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/entry6', $content[1]['url']);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testDeleteEntriesListAction()
|
||||||
|
{
|
||||||
|
$list = [
|
||||||
|
'http://0.0.0.0/entry2',
|
||||||
|
'http://0.0.0.0/entry3',
|
||||||
|
];
|
||||||
|
|
||||||
|
$this->client->request('DELETE', '/api/entries/list?urls='.json_encode($list));
|
||||||
|
|
||||||
$this->assertEquals(200, $this->client->getResponse()->getStatusCode());
|
$this->assertEquals(200, $this->client->getResponse()->getStatusCode());
|
||||||
|
|
||||||
|
@ -798,18 +805,8 @@ class EntryRestControllerTest extends WallabagApiTestCase
|
||||||
|
|
||||||
$this->assertTrue($content[0]['entry']);
|
$this->assertTrue($content[0]['entry']);
|
||||||
$this->assertEquals('http://0.0.0.0/entry2', $content[0]['url']);
|
$this->assertEquals('http://0.0.0.0/entry2', $content[0]['url']);
|
||||||
$this->assertEquals('delete', $content[0]['action']);
|
|
||||||
|
|
||||||
$this->assertInternalType('int', $content[1]['entry']);
|
$this->assertFalse($content[1]['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[1]['url']);
|
$this->assertEquals('http://0.0.0.0/entry3', $content[1]['url']);
|
||||||
$this->assertEquals('add', $content[1]['action']);
|
|
||||||
|
|
||||||
$this->assertFalse($content[2]['entry']);
|
|
||||||
$this->assertEquals('http://0.0.0.0/entry3', $content[2]['url']);
|
|
||||||
$this->assertEquals('delete', $content[2]['action']);
|
|
||||||
|
|
||||||
$this->assertInternalType('int', $content[3]['entry']);
|
|
||||||
$this->assertEquals('http://0.0.0.0/entry6', $content[3]['url']);
|
|
||||||
$this->assertEquals('add', $content[3]['action']);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue