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

fix cach & fix #398 move service fallback

Browse Source
This commit is contained in:
Nicolas Le Goff
2012-02-16 18:52:44 +01:00
parent 5743267b01
commit 371b21371d
7 changed files with 340 additions and 318 deletions
Download Patch File Download Diff File Expand all files Collapse all files

582
lib/Alchemy/Phrasea/Controller/Prod/Basket.php
View File

@@ -46,76 +46,76 @@ class Basket implements ControllerProviderInterface
* *
*/ */
$controllers->post('/', function(Application $app) $controllers->post('/', function(Application $app)
{ {
$request = $app['request']; $request = $app['request'];
/* @var $request \Symfony\Component\HttpFoundation\Request */ /* @var $request \Symfony\Component\HttpFoundation\Request */
$em = $app['Core']->getEntityManager(); $em = $app['Core']->getEntityManager();
$user = $app['Core']->getAuthenticatedUser(); $user = $app['Core']->getAuthenticatedUser();
$Basket = new \Entities\Basket(); $Basket = new \Entities\Basket();
$Basket->setName($request->get('name', '')); $Basket->setName($request->get('name', ''));
$Basket->setOwner($app['Core']->getAuthenticatedUser()); $Basket->setOwner($app['Core']->getAuthenticatedUser());
$Basket->setDescription($request->get('desc')); $Basket->setDescription($request->get('desc'));
$em->persist($Basket); $em->persist($Basket);
$n = 0; $n = 0;
foreach (explode(';', $request->get('lst')) as $sbas_rec) foreach (explode(';', $request->get('lst')) as $sbas_rec)
{ {
$sbas_rec = explode('_', $sbas_rec); $sbas_rec = explode('_', $sbas_rec);
if (count($sbas_rec) !== 2) if (count($sbas_rec) !== 2)
continue; continue;
$record = new \record_adapter($sbas_rec[0], $sbas_rec[1]); $record = new \record_adapter($sbas_rec[0], $sbas_rec[1]);
if (!$user->ACL()->has_access_to_base($record->get_base_id()) if (!$user->ACL()->has_access_to_base($record->get_base_id())
&& !$user->ACL()->has_hd_grant($record) && !$user->ACL()->has_hd_grant($record)
&& !$user->ACL()->has_preview_grant($record)) && !$user->ACL()->has_preview_grant($record))
{ {
continue; continue;
} }
if ($Basket->hasRecord($record)) if ($Basket->hasRecord($record))
continue; continue;
$basket_element = new \Entities\BasketElement(); $basket_element = new \Entities\BasketElement();
$basket_element->setRecord($record); $basket_element->setRecord($record);
$basket_element->setBasket($Basket); $basket_element->setBasket($Basket);
$em->persist($basket_element); $em->persist($basket_element);
$Basket->addBasketElement($basket_element); $Basket->addBasketElement($basket_element);
$n++; $n++;
} }
$em->flush(); $em->flush();
if ($request->getRequestFormat() == 'json') if ($request->getRequestFormat() == 'json')
{ {
$data = array( $data = array(
'success' => true 'success' => true
, 'message' => _('Basket created') , 'message' => _('Basket created')
, 'basket' => array( , 'basket' => array(
'id' => $Basket->getId() 'id' => $Basket->getId()
) )
); );
$datas = $app['Core']['Serializer']->serialize($data, 'json'); $datas = $app['Core']['Serializer']->serialize($data, 'json');
return new Response($datas, 200, array('Content-type' => 'application/json')); return new Response($datas, 200, array('Content-type' => 'application/json'));
} }
else else
{ {
return new RedirectResponse(sprintf('/%d/', $Basket->getId())); return new RedirectResponse(sprintf('/%d/', $Basket->getId()));
} }
}); });
/** /**
* This route is used to delete a basket * This route is used to delete a basket
@@ -124,73 +124,73 @@ class Basket implements ControllerProviderInterface
* *
*/ */
$controllers->post('/{basket_id}/delete/', function(Application $app, Request $request, $basket_id) $controllers->post('/{basket_id}/delete/', function(Application $app, Request $request, $basket_id)
{ {
$em = $app['Core']->getEntityManager(); $em = $app['Core']->getEntityManager();
$basket = $em->getRepository('\Entities\Basket') $basket = $em->getRepository('\Entities\Basket')
->findUserBasket($basket_id, $app['Core']->getAuthenticatedUser()); ->findUserBasket($basket_id, $app['Core']->getAuthenticatedUser());
$em->remove($basket); $em->remove($basket);
$em->flush(); $em->flush();
$data = array( $data = array(
'success' => true 'success' => true
, 'message' => _('Basket has been deleted') , 'message' => _('Basket has been deleted')
); );
if ($request->getRequestFormat() == 'json') if ($request->getRequestFormat() == 'json')
{ {
$datas = $app['Core']['Serializer']->serialize($data, 'json'); $datas = $app['Core']['Serializer']->serialize($data, 'json');
return new Response($datas, 200, array('Content-type' => 'application/json')); return new Response($datas, 200, array('Content-type' => 'application/json'));
} }
else else
{ {
return new RedirectResponse('/'); return new RedirectResponse('/');
} }
})->assert('basket_id', '\d+'); })->assert('basket_id', '\d+');
/** /**
* Removes a BasketElement * Removes a BasketElement
*/ */
$controllers->post( $controllers->post(
'/{basket_id}/delete/{basket_element_id}/' '/{basket_id}/delete/{basket_element_id}/'
, function(Application $app, Request $request, $basket_id, $basket_element_id) , function(Application $app, Request $request, $basket_id, $basket_element_id)
{ {
/* @var $em \Doctrine\ORM\EntityManager */ /* @var $em \Doctrine\ORM\EntityManager */
$em = $app['Core']->getEntityManager(); $em = $app['Core']->getEntityManager();
$basket = $em->getRepository('\Entities\Basket') $basket = $em->getRepository('\Entities\Basket')
->findUserBasket($basket_id, $app['Core']->getAuthenticatedUser()); ->findUserBasket($basket_id, $app['Core']->getAuthenticatedUser());
foreach ($basket->getElements() as $basket_element) foreach ($basket->getElements() as $basket_element)
{ {
/* @var $basket_element \Entities\BasketElement */ /* @var $basket_element \Entities\BasketElement */
if ($basket_element->getId() == $basket_element_id) if ($basket_element->getId() == $basket_element_id)
{ {
$em->remove($basket_element); $em->remove($basket_element);
} }
} }
$em->flush(); $em->flush();
$data = array( $data = array(
'success' => true 'success' => true
, 'message' => _('Record removed from basket') , 'message' => _('Record removed from basket')
); );
if ($request->getRequestFormat() == 'json') if ($request->getRequestFormat() == 'json')
{ {
$datas = $app['Core']['Serializer']->serialize($data, 'json'); $datas = $app['Core']['Serializer']->serialize($data, 'json');
return new Response($datas, 200, array('Content-type' => 'application/json')); return new Response($datas, 200, array('Content-type' => 'application/json'));
} }
else else
{ {
return new RedirectResponse('/'); return new RedirectResponse('/');
} }
})->assert('basket_id', '\d+')->assert('basket_element_id', '\d+'); })->assert('basket_id', '\d+')->assert('basket_element_id', '\d+');
/** /**
* Update name and description of a basket * Update name and description of a basket
@@ -200,83 +200,83 @@ class Basket implements ControllerProviderInterface
* *
*/ */
$controllers->post('/{basket_id}/update/', function(Application $app, Request $request, $basket_id) $controllers->post('/{basket_id}/update/', function(Application $app, Request $request, $basket_id)
{ {
$em = $app['Core']->getEntityManager(); $em = $app['Core']->getEntityManager();
$basket = $em->getRepository('\Entities\Basket') $basket = $em->getRepository('\Entities\Basket')
->findUserBasket($basket_id, $app['Core']->getAuthenticatedUser()); ->findUserBasket($basket_id, $app['Core']->getAuthenticatedUser());
$basket->setName($request->get('name', '')); $basket->setName($request->get('name', ''));
$basket->setDescription($request->get('description')); $basket->setDescription($request->get('description'));
$em->merge($basket); $em->merge($basket);
$em->flush(); $em->flush();
$data = array( $data = array(
'success' => true 'success' => true
, 'message' => _('Basket has been updated') , 'message' => _('Basket has been updated')
, 'basket' => array('id' => $basket->getId()) , 'basket' => array('id' => $basket->getId())
); );
if ($request->getRequestFormat() == 'json') if ($request->getRequestFormat() == 'json')
{ {
$datas = $app['Core']['Serializer']->serialize($data, 'json'); $datas = $app['Core']['Serializer']->serialize($data, 'json');
return new Response($datas, 200, array('Content-type' => 'application/json')); return new Response($datas, 200, array('Content-type' => 'application/json'));
} }
else else
{ {
return new RedirectResponse('/'); return new RedirectResponse('/');
} }
})->assert('basket_id', '\d+'); })->assert('basket_id', '\d+');
/** /**
* Get the form to update the Basket attributes (name and description) * Get the form to update the Basket attributes (name and description)
*/ */
$controllers->get('/{basket_id}/update/', function(Application $app, $basket_id) $controllers->get('/{basket_id}/update/', function(Application $app, $basket_id)
{ {
/* @var $em \Doctrine\ORM\EntityManager */ /* @var $em \Doctrine\ORM\EntityManager */
$em = $app['Core']->getEntityManager(); $em = $app['Core']->getEntityManager();
$basket = $em->getRepository('\Entities\Basket') $basket = $em->getRepository('\Entities\Basket')
->findUserBasket($basket_id, $app['Core']->getAuthenticatedUser()); ->findUserBasket($basket_id, $app['Core']->getAuthenticatedUser());
/* @var $twig \Twig_Environment */ /* @var $twig \Twig_Environment */
$twig = $app['Core']->getTwig(); $twig = $app['Core']->getTwig();
return new Response( return new Response(
$twig->render( $twig->render(
'prod/Baskets/Update.html.twig' 'prod/Baskets/Update.html.twig'
, array('basket' => $basket) , array('basket' => $basket)
) )
); );
})->assert('basket_id', '\d+'); })->assert('basket_id', '\d+');
/** /**
* Get the Basket reorder form * Get the Basket reorder form
*/ */
$controllers->get( $controllers->get(
'/{basket_id}/reorder/' '/{basket_id}/reorder/'
, function(Application $app, $basket_id) , function(Application $app, $basket_id)
{ {
/* @var $em \Doctrine\ORM\EntityManager */ /* @var $em \Doctrine\ORM\EntityManager */
$em = $app['Core']->getEntityManager(); $em = $app['Core']->getEntityManager();
$basket = $em->getRepository('\Entities\Basket') $basket = $em->getRepository('\Entities\Basket')
->findUserBasket($basket_id, $app['Core']->getAuthenticatedUser()); ->findUserBasket($basket_id, $app['Core']->getAuthenticatedUser());
/* @var $twig \Twig_Environment */ /* @var $twig \Twig_Environment */
$twig = $app['Core']->getTwig(); $twig = $app['Core']->getTwig();
return new Response( return new Response(
$twig->render( $twig->render(
'prod/Baskets/Reorder.html.twig' 'prod/Baskets/Reorder.html.twig'
, array('basket' => $basket) , array('basket' => $basket)
) )
); );
})->assert('basket_id', '\d+'); })->assert('basket_id', '\d+');
/** /**
* Toggle the status of a Basket * Toggle the status of a Basket
@@ -286,114 +286,114 @@ class Basket implements ControllerProviderInterface
* @returns JSON / HTML * @returns JSON / HTML
*/ */
$controllers->post('/{basket_id}/archive/', function(Application $app, Request $request, $basket_id) $controllers->post('/{basket_id}/archive/', function(Application $app, Request $request, $basket_id)
{ {
$em = $app['Core']->getEntityManager(); $em = $app['Core']->getEntityManager();
$basket = $em->getRepository('\Entities\Basket') $basket = $em->getRepository('\Entities\Basket')
->findUserBasket($basket_id, $app['Core']->getAuthenticatedUser()); ->findUserBasket($basket_id, $app['Core']->getAuthenticatedUser());
$archive_status = !!$request->get('archive'); $archive_status = !!$request->get('archive');
$basket->setArchived($archive_status); $basket->setArchived($archive_status);
$em->merge($basket); $em->merge($basket);
$em->flush(); $em->flush();
if ($archive_status) if ($archive_status)
{ {
$message = _('Basket has been archived'); $message = _('Basket has been archived');
} }
else else
{ {
$message = _('Basket has been unarchived'); $message = _('Basket has been unarchived');
} }
$data = array( $data = array(
'success' => true 'success' => true
, 'archive' => $archive_status , 'archive' => $archive_status
, 'message' => $message , 'message' => $message
); );
if ($request->getRequestFormat() == 'json') if ($request->getRequestFormat() == 'json')
{ {
$datas = $app['Core']['Serializer']->serialize($data, 'json'); $datas = $app['Core']['Serializer']->serialize($data, 'json');
return new Response($datas, 200, array('Content-type' => 'application/json')); return new Response($datas, 200, array('Content-type' => 'application/json'));
} }
else else
{ {
return new RedirectResponse('/'); return new RedirectResponse('/');
} }
})->assert('basket_id', '\d+'); })->assert('basket_id', '\d+');
/** /**
* Add a BasketElement to a basket * Add a BasketElement to a basket
*/ */
$controllers->post( $controllers->post(
'/{basket_id}/addElements/' '/{basket_id}/addElements/'
, function(Application $app, Request $request, $basket_id) , function(Application $app, Request $request, $basket_id)
{ {
$em = $app['Core']->getEntityManager(); $em = $app['Core']->getEntityManager();
$basket = $em->getRepository('\Entities\Basket') $basket = $em->getRepository('\Entities\Basket')
->findUserBasket($basket_id, $app['Core']->getAuthenticatedUser()); ->findUserBasket($basket_id, $app['Core']->getAuthenticatedUser());
$user = $app['Core']->getAuthenticatedUser(); $user = $app['Core']->getAuthenticatedUser();
/* @var $user \User_Adapter */ /* @var $user \User_Adapter */
$n = 0; $n = 0;
foreach (explode(';', $request->get('lst')) as $sbas_rec) foreach (explode(';', $request->get('lst')) as $sbas_rec)
{ {
$sbas_rec = explode('_', $sbas_rec); $sbas_rec = explode('_', $sbas_rec);
if (count($sbas_rec) !== 2) if (count($sbas_rec) !== 2)
continue; continue;
$record = new \record_adapter($sbas_rec[0], $sbas_rec[1]); $record = new \record_adapter($sbas_rec[0], $sbas_rec[1]);
if (!$user->ACL()->has_access_to_base($record->get_base_id()) if (!$user->ACL()->has_access_to_base($record->get_base_id())
&& !$user->ACL()->has_hd_grant($record) && !$user->ACL()->has_hd_grant($record)
&& !$user->ACL()->has_preview_grant($record)) && !$user->ACL()->has_preview_grant($record))
{ {
continue; continue;
} }
if ($basket->hasRecord($record)) if ($basket->hasRecord($record))
continue; continue;
$basket_element = new \Entities\BasketElement(); $basket_element = new \Entities\BasketElement();
$basket_element->setRecord($record); $basket_element->setRecord($record);
$basket_element->setBasket($basket); $basket_element->setBasket($basket);
$em->persist($basket_element); $em->persist($basket_element);
$basket->addBasketElement($basket_element); $basket->addBasketElement($basket_element);
$n++; $n++;
} }
$em->merge($basket); $em->merge($basket);
$em->flush(); $em->flush();
$data = array( $data = array(
'success' => true 'success' => true
, 'message' => sprintf(_('%d records added'), $n) , 'message' => sprintf(_('%d records added'), $n)
); );
if ($request->getRequestFormat() == 'json') if ($request->getRequestFormat() == 'json')
{ {
$datas = $app['Core']['Serializer']->serialize($data, 'json'); $datas = $app['Core']['Serializer']->serialize($data, 'json');
return new Response($datas, 200, array('Content-type' => 'application/json')); return new Response($datas, 200, array('Content-type' => 'application/json'));
} }
else else
{ {
return new RedirectResponse('/'); return new RedirectResponse('/');
} }
})->assert('basket_id', '\d+'); })->assert('basket_id', '\d+');
@@ -406,96 +406,98 @@ class Basket implements ControllerProviderInterface
* *
*/ */
$controllers->post( $controllers->post(
'/{basket_id}/stealElements/' '/{basket_id}/stealElements/'
, function(Application $app, Request $request, $basket_id) , function(Application $app, Request $request, $basket_id)
{ {
$em = $app['Core']->getEntityManager(); $em = $app['Core']->getEntityManager();
/* @var $em \Doctrine\ORM\EntityManager */ /* @var $em \Doctrine\ORM\EntityManager */
$basket = $em->getRepository('\Entities\Basket') $basket = $em->getRepository('\Entities\Basket')
->findUserBasket($basket_id, $app['Core']->getAuthenticatedUser()); ->findUserBasket($basket_id, $app['Core']->getAuthenticatedUser());
$user = $app['Core']->getAuthenticatedUser(); $user = $app['Core']->getAuthenticatedUser();
/* @var $user \User_Adapter */ /* @var $user \User_Adapter */
$n = 0; $n = 0;
foreach ($request->get('elements') as $bask_element_id) foreach ($request->get('elements') as $bask_element_id)
{ {
$basket_element = $em->getRepository('\Entities\BasketElement') $basket_element = $em->getRepository('\Entities\BasketElement')
->findUserElement($bask_element_id, $user); ->findUserElement($bask_element_id, $user);
if (!$basket_element) if (!$basket_element)
{ {
continue; continue;
} }
$basket_element->setBasket($basket); $basket_element->setBasket($basket);
$em->merge($basket_element); $em->merge($basket_element);
$n++; $n++;
} }
$em->merge($basket); $em->merge($basket);
$em->flush(); $em->flush();
$data = array( $data = array(
'success' => true 'success' => true
, 'message' => sprintf(_('%d records moved'), $n) , 'message' => sprintf(_('%d records moved'), $n)
); );
if ($request->getRequestFormat() == 'json') if ($request->getRequestFormat() == 'json')
{ {
$datas = $app['Core']['Serializer']->serialize($data, 'json'); $datas = $app['Core']['Serializer']->serialize($data, 'json');
return new Response($datas, 200, array('Content-type' => 'application/json')); return new Response($datas, 200, array('Content-type' => 'application/json'));
} }
else else
{ {
return new RedirectResponse('/'); return new RedirectResponse('/');
} }
})->assert('basket_id', '\d+'); })->assert('basket_id', '\d+');
/** /**
* Get basket creation form * Get basket creation form
*/ */
$controllers->get('/create/', function(Application $app) $controllers->get('/create/', function(Application $app)
{ {
/* @var $twig \Twig_Environment */ /* @var $twig \Twig_Environment */
$twig = $app['Core']->getTwig(); $twig = $app['Core']->getTwig();
return new Response($twig->render('prod/Baskets/Create.html.twig', array())); return new Response($twig->render('prod/Baskets/Create.html.twig', array()));
}); });
/** /**
* Get a basket * Get a basket
*/ */
$controllers->get('/{basket_id}/', function(Application $app, Request $request, $basket_id) $controllers->get('/{basket_id}/', function(Application $app, Request $request, $basket_id)
{ {
$em = $app['Core']->getEntityManager(); $em = $app['Core']->getEntityManager();
$basket = $em->getRepository('\Entities\Basket') $basket = $em->getRepository('\Entities\Basket')
->findUserBasket($basket_id, $app['Core']->getAuthenticatedUser()); ->findUserBasket($basket_id, $app['Core']->getAuthenticatedUser());
$basket->setIsRead(true); if ($basket->getIsRead() === false)
{
$basket = $em->merge($basket);
$basket->setIsRead(true);
$em->flush();
}
$em->merge($basket); /* @var $twig \Twig_Environment */
$em->flush(); $twig = $app['Core']->getTwig();
/* @var $twig \Twig_Environment */ $params = array(
$twig = $app['Core']->getTwig(); 'basket' => $basket,
'ordre' => $request->get('ordre')
);
$params = array( $html = $twig->render('prod/WorkZone/Basket.html.twig', $params);
'basket' => $basket,
'ordre' => $request->get('ordre') return new Response($html);
); })->assert('basket_id', '\d+');
$html = $twig->render('prod/WorkZone/Basket.html.twig', $params);
return new Response($html);
})->assert('basket_id', '\d+');
return $controllers; return $controllers;
} }

5
lib/Alchemy/Phrasea/Core/Service/Cache/MemcacheCache.php
View File

@@ -65,15 +65,14 @@ class MemcacheCache extends ServiceAbstract implements ServiceInterface
$stats = @$memcache->getExtendedStats(); $stats = @$memcache->getExtendedStats();
if ($stats[$key]) if (isset($stats[$key]) && @$memcache->connect($this->host, $this->port))
{ {
$memcache->connect($this->host, $this->port);
$service = new CacheService\MemcacheCache(); $service = new CacheService\MemcacheCache();
$service->setMemcache($memcache); $service->setMemcache($memcache);
} }
else else
{ {
$service = new CacheService\ArrayCache(); throw new \Exception(sprintf("Memcache instance with host '%s' and port '%s' is not reachable", $this->host, $this->port));
} }
$registry = $this->getRegistry(); $registry = $this->getRegistry();

2
lib/Alchemy/Phrasea/Core/Service/Cache/RedisCache.php
View File

@@ -72,7 +72,7 @@ class RedisCache extends ServiceAbstract implements ServiceInterface
} }
else else
{ {
$service = new CacheService\ArrayCache(); throw new \Exception(sprintf("Redis instance with host '%s' and port '%s' is not reachable", $this->host, $this->port));
} }
$registry = $this->getRegistry(); $registry = $this->getRegistry();

48
lib/Alchemy/Phrasea/Core/Service/Orm/Doctrine.php
View File

@@ -338,14 +338,17 @@ class Doctrine extends ServiceAbstract implements ServiceInterface
*/ */
private function getCache($cacheDoctrine, $serviceName = null) private function getCache($cacheDoctrine, $serviceName = null)
{ {
$defaultServiceName = 'default_cache';
$defaultConfiguration = new ParameterBag(array(
'type' => self::ARRAYCACHE
, 'options' => array()
)
);
if (null === $serviceName) if (null === $serviceName)
{ {
$serviceName = 'default_cache'; $serviceName = $defaultServiceName;
$configuration = new ParameterBag(array( $configuration = $defaultConfiguration;
'type' => self::ARRAYCACHE
, 'options' => array()
)
);
} }
else else
{ {
@@ -382,17 +385,34 @@ class Doctrine extends ServiceAbstract implements ServiceInterface
$registry = $this->getDependency("registry"); $registry = $this->getDependency("registry");
$serviceBuilder = new Core\ServiceBuilder\Cache( try
$serviceName, {
$configuration, $serviceBuilder = new Core\ServiceBuilder\Cache(
array("registry" => $registry) $serviceName,
); $configuration,
array("registry" => $registry)
);
$service = $serviceBuilder->buildService(); $service = $serviceBuilder->buildService();
$cacheService = $service->getService();
}
catch (\Exception $e)
{
$serviceBuilder = new Core\ServiceBuilder\Cache(
$defaultServiceName,
$defaultConfiguration,
array("registry" => $registry)
);
$service = $serviceBuilder->buildService();
$cacheService = $service->getService();
}
$this->cacheServices[$cacheDoctrine] = $service; $this->cacheServices[$cacheDoctrine] = $service;
return $service->getService(); return $cacheService;
} }
private function getLog($serviceName) private function getLog($serviceName)

2
lib/Alchemy/Phrasea/Core/Service/TemplateEngine/Twig.php
View File

@@ -34,7 +34,7 @@ class Twig extends ServiceAbstract implements ServiceInterface
try try
{ {
if(!$this->options['debug']) if(!isset($this->options['debug']) || !$this->options['debug'])
{ {
$this->options['cache'] = realpath( __DIR__ . '/../../../../../../tmp/cache_twig/'); $this->options['cache'] = realpath( __DIR__ . '/../../../../../../tmp/cache_twig/');
} }

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

@@ -155,8 +155,6 @@ class BasketElementRepository extends EntityRepository
throw new \Exception_Forbidden(_('You have not access to this basket element')); throw new \Exception_Forbidden(_('You have not access to this basket element'));
} }
$element = $this->_em->merge($element);
return $element; return $element;
} }

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

@@ -56,7 +56,8 @@ 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 ? "nosort" : $sort) . "_" . $user->get_id(). Entities\Basket::CACHE_SUFFIX; $idCache = "_active_by_user_" . ($sort === null ? "" : $sort ) . "_" . $user->get_id(). Entities\Basket::CACHE_SUFFIX;
$query->useResultCache(true, 1800, $idCache); $query->useResultCache(true, 1800, $idCache);
return $query->getResult(); return $query->getResult();
@@ -80,7 +81,9 @@ 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 = "_unread_active_by_user_" . $user->get_id() . Entities\Basket::CACHE_SUFFIX;
$idCache = "findUnreadActiveByUser" . $user->get_id() . Entities\Basket::CACHE_SUFFIX;
$query->useResultCache(true, 1800, $idCache); $query->useResultCache(true, 1800, $idCache);
return $query->getResult(); return $query->getResult();
@@ -100,9 +103,9 @@ class BasketRepository extends EntityRepository
JOIN b.elements e JOIN b.elements e
JOIN b.validation s JOIN b.validation s
JOIN s.participants p JOIN s.participants p
WHERE b.usr_id != ?1 AND p.usr_id = ?2'; WHERE b.usr_id != ?1 AND p.usr_id = ?2
//@todo implements expires session AND s.expires > CURRENT_TIMESTAMP()'; AND (s.expires IS NULL OR s.expires > CURRENT_TIMESTAMP()) ';
if ($sort == 'date') if ($sort == 'date')
{ {
$dql .= ' ORDER BY b.created DESC'; $dql .= ' ORDER BY b.created DESC';
@@ -156,8 +159,6 @@ class BasketRepository extends EntityRepository
throw new \Exception_Forbidden(_('You have not access to this basket')); throw new \Exception_Forbidden(_('You have not access to this basket'));
} }
$basket = $this->_em->merge($basket);
return $basket; return $basket;
} }
@@ -254,7 +255,9 @@ 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; $idCache = "_" . $type . "_workzone_basket_" . $user->get_id() . Entities\Basket::CACHE_SUFFIX;
$paginateQuery->useResultCache(true, 1800, $idCache); $paginateQuery->useResultCache(true, 1800, $idCache);
$result = $paginateQuery->getResult(); $result = $paginateQuery->getResult();