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

Removed findbyuser methods

Browse Source
This commit is contained in:
Andrey
2013-08-14 10:23:35 +02:00
parent f36173aea9
commit 42830efef5
7 changed files with 4 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Alchemy/Phrasea/Controller/Prod/Feed.php
View File

@@ -59,7 +59,7 @@ class Feed implements ControllerProviderInterface
$app->abort(404, "Feed not found");
}
$publisher = $app['EM']->getRepository('Entities\FeedPublisher')->findByUser($feed, $app['authentication']->getUser());
$publisher = $app['EM']->getRepository('Entities\FeedPublisher')->findOneBy(array('feed' => $feed, 'usr_id' => $app['authentication']->getUser()->get_id()));
if ('' === $title = trim($request->request->get('title', ''))) {
$app->abort(400, "Bad request");

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

@@ -77,7 +77,7 @@ class Aggregate implements FeedInterface
public static function createFromUser(EntityManager $em, \User_Adapter $user)
{
$feeds = $em->getRepository('Entities\Feed')->getAllForUser($user);
$token = $em->getRepository('Entities\AggregateToken')->findByUser($user);
$token = $em->getRepository('Entities\AggregateToken')->findOneBy(array('usr_id' => $user->get_id()));
return new static($em, $feeds, $token);
}

2
lib/Alchemy/Phrasea/Feed/Link/AggregateLinkGenerator.php
View File

@@ -123,7 +123,7 @@ class AggregateLinkGenerator implements LinkGeneratorInterface
{
$token = $this->em
->getRepository('Entities\AggregateToken')
->findByUser($user);
->findOneBy(array('usr_id' => $user->get_id()));
if (null === $token || true === $renew) {
if (null === $token) {

21
lib/Doctrine/Repositories/AggregateTokenRepository.php
View File

@@ -12,7 +12,6 @@
namespace Repositories;
use Doctrine\ORM\EntityRepository;
use Entities\AggregateToken;
/**
* AggregateTokenRepository
@@ -22,24 +21,4 @@ use Entities\AggregateToken;
*/
class AggregateTokenRepository extends EntityRepository
{
/**
* Finds an AggregateToken based on given User_Adapter.
*
* @param \User_Adapter $user
*
* @return AggregateToken
*/
public function findByUser(\User_Adapter $user)
{
$dql = 'SELECT t
FROM Entities\AggregateToken t
WHERE t.usr_id = :usr_id';
$query = $this->_em->createQuery($dql);
$query->setParameters(array(
':usr_id' => $user->get_id())
);
return $query->getOneOrNullResult();
}
}

2
lib/Doctrine/Repositories/FeedTokenRepository.php
View File

@@ -12,8 +12,6 @@
namespace Repositories;
use Doctrine\ORM\EntityRepository;
use Entities\Feed;
use Entities\FeedToken;
/**
* FeedTokenRepository

21
lib/Doctrine/Repositories/OrderElementRepository.php
View File

@@ -12,8 +12,6 @@
namespace Repositories;
use Doctrine\ORM\EntityRepository;
use Entities\Feed;
use Entities\FeedPublisher;
/**
* OrderElementRepository
@@ -23,23 +21,4 @@ use Entities\FeedPublisher;
*/
class OrderElementRepository extends EntityRepository
{
/**
* Finds a FeedPublisher based on a given Feed and a User_Adapter.
*
* @param Feed $feed
* @param \User_Adapter $user
*
* @return FeedPublisher
*/
public function findByUser(Feed $feed, \User_Adapter $user)
{
$dql = 'SELECT f FROM Entities\FeedPublisher f
WHERE f.usr_id = :usrId AND f.feed = :feed';
$query = $this->_em->createQuery($dql);
$query->setParameter('usrId', $user->get_id());
$query->setParameter('feed', $feed);
return $query->getOneOrNullResult();
}
}

2
tests/Alchemy/Tests/Phrasea/Feed/AggregateLinkGeneratorTest.php
View File

@@ -100,7 +100,7 @@ class AggregateLinkGeneratorTest extends \PhraseanetPHPUnitAbstract
}
$token = self::$DI['app']['EM']
->getRepository('Entities\AggregateToken')
->findByUser($user);
->findOneBy(array('usr_id' => $user->get_id()));
self::$DI['app']['EM']->remove($token);
self::$DI['app']['EM']->flush();
}