*
* @ApiDoc(
* parameters={
- * {"name"="archive", "dataType"="boolean", "required"=false, "format"="true or false, all entries by default", "description"="filter by archived status."},
- * {"name"="star", "dataType"="boolean", "required"=false, "format"="true or false, all entries by default", "description"="filter by starred status."},
+ * {"name"="archive", "dataType"="integer", "required"=false, "format"="1 or 0, all entries by default", "description"="filter by archived status."},
+ * {"name"="starred", "dataType"="integer", "required"=false, "format"="1 or 0, all entries by default", "description"="filter by starred status."},
* {"name"="sort", "dataType"="string", "required"=false, "format"="'created' or 'updated', default 'created'", "description"="sort entries by date."},
* {"name"="order", "dataType"="string", "required"=false, "format"="'asc' or 'desc', default 'desc'", "description"="order of sort."},
* {"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."},
- * {"name"="tags", "dataType"="string", "required"=false, "format"="api%2Crest", "description"="a list of tags url encoded. Will returns entries that matches ALL tags."},
+ * {"name"="tags", "dataType"="string", "required"=false, "format"="api,rest", "description"="a list of tags url encoded. Will returns entries that matches ALL tags."},
* }
* )
*
{
$this->validateAuthentication();
- $isArchived = $request->query->get('archive');
- $isStarred = $request->query->get('star');
+ $isArchived = (int) $request->query->get('archive');
+ $isStarred = (int) $request->query->get('starred');
$sort = $request->query->get('sort', 'created');
$order = $request->query->get('order', 'desc');
$page = (int) $request->query->get('page', 1);
$pager = $this->getDoctrine()
->getRepository('WallabagCoreBundle:Entry')
- ->findEntries($this->getUser()->getId(), $isArchived, $isStarred, $sort, $order);
+ ->findEntries($this->getUser()->getId(), (bool) $isArchived, (bool) $isStarred, $sort, $order);
$pager->setCurrentPage($page);
$pager->setMaxPerPage($perPage);
* {"name"="url", "dataType"="string", "required"=true, "format"="http://www.test.com/article.html", "description"="Url for the entry."},
* {"name"="title", "dataType"="string", "required"=false, "description"="Optional, we'll get the title from the page."},
* {"name"="tags", "dataType"="string", "required"=false, "format"="tag1,tag2,tag3", "description"="a comma-separated list of tags."},
- * {"name"="starred", "dataType"="boolean", "required"=false, "format"="true or false", "description"="entry already starred"},
- * {"name"="archive", "dataType"="boolean", "required"=false, "format"="true or false", "description"="entry already archived"},
+ * {"name"="starred", "dataType"="integer", "required"=false, "format"="1 or 0", "description"="entry already starred"},
+ * {"name"="archive", "dataType"="integer", "required"=false, "format"="1 or 0", "description"="entry already archived"},
* }
* )
*
$this->validateAuthentication();
$url = $request->request->get('url');
- $isArchived = $request->request->get('archive');
- $isStarred = $request->request->get('starred');
+ $isArchived = (int) $request->request->get('archive');
+ $isStarred = (int) $request->request->get('starred');
$entry = $this->get('wallabag_core.entry_repository')->findByUrlAndUserId($url, $this->getUser()->getId());
$this->get('wallabag_core.content_proxy')->assignTagsToEntry($entry, $tags);
}
- if (true === (bool) $isStarred) {
- $entry->setStarred(true);
+ if (!is_null($isStarred)) {
+ $entry->setStarred((bool) $isStarred);
}
- if (true === (bool) $isArchived) {
- $entry->setArchived(true);
+ if (!is_null($isArchived)) {
+ $entry->setArchived((bool) $isArchived);
}
$em = $this->getDoctrine()->getManager();
* parameters={
* {"name"="title", "dataType"="string", "required"=false},
* {"name"="tags", "dataType"="string", "required"=false, "format"="tag1,tag2,tag3", "description"="a comma-separated list of tags."},
- * {"name"="archive", "dataType"="boolean", "required"=false, "format"="true or false", "description"="archived the entry."},
- * {"name"="star", "dataType"="boolean", "required"=false, "format"="true or false", "description"="starred the entry."},
+ * {"name"="archive", "dataType"="integer", "required"=false, "format"="1 or 0", "description"="archived the entry."},
+ * {"name"="starred", "dataType"="integer", "required"=false, "format"="1 or 0", "description"="starred the entry."},
* }
* )
*
$this->validateUserAccess($entry->getUser()->getId());
$title = $request->request->get('title');
- $isArchived = $request->request->get('archive');
- $isStarred = $request->request->get('star');
+ $isArchived = (int) $request->request->get('archive');
+ $isStarred = (int) $request->request->get('starred');
if (!is_null($title)) {
$entry->setTitle($title);
}
if (!is_null($isArchived)) {
- $entry->setArchived($isArchived);
+ $entry->setArchived((bool) $isArchived);
}
if (!is_null($isStarred)) {
- $entry->setStarred($isStarred);
+ $entry->setStarred((bool) $isStarred);
}
$tags = $request->request->get('tags', '');
{
$this->client->request('POST', '/api/entries.json', array(
'url' => 'http://www.lemonde.fr/idees/article/2016/02/08/preserver-la-liberte-d-expression-sur-les-reseaux-sociaux_4861503_3232.html',
- 'archive' => true,
- 'starred' => true,
+ 'archive' => '1',
+ 'starred' => '1',
));
$this->assertEquals(200, $this->client->getResponse()->getStatusCode());
$this->assertEquals(1, $content['user_id']);
}
+ public function testPostArchivedAndStarredEntryWithoutQuotes()
+ {
+ $this->client->request('POST', '/api/entries.json', array(
+ 'url' => 'http://www.lemonde.fr/idees/article/2016/02/08/preserver-la-liberte-d-expression-sur-les-reseaux-sociaux_4861503_3232.html',
+ 'archive' => 0,
+ 'starred' => 1,
+ ));
+
+ $this->assertEquals(200, $this->client->getResponse()->getStatusCode());
+
+ $content = json_decode($this->client->getResponse()->getContent(), true);
+
+ $this->assertGreaterThan(0, $content['id']);
+ $this->assertEquals('http://www.lemonde.fr/idees/article/2016/02/08/preserver-la-liberte-d-expression-sur-les-reseaux-sociaux_4861503_3232.html', $content['url']);
+ $this->assertEquals(false, $content['is_archived']);
+ $this->assertEquals(true, $content['is_starred']);
+ }
+
public function testPatchEntry()
{
$entry = $this->client->getContainer()
$this->client->request('PATCH', '/api/entries/'.$entry->getId().'.json', array(
'title' => 'New awesome title',
'tags' => 'new tag '.uniqid(),
- 'star' => true,
- 'archive' => false,
+ 'starred' => '1',
+ 'archive' => '0',
));
$this->assertEquals(200, $this->client->getResponse()->getStatusCode());
$this->assertEquals(1, $content['user_id']);
}
+ public function testPatchEntryWithoutQuotes()
+ {
+ $entry = $this->client->getContainer()
+ ->get('doctrine.orm.entity_manager')
+ ->getRepository('WallabagCoreBundle:Entry')
+ ->findOneByUser(1);
+
+ if (!$entry) {
+ $this->markTestSkipped('No content found in db.');
+ }
+
+ // hydrate the tags relations
+ $nbTags = count($entry->getTags());
+
+ $this->client->request('PATCH', '/api/entries/'.$entry->getId().'.json', array(
+ 'title' => 'New awesome title',
+ 'tags' => 'new tag '.uniqid(),
+ 'starred' => 1,
+ 'archive' => 0,
+ ));
+
+ $this->assertEquals(200, $this->client->getResponse()->getStatusCode());
+
+ $content = json_decode($this->client->getResponse()->getContent(), true);
+
+ $this->assertEquals($entry->getId(), $content['id']);
+ $this->assertEquals($entry->getUrl(), $content['url']);
+ $this->assertEquals('New awesome title', $content['title']);
+ $this->assertGreaterThan($nbTags, count($content['tags']));
+ }
+
public function testGetTagsEntry()
{
$entry = $this->client->getContainer()