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

Remove unwanted hydration

Browse Source
This commit is contained in:
Romain Neutron
2012-03-08 19:07:04 +01:00
parent fb060cd8cf
commit 1f3ad530ae
2 changed files with 15 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lib/Doctrine/Repositories/BasketElementRepository.php
View File

@@ -17,7 +17,7 @@ class BasketElementRepository extends EntityRepository
public function findUserElement($element_id, \User_Adapter $user) public function findUserElement($element_id, \User_Adapter $user)
{ {
$dql = 'SELECT e, b, s, p, vd $dql = 'SELECT e
FROM Entities\BasketElement e FROM Entities\BasketElement e
JOIN e.basket b JOIN e.basket b
LEFT JOIN e.validation_datas vd LEFT JOIN e.validation_datas vd
@@ -35,9 +35,6 @@ class BasketElementRepository extends EntityRepository
$query = $this->_em->createQuery($dql); $query = $this->_em->createQuery($dql);
$query->setParameters($params); $query->setParameters($params);
// $cacheId = "_user_basket_element_" . $element_id . "_" . $user->get_id() . Entities\BasketElement::CACHE_SUFFIX;
// $query->useResultCache(true, 1800, $cacheId);
$element = $query->getOneOrNullResult(); $element = $query->getOneOrNullResult();
/* @var $element \Entities\BasketElement */ /* @var $element \Entities\BasketElement */
@@ -51,7 +48,7 @@ class BasketElementRepository extends EntityRepository
public function findElementsByRecord(\record_adapter $record) public function findElementsByRecord(\record_adapter $record)
{ {
$dql = 'SELECT e, b, s, p $dql = 'SELECT e
FROM Entities\BasketElement e FROM Entities\BasketElement e
JOIN e.basket b JOIN e.basket b
LEFT JOIN b.validation s LEFT JOIN b.validation s
@@ -67,9 +64,6 @@ class BasketElementRepository extends EntityRepository
$query = $this->_em->createQuery($dql); $query = $this->_em->createQuery($dql);
$query->setParameters($params); $query->setParameters($params);
// $cacheId = "_basket_element_by_record_" . $record->get_serialize_key() . Entities\BasketElement::CACHE_SUFFIX;
// $query->useResultCache(true, 1800, $cacheId);
return $query->getResult(); return $query->getResult();
} }
@@ -81,7 +75,7 @@ class BasketElementRepository extends EntityRepository
*/ */
public function findReceivedElementsByRecord(\record_adapter $record, \User_Adapter $user) public function findReceivedElementsByRecord(\record_adapter $record, \User_Adapter $user)
{ {
$dql = 'SELECT e, b, s, p $dql = 'SELECT e
FROM Entities\BasketElement e FROM Entities\BasketElement e
JOIN e.basket b JOIN e.basket b
LEFT JOIN b.validation s LEFT JOIN b.validation s
@@ -100,15 +94,12 @@ class BasketElementRepository extends EntityRepository
$query = $this->_em->createQuery($dql); $query = $this->_em->createQuery($dql);
$query->setParameters($params); $query->setParameters($params);
// $cacheId = "_receveid_element_by_record_" . $record->get_serialize_key() . "_" . $user->getId() . Entities\BasketElement::CACHE_SUFFIX;
// $query->useResultCache(true, 1800, $cacheId);
return $query->getResult(); return $query->getResult();
} }
public function findReceivedValidationElementsByRecord(\record_adapter $record, \User_Adapter $user) public function findReceivedValidationElementsByRecord(\record_adapter $record, \User_Adapter $user)
{ {
$dql = 'SELECT e, b, v, p $dql = 'SELECT e
FROM Entities\BasketElement e FROM Entities\BasketElement e
JOIN e.basket b JOIN e.basket b
JOIN b.validation v JOIN b.validation v
@@ -126,9 +117,6 @@ class BasketElementRepository extends EntityRepository
$query = $this->_em->createQuery($dql); $query = $this->_em->createQuery($dql);
$query->setParameters($params); $query->setParameters($params);
// $cacheId = "_receveid_validation_element_by_record" . $record->get_serialize_key() . "_" . $user->getId() . Entities\BasketElement::CACHE_SUFFIX;
// $query->useResultCache(true, 1800, $cacheId);
return $query->getResult(); return $query->getResult();
} }

46
lib/Doctrine/Repositories/BasketRepository.php
View File

@@ -37,11 +37,8 @@ class BasketRepository extends EntityRepository
*/ */
public function findActiveByUser(\User_Adapter $user, $sort = null) public function findActiveByUser(\User_Adapter $user, $sort = null)
{ {
$dql = 'SELECT b, e, s, p $dql = 'SELECT b
FROM Entities\Basket b FROM Entities\Basket b
LEFT JOIN b.elements e
LEFT JOIN b.validation s
LEFT JOIN s.participants p
WHERE b.usr_id = :usr_id WHERE b.usr_id = :usr_id
AND b.archived = false'; AND b.archived = false';
@@ -57,9 +54,6 @@ class BasketRepository extends EntityRepository
$query = $this->_em->createQuery($dql); $query = $this->_em->createQuery($dql);
$query->setParameters(array('usr_id' => $user->get_id())); $query->setParameters(array('usr_id' => $user->get_id()));
// $idCache = "_active_by_user_" . ($sort === null ? "" : $sort. "_" ) . $user->get_id() . Entities\Basket::CACHE_SUFFIX;
// $query->useResultCache(true, 1800, $idCache);
return $query->getResult(); return $query->getResult();
} }
@@ -71,7 +65,7 @@ class BasketRepository extends EntityRepository
*/ */
public function findUnreadActiveByUser(\User_Adapter $user) public function findUnreadActiveByUser(\User_Adapter $user)
{ {
$dql = 'SELECT b, e, s, p $dql = 'SELECT b
FROM Entities\Basket b FROM Entities\Basket b
JOIN b.elements e JOIN b.elements e
LEFT JOIN b.validation s LEFT JOIN b.validation s
@@ -95,9 +89,6 @@ class BasketRepository extends EntityRepository
$query = $this->_em->createQuery($dql); $query = $this->_em->createQuery($dql);
$query->setParameters($params); $query->setParameters($params);
// $idCache = "findUnreadActiveByUser" . $user->get_id() . Entities\Basket::CACHE_SUFFIX;
// $query->useResultCache(true, 1800, $idCache);
return $query->getResult(); return $query->getResult();
} }
@@ -110,7 +101,7 @@ class BasketRepository extends EntityRepository
*/ */
public function findActiveValidationByUser(\User_Adapter $user, $sort = null) public function findActiveValidationByUser(\User_Adapter $user, $sort = null)
{ {
$dql = 'SELECT b, e, s, p, v $dql = 'SELECT b
FROM Entities\Basket b FROM Entities\Basket b
JOIN b.elements e JOIN b.elements e
JOIN e.validation_datas v JOIN e.validation_datas v
@@ -131,9 +122,6 @@ class BasketRepository extends EntityRepository
$query = $this->_em->createQuery($dql); $query = $this->_em->createQuery($dql);
$query->setParameters(array(1 => $user->get_id(), 2 => $user->get_id())); $query->setParameters(array(1 => $user->get_id(), 2 => $user->get_id()));
// $idCache = "_active_validation_by_user_" . $user->get_id() . "_" . $sort . Entities\Basket::CACHE_SUFFIX;
// $query->useResultCache(true, 1800, $idCache);
return $query->getResult(); return $query->getResult();
} }
@@ -148,21 +136,15 @@ class BasketRepository extends EntityRepository
*/ */
public function findUserBasket($basket_id, \User_Adapter $user, $requireOwner) public function findUserBasket($basket_id, \User_Adapter $user, $requireOwner)
{ {
$dql = 'SELECT b, e, s, p, v $dql = 'SELECT b
FROM Entities\Basket b FROM Entities\Basket b
LEFT JOIN b.elements e LEFT JOIN b.elements e
LEFT JOIN e.validation_datas v
LEFT JOIN b.validation s
LEFT JOIN s.participants p
WHERE b.id = :basket_id WHERE b.id = :basket_id
ORDER BY e.ord ASC'; ORDER BY e.ord ASC';
$query = $this->_em->createQuery($dql); $query = $this->_em->createQuery($dql);
$query->setParameters(array('basket_id' => $basket_id)); $query->setParameters(array('basket_id' => $basket_id));
// $cacheId = "_find_user_" . $basket_id . Entities\Basket::CACHE_SUFFIX;
// $query->useResultCache(true, 1800, $cacheId);
$basket = $query->getOneOrNullResult(); $basket = $query->getOneOrNullResult();
/* @var $basket \Entities\Basket */ /* @var $basket \Entities\Basket */
@@ -200,7 +182,7 @@ class BasketRepository extends EntityRepository
public function findContainingRecordForUser(\record_adapter $record, \User_Adapter $user) public function findContainingRecordForUser(\record_adapter $record, \User_Adapter $user)
{ {
$dql = 'SELECT b, e $dql = 'SELECT b
FROM Entities\Basket b FROM Entities\Basket b
JOIN b.elements e JOIN b.elements e
WHERE e.record_id = :record_id AND e.sbas_id = e.sbas_id WHERE e.record_id = :record_id AND e.sbas_id = e.sbas_id
@@ -215,9 +197,6 @@ class BasketRepository extends EntityRepository
$query = $this->_em->createQuery($dql); $query = $this->_em->createQuery($dql);
$query->setParameters($params); $query->setParameters($params);
// $idCache = "_containing_record_" . $record->get_serialize_key() . Entities\Basket::CACHE_SUFFIX;
// $query->useResultCache(true, 1800, $idCache);
return $query->getResult(); return $query->getResult();
} }
@@ -228,7 +207,7 @@ class BasketRepository extends EntityRepository
switch ($type) switch ($type)
{ {
case self::RECEIVED: case self::RECEIVED:
$dql = 'SELECT b, e $dql = 'SELECT b
FROM Entities\Basket b FROM Entities\Basket b
JOIN b.elements e JOIN b.elements e
WHERE b.usr_id = :usr_id AND b.pusher_id IS NOT NULL'; WHERE b.usr_id = :usr_id AND b.pusher_id IS NOT NULL';
@@ -237,7 +216,7 @@ class BasketRepository extends EntityRepository
); );
break; break;
case self::VALIDATION_DONE: case self::VALIDATION_DONE:
$dql = 'SELECT b, e, s $dql = 'SELECT b
FROM Entities\Basket b FROM Entities\Basket b
JOIN b.elements e JOIN b.elements e
JOIN b.validation s JOIN b.validation s
@@ -249,7 +228,7 @@ class BasketRepository extends EntityRepository
); );
break; break;
case self::VALIDATION_SENT: case self::VALIDATION_SENT:
$dql = 'SELECT b, v, e $dql = 'SELECT b
FROM Entities\Basket b FROM Entities\Basket b
JOIN b.elements e JOIN b.elements e
JOIN b.validation v JOIN b.validation v
@@ -259,7 +238,7 @@ class BasketRepository extends EntityRepository
); );
break; break;
default: default:
$dql = 'SELECT b, e, s, p $dql = 'SELECT b
FROM Entities\Basket b FROM Entities\Basket b
LEFT JOIN b.elements e LEFT JOIN b.elements e
LEFT JOIN b.validation s LEFT JOIN b.validation s
@@ -271,7 +250,7 @@ class BasketRepository extends EntityRepository
); );
break; break;
case self::MYBASKETS: case self::MYBASKETS:
$dql = 'SELECT b, e, s, p $dql = 'SELECT b
FROM Entities\Basket b FROM Entities\Basket b
LEFT JOIN b.elements e LEFT JOIN b.elements e
LEFT JOIN b.validation s LEFT JOIN b.validation s
@@ -307,9 +286,6 @@ class BasketRepository extends EntityRepository
$count = Paginate::getTotalQueryResults($query); $count = Paginate::getTotalQueryResults($query);
$paginateQuery = Paginate::getPaginateQuery($query, $offset, $perPage); $paginateQuery = Paginate::getPaginateQuery($query, $offset, $perPage);
// $idCache = "_" . $type . "_workzone_basket_" . $user->get_id() . Entities\Basket::CACHE_SUFFIX;
// $paginateQuery->useResultCache(true, 1800, $idCache);
$result = $paginateQuery->getResult(); $result = $paginateQuery->getResult();
return array('count' => $count, 'result' => $result); return array('count' => $count, 'result' => $result);
@@ -323,7 +299,7 @@ class BasketRepository extends EntityRepository
*/ */
public function findActiveValidationAndBasketByUser(\User_Adapter $user, $sort = null) public function findActiveValidationAndBasketByUser(\User_Adapter $user, $sort = null)
{ {
$dql = 'SELECT b, e, s, p $dql = 'SELECT b
FROM Entities\Basket b FROM Entities\Basket b
LEFT JOIN b.elements e LEFT JOIN b.elements e
LEFT JOIN b.validation s LEFT JOIN b.validation s