hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-16 06:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

replaced repository methods with query-builder ones

Browse Source
This commit is contained in:
Andrey
2013-08-13 19:57:21 +02:00
parent 3b3d08a9e1
commit 090f230dd9
3 changed files with 38 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/Alchemy/Phrasea/Feed/Aggregate.php
View File

@@ -92,7 +92,7 @@ class Aggregate implements FeedInterface
*/
public static function create(Application $app, array $feed_ids)
{
$feeds = $this->em->getRepository('Entities\Feed')->findByIdArray($feed_ids);
$feeds = $this->em->getRepository('Entities\Feed')->findByIds($feed_ids);
return new static($app, $feeds);
}
@@ -114,7 +114,11 @@ class Aggregate implements FeedInterface
return null;
}
return $this->em->getRepository('Entities\FeedEntry')->findByFeeds($this->feeds, $offset_start, $how_many);
$feedIds = array();
foreach ($this->feeds as $feed) {
$feedIds[] = $feed->getId();
}
return $this->em->getRepository('Entities\FeedEntry')->findByFeeds($feedIds, $offset_start, $how_many);
}
/**
@@ -195,7 +199,11 @@ class Aggregate implements FeedInterface
public function getCountTotalEntries()
{
if (count($this->feeds) > 0) {
return count($this->em->getRepository('Entities\FeedEntry')->findByFeeds($this->feeds));
$feedIds = array();
foreach ($this->feeds as $feed) {
$feedIds[] = $feed->getId();
}
return count($this->em->getRepository('Entities\FeedEntry')->findByFeeds($feedIds));
}
return 0;

18
lib/Doctrine/Repositories/SessionRepository.php
View File

@@ -78,14 +78,16 @@ class SessionRepository extends EntityRepository
* @param array $feed_id
* @return Collection
*/
public function findByIdArray(array $feed_id)
{
$dql = 'SELECT f FROM Entities\Feed f
ORDER BY f.created_on DESC
WHERE f.id IN (' . implode(",", $feed_id) . ')';
public function findByIds(array $feedIds)
{
$qb = $this->createQueryBuilder('f');
$query = $this->_em->createQuery($dql);
return $query->getResult();
if (!empty($feedIds)) {
$qb->Where($qb->expr()->in('f.id', $feedIds));
}
$qb->orderBy('f.updated_on', 'DESC');
return $qb->getQuery()->getResult();
}
}

31
lib/Doctrine/Repositories/UserSettingRepository.php
View File

@@ -25,26 +25,29 @@ class UserSettingRepository extends EntityRepository
* Returns a collection of FeedEntry from given feeds, limited to $how_many results, starting with $offset_start
*
* @param array $feeds
* @param integer $offset_start
* @param integer $how_many
* @param integer $offsetStart
* @param integer $howMany
*
* @return \Doctrine\Common\Collections\Collection
*/
public function findByFeeds($feeds, $offset_start = null, $how_many = null)
public function findByFeeds($feeds, $offsetStart = null, $perPage = null)
{
$dql = 'SELECT f FROM Entities\FeedEntry f
WHERE f.feed IN (:feeds) order by f.updated_on DESC';
$qb = $this->createQueryBuilder('f');
$query = $this->_em->createQuery($dql);
$query->setParameter('feeds', $feeds);
if (null !== $offset_start && 0 !== $offset_start) {
$query->setFirstResult($offset_start);
}
if (null !== $how_many) {
$query->setMaxResults($how_many);
if (!empty($feeds)) {
$qb->Where($qb->expr()->in('f.feed', $feeds));
}
return $query->getResult();
$qb->orderBy('f.updated_on', 'DESC');
if ($offsetStart) {
$qb->setFirstResult(max(0, (int) $offsetStart));
}
if ($perPage) {
$qb->setMaxResults(max(5, (int) $perPage));
}
return $qb->getQuery()->getResult();
}
}