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

PHRAS-2666_slow-notifications_4.1

Browse Source 
fix dql
!!! WIP !!!
This commit is contained in:
Jean-Yves Gaulier
2019-07-25 19:34:32 +02:00
parent 568268a918
commit 31b940239f
1 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
lib/Alchemy/Phrasea/Model/Repositories/BasketRepository.php
View File

@@ -77,9 +77,6 @@ class BasketRepository extends EntityRepository
$query = $this->_em->createQuery($dql);
$query->setParameters(['usr_id' => $user->getId()]);
$sql = $query->getSQL();
file_put_contents("/tmp/phraseanet-log.txt", sprintf("%s (%d) %s\n\n", __FILE__, __LINE__, var_export($sql, true)), FILE_APPEND);
return $query->getResult();
}
@@ -93,10 +90,10 @@ class BasketRepository extends EntityRepository
{
// checked : 2 usages, "b.elements" is useless
$dql = "SELECT b\n"
. " FROM (Phraseanet:Basket b\""
. " FROM Phraseanet:Basket b\n"
// . " JOIN b.elements e\n"
. " LEFT JOIN b.validation s)\n"
. " INNER JOIN s.participants p\n"
. " LEFT JOIN b.validation s\n"
. " LEFT JOIN s.participants p\n"
. " WHERE b.archived = false\n"
. " AND (\n"
. " (b.user = :usr_id_owner AND b.isRead = false)\n"
@@ -117,9 +114,6 @@ class BasketRepository extends EntityRepository
$query = $this->_em->createQuery($dql);
$query->setParameters($params);
$sql = $query->getSQL();
file_put_contents("/tmp/phraseanet-log.txt", sprintf("%s (%d) %s\n\n", __FILE__, __LINE__, var_export($sql, true)), FILE_APPEND);
return $query->getResult();
}
@@ -143,6 +137,15 @@ class BasketRepository extends EntityRepository
. "WHERE b.user != ?1 AND p.user = ?2\n"
. " AND (s.expires IS NULL OR s.expires > CURRENT_TIMESTAMP())";
$dql = 'SELECT b
FROM Phraseanet:Basket b
JOIN b.elements e
JOIN e.validation_datas v
JOIN b.validation s
JOIN s.participants p
WHERE b.user != ?1 AND p.user = ?2
AND (s.expires IS NULL OR s.expires > CURRENT_TIMESTAMP()) ';
if ($sort == 'date') {
$dql .= "\nORDER BY b.created DESC";
} elseif ($sort == 'name') {
@@ -151,8 +154,6 @@ class BasketRepository extends EntityRepository
$query = $this->_em->createQuery($dql);
$query->setParameters([1 => $user->getId(), 2 => $user->getId()]);
$sql = $query->getSQL();
file_put_contents("/tmp/phraseanet-log.txt", sprintf("%s (%d) %s\n\n", __FILE__, __LINE__, var_export($sql, true)), FILE_APPEND);
return $query->getResult();
}