oss/wallabag
oss/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2025-07-12 16:58:37 +00:00
Code Wiki Activity

Refactorize the way to retrieve entries

Browse source 
One place to retrieve entries in Entry & Rss controller.
More simple and easy to maintain.
This commit is contained in:
Jeremy Benoist 2015-08-20 20:10:06 +02:00
parent 4fcb7eaf13
commit 0ab7404f93
3 changed files with 124 additions and 115 deletions
Download patch file Download diff file Expand all files Collapse all files

73
src/Wallabag/CoreBundle/Controller/RssController.php
View file

@ -22,22 +22,7 @@ class RssController extends Controller
*/
public function showUnreadAction(User $user)
{
$qb = $this->getDoctrine()
->getRepository('WallabagCoreBundle:Entry')
->findUnreadByUser(
$user->getId()
);
$pagerAdapter = new DoctrineORMAdapter($qb->getQuery());
$entries = new Pagerfanta($pagerAdapter);
$perPage = $user->getConfig()->getRssLimit() ?: $this->container->getParameter('rss_limit');
$entries->setMaxPerPage($perPage);
return $this->render('WallabagCoreBundle:Entry:entries.xml.twig', array(
'type' => 'unread',
'entries' => $entries,
));
return $this->showEntries('unread', $user);
}
/**
@ -50,22 +35,7 @@ class RssController extends Controller
*/
public function showArchiveAction(User $user)
{
$qb = $this->getDoctrine()
->getRepository('WallabagCoreBundle:Entry')
->findArchiveByUser(
$user->getId()
);
$pagerAdapter = new DoctrineORMAdapter($qb->getQuery());
$entries = new Pagerfanta($pagerAdapter);
$perPage = $user->getConfig()->getRssLimit() ?: $this->container->getParameter('rss_limit');
$entries->setMaxPerPage($perPage);
return $this->render('WallabagCoreBundle:Entry:entries.xml.twig', array(
'type' => 'archive',
'entries' => $entries,
));
return $this->showEntries('archive', $user);
}
/**
@ -78,11 +48,38 @@ class RssController extends Controller
*/
public function showStarredAction(User $user)
{
$qb = $this->getDoctrine()
->getRepository('WallabagCoreBundle:Entry')
->findStarredByUser(
$user->getId()
);
return $this->showEntries('starred', $user);
}
/**
* Global method to retrieve entries depending on the given type
* It returns the response to be send.
*
* @param string $type Entries type: unread, starred or archive
* @param User $user
*
* @return \Symfony\Component\HttpFoundation\Response
*/
private function showEntries($type, User $user)
{
$repository = $this->getDoctrine()->getRepository('WallabagCoreBundle:Entry');
switch ($type) {
case 'starred':
$qb = $repository->getBuilderForStarredByUser($user->getId());
break;
case 'archive':
$qb = $repository->getBuilderForArchiveByUser($user->getId());
break;
case 'unread':
$qb = $repository->getBuilderForUnreadByUser($user->getId());
break;
default:
throw new \InvalidArgumentException(sprintf('Type "%s" is not implemented.', $type));
}
$pagerAdapter = new DoctrineORMAdapter($qb->getQuery());
$entries = new Pagerfanta($pagerAdapter);
@ -91,7 +88,7 @@ class RssController extends Controller
$entries->setMaxPerPage($perPage);
return $this->render('WallabagCoreBundle:Entry:entries.xml.twig', array(
'type' => 'starred',
'type' => $type,
'entries' => $entries,
));
}