X-Git-Url: https://git.rapsys.eu/airbundle/blobdiff_plain/3bb9a2dd31162409770dce4457397c6ea5b8dad1..4832338dbb6dacb9b974024634cb76c13f145404:/Repository/SessionRepository.php?ds=inline

diff --git a/Repository/SessionRepository.php b/Repository/SessionRepository.php
index cf79a18..7c6f574 100644
--- a/Repository/SessionRepository.php
+++ b/Repository/SessionRepository.php
@@ -1,33 +1,29 @@
-<?php
+<?php declare(strict_types=1);
+
+/*
+ * This file is part of the Rapsys AirBundle package.
+ *
+ * (c) Raphaël Gertz <symfony@rapsys.eu>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
 
 namespace Rapsys\AirBundle\Repository;
 
-use Symfony\Component\Translation\TranslatorInterface;
-use Doctrine\DBAL\Types\Type;
+use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\Query\ResultSetMapping;
-use Doctrine\ORM\Query;
+use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 
 /**
  * SessionRepository
  */
-class SessionRepository extends \Doctrine\ORM\EntityRepository {
-	///Set accuweather max number of daily pages
-	const ACCUWEATHER_DAILY = 12;
-
-	///Set accuweather max number of hourly pages
-	const ACCUWEATHER_HOURLY = 3;
-
-	///Set guest delay
-	const GUEST_DELAY = 2;
-
-	///Set regular delay
-	const REGULAR_DELAY = 3;
-
-	///Set senior
-	const SENIOR_DELAY = 4;
-
+class SessionRepository extends EntityRepository {
 	///Set glyphs
 	//TODO: document utf-8 codes ?
+	//TODO: use unknown == ? symbol by default ???
+	//💃<= dancer #0001f483
+	//💃<= tanguera #0001f483
 	const GLYPHS = [
 		//Slots
 		'Morning' => '🌅', #0001f305
@@ -40,9 +36,918 @@ class SessionRepository extends \Doctrine\ORM\EntityRepository {
 		'Cloudy' => '☁', #2601
 		'Winty' => '❄️', #2744
 		'Rainy' => '🌂', #0001f302
-		'Stormy' => '☔' #2614
+		'Stormy' => '☔', #2614
+		//Rate
+		'Euro' => '€', #20ac
+		'Free' => '🍺', #0001f37a
+		'Hat' => '🎩' #0001f3a9
 	];
 
+	/**
+	 * Find session as array by id
+	 *
+	 * @param int $id The session id
+	 * @param string $locale The locale
+	 * @return array The session data
+	 */
+	public function findOneByIdAsArray(int $id, string $locale): ?array {
+		//Set the request
+		$req =<<<SQL
+SELECT
+	s.id,
+	s.date,
+	s.begin,
+	ADDDATE(ADDTIME(s.date, s.begin), INTERVAL IF(s.slot_id = :afterid, 1, 0) DAY) AS start,
+	s.length,
+	ADDDATE(ADDTIME(ADDTIME(s.date, s.begin), s.length), INTERVAL IF(s.slot_id = :afterid, 1, 0) DAY) AS stop,
+	s.rainfall,
+	s.rainrisk,
+	s.realfeel,
+	s.realfeelmin,
+	s.realfeelmax,
+	s.temperature,
+	s.temperaturemin,
+	s.temperaturemax,
+	s.locked,
+	s.created,
+	s.updated,
+	s.location_id AS l_id,
+	l.title AS l_title,
+	l.description AS l_description,
+	l.address AS l_address,
+	l.zipcode AS l_zipcode,
+	l.city AS l_city,
+	l.latitude AS l_latitude,
+	l.longitude AS l_longitude,
+	l.indoor AS l_indoor,
+	l.updated AS l_updated,
+	s.slot_id AS t_id,
+	t.title AS t_title,
+	s.application_id AS a_id,
+	a.canceled AS a_canceled,
+	a.dance_id AS ad_id,
+	ad.name AS ad_name,
+	ad.type AS ad_type,
+	a.user_id AS au_id,
+	au.pseudonym AS au_pseudonym,
+	p.id AS p_id,
+	p.description AS p_description,
+	p.class AS p_class,
+	p.contact AS p_contact,
+	p.donate AS p_donate,
+	p.link AS p_link,
+	p.profile AS p_profile,
+	p.rate AS p_rate,
+	p.hat AS p_hat,
+	GREATEST(COALESCE(s.updated, 0), COALESCE(l.updated, 0), COALESCE(t.updated, 0), COALESCE(p.updated, 0), COALESCE(MAX(sa.updated), 0), COALESCE(MAX(sau.updated), 0), COALESCE(MAX(sad.updated), 0)) AS modified,
+	GROUP_CONCAT(sa.id ORDER BY sa.user_id SEPARATOR "\\n") AS sa_id,
+	GROUP_CONCAT(IFNULL(sa.score, 'NULL') ORDER BY sa.user_id SEPARATOR "\\n") AS sa_score,
+	GROUP_CONCAT(sa.created ORDER BY sa.user_id SEPARATOR "\\n") AS sa_created,
+	GROUP_CONCAT(sa.updated ORDER BY sa.user_id SEPARATOR "\\n") AS sa_updated,
+	GROUP_CONCAT(IFNULL(sa.canceled, 'NULL') ORDER BY sa.user_id SEPARATOR "\\n") AS sa_canceled,
+	GROUP_CONCAT(sa.user_id ORDER BY sa.user_id SEPARATOR "\\n") AS sau_id,
+	GROUP_CONCAT(sau.pseudonym ORDER BY sa.user_id SEPARATOR "\\n") AS sau_pseudonym
+FROM RapsysAirBundle:Session AS s
+JOIN RapsysAirBundle:Location AS l ON (l.id = s.location_id)
+JOIN RapsysAirBundle:Slot AS t ON (t.id = s.slot_id)
+LEFT JOIN RapsysAirBundle:Application AS a ON (a.id = s.application_id)
+LEFT JOIN RapsysAirBundle:Dance AS ad ON (ad.id = a.dance_id)
+LEFT JOIN RapsysAirBundle:User AS au ON (au.id = a.user_id)
+LEFT JOIN RapsysAirBundle:Snippet AS p ON (p.location_id = s.location_id AND p.user_id = a.user_id AND p.locale = :locale)
+LEFT JOIN RapsysAirBundle:Application AS sa ON (sa.session_id = s.id)
+LEFT JOIN RapsysAirBundle:User AS sau ON (sau.id = sa.user_id)
+LEFT JOIN RapsysAirBundle:Dance AS sad ON (sad.id = sa.dance_id)
+WHERE s.id = :id
+GROUP BY s.id
+ORDER BY NULL
+SQL;
+
+		//Replace bundle entity name by table name
+		$req = str_replace($this->tableKeys, $this->tableValues, $req);
+
+		//Get result set mapping instance
+		//XXX: DEBUG: see ../blog.orig/src/Rapsys/BlogBundle/Repository/ArticleRepository.php
+		$rsm = new ResultSetMapping();
+
+		//Declare all fields
+		//XXX: see vendor/doctrine/dbal/lib/Doctrine/DBAL/Types/Types.php
+		$rsm->addScalarResult('id', 'id', 'integer')
+			->addScalarResult('date', 'date', 'date')
+			->addScalarResult('begin', 'begin', 'time')
+			->addScalarResult('start', 'start', 'datetime')
+			->addScalarResult('length', 'length', 'time')
+			->addScalarResult('stop', 'stop', 'datetime')
+			->addScalarResult('rainfall', 'rainfall', 'float')
+			->addScalarResult('rainrisk', 'rainrisk', 'float')
+			->addScalarResult('realfeel', 'realfeel', 'float')
+			->addScalarResult('realfeelmin', 'realfeelmin', 'float')
+			->addScalarResult('realfeelmax', 'realfeelmax', 'float')
+			->addScalarResult('temperature', 'temperature', 'float')
+			->addScalarResult('temperaturemin', 'temperaturemin', 'float')
+			->addScalarResult('temperaturemax', 'temperaturemax', 'float')
+			->addScalarResult('locked', 'locked', 'datetime')
+			->addScalarResult('created', 'created', 'datetime')
+			->addScalarResult('updated', 'updated', 'datetime')
+			->addScalarResult('l_id', 'l_id', 'integer')
+			->addScalarResult('l_title', 'l_title', 'string')
+			->addScalarResult('l_description', 'l_description', 'string')
+			->addScalarResult('l_address', 'l_address', 'string')
+			->addScalarResult('l_zipcode', 'l_zipcode', 'string')
+			->addScalarResult('l_city', 'l_city', 'string')
+			->addScalarResult('l_latitude', 'l_latitude', 'float')
+			->addScalarResult('l_longitude', 'l_longitude', 'float')
+			->addScalarResult('l_indoor', 'l_indoor', 'boolean')
+			->addScalarResult('l_updated', 'l_updated', 'datetime')
+			->addScalarResult('t_id', 't_id', 'integer')
+			->addScalarResult('t_title', 't_title', 'string')
+			->addScalarResult('a_id', 'a_id', 'integer')
+			->addScalarResult('a_canceled', 'a_canceled', 'datetime')
+			->addScalarResult('ad_id', 'ad_id', 'integer')
+			->addScalarResult('ad_name', 'ad_name', 'string')
+			->addScalarResult('ad_type', 'ad_type', 'string')
+			->addScalarResult('au_id', 'au_id', 'integer')
+			->addScalarResult('au_pseudonym', 'au_pseudonym', 'string')
+			->addScalarResult('p_id', 'p_id', 'integer')
+			->addScalarResult('p_description', 'p_description', 'text')
+			->addScalarResult('p_class', 'p_class', 'text')
+			->addScalarResult('p_contact', 'p_contact', 'text')
+			->addScalarResult('p_donate', 'p_donate', 'text')
+			->addScalarResult('p_link', 'p_link', 'text')
+			->addScalarResult('p_profile', 'p_profile', 'text')
+			->addScalarResult('p_rate', 'p_rate', 'integer')
+			->addScalarResult('p_hat', 'p_hat', 'boolean')
+			->addScalarResult('modified', 'modified', 'datetime')
+			//XXX: is a string because of \n separator
+			->addScalarResult('sa_id', 'sa_id', 'string')
+			//XXX: is a string because of \n separator
+			->addScalarResult('sa_score', 'sa_score', 'string')
+			//XXX: is a string because of \n separator
+			->addScalarResult('sa_created', 'sa_created', 'string')
+			//XXX: is a string because of \n separator
+			->addScalarResult('sa_updated', 'sa_updated', 'string')
+			//XXX: is a string because of \n separator
+			->addScalarResult('sa_canceled', 'sa_canceled', 'string')
+			//XXX: is a string because of \n separator
+			->addScalarResult('sau_id', 'sau_id', 'string')
+			//XXX: is a string because of \n separator
+			->addScalarResult('sau_pseudonym', 'sau_pseudonym', 'string')
+			->addIndexByScalar('id');
+
+		//Set result
+		$result = $this->_em
+			->createNativeQuery($req, $rsm)
+			->setParameter('id', $id)
+			->setParameter('locale', $locale)
+			->getOneOrNullResult();
+
+		//Without result
+		if ($result === null) {
+			//Return result
+			return $result;
+		}
+
+		//Set route
+		$route = 'rapsys_air_session_view';
+
+		//Set route params
+		$routeParams = ['id' => $id, 'location' => $this->slugger->slug($this->translator->trans($result['l_title']))];
+
+		//Set session
+		$session = [
+			'id' => $id,
+			'date' => $result['date'],
+			'begin' => $result['begin'],
+			'start' => $result['start'],
+			'length' => $result['length'],
+			'stop' => $result['stop'],
+			'rainfall' => $result['rainfall'] !== null ? $result['rainfall'].' mm' : $result['rainfall'],
+			'rainrisk' => $result['rainrisk'] !== null ? ($result['rainrisk']*100).' %' : $result['rainrisk'],
+			'realfeel' => $result['realfeel'] !== null ? $result['realfeel'].' °C' : $result['realfeel'],
+			'realfeelmin' => $result['realfeelmin'] !== null ? $result['realfeelmin'].' °C' : $result['realfeelmin'],
+			'realfeelmax' => $result['realfeelmax'] !== null ? $result['realfeelmax'].' °C' : $result['realfeelmax'],
+			'temperature' => $result['temperature'] !== null ? $result['temperature'].' °C' : $result['temperature'],
+			'temperaturemin' => $result['temperaturemin'] !== null ? $result['temperaturemin'].' °C' : $result['temperaturemin'],
+			'temperaturemax' => $result['temperaturemax'] !== null ? $result['temperaturemax'].' °C' : $result['temperaturemax'],
+			'locked' => $result['locked'],
+			'created' => $result['created'],
+			'updated' => $result['updated'],
+			'title' => $this->translator->trans('Session %id%', ['%id%' => $id]),
+			'modified' => $result['modified'],
+			'application' => null,
+			'location' => [
+				'id' => $result['l_id'],
+				'at' => $this->translator->trans('at '.$result['l_title']),
+				'title' => $locationTitle = $this->translator->trans($result['l_title']),
+				'description' => $this->translator->trans($result['l_description']??'None'),
+				'address' => $result['l_address'],
+				'zipcode' => $result['l_zipcode'],
+				'city' => $result['l_city'],
+				'in' => $this->translator->trans('in '.$result['l_city']),
+				'map' => $this->translator->trans($result['l_title'].' access map'),
+				'multimap' => $this->translator->trans($result['l_title'].' sector map'),
+				'latitude' => $result['l_latitude'],
+				'longitude' => $result['l_longitude'],
+				'indoor' => $result['l_indoor'],
+				'slug' => $routeParams['location'],
+				'link' => $this->router->generate('rapsys_air_location_view', ['id' => $result['l_id'], 'location' => $routeParams['location']])
+			],
+			'slot' => [
+				'id' => $result['t_id'],
+				'the' => $this->translator->trans('the '.lcfirst($result['t_title'])),
+				'title' => $this->translator->trans($result['t_title'])
+			],
+			'snippet' => null,
+			'applications' => null
+		];
+
+		//With application
+		if (!empty($result['a_id'])) {
+			$session['application'] = [
+				'dance' => [
+					'id' => $result['ad_id'],
+					'title' => $this->translator->trans($result['ad_name'].' '.lcfirst($result['ad_type'])),
+					'name' => $this->translator->trans($result['ad_name']),
+					'type' => $this->translator->trans($result['ad_type']),
+					'slug' => $routeParams['dance'] = $this->slugger->slug($this->translator->trans($result['ad_name'].' '.lcfirst($result['ad_type']))),
+					'link' => $this->router->generate('rapsys_air_dance_view', ['id' => $result['ad_id'], 'name' => $this->slugger->slug($this->translator->trans($result['ad_name'])), 'type' => $this->slugger->slug($this->translator->trans($result['ad_type']))])
+				],
+				'user' => [
+					'id' => $result['au_id'],
+					'by' => $this->translator->trans('by %pseudonym%', [ '%pseudonym%' => $result['au_pseudonym'] ]),
+					'title' => $result['au_pseudonym'],
+					'slug' => $routeParams['user'] =  $this->slugger->slug($result['au_pseudonym']),
+					'link' => $result['au_id'] == 1 && $routeParams['user'] == 'milonga-raphael' ? $this->router->generate('rapsys_air_user_milongaraphael') : $this->router->generate('rapsys_air_user_view', ['id' => $result['au_id'], 'user' => $routeParams['user']]),
+					'contact' => $this->router->generate('rapsys_air_contact', ['id' => $result['au_id'], 'user' => $routeParams['user']])
+				],
+				'id' => $result['a_id'],
+				'canceled' => $result['a_canceled']
+			];
+		}
+
+		//With snippet
+		if (!empty($result['p_id'])) {
+			$session['snippet'] = [
+				'id' => $result['p_id'],
+				'description' => $result['p_description'],
+				'class' => $result['p_class'],
+				'contact' => $result['p_contact'],
+				'donate' => $result['p_donate'],
+				'link' => $result['p_link'],
+				'profile' => $result['p_profile'],
+				'rate' => $result['p_rate'],
+				'hat' => $result['p_hat']
+			];
+		}
+
+		//With applications
+		if (!empty($result['sa_id'])) {
+			//Extract applications id
+			$result['sa_id'] = explode("\n", $result['sa_id']);
+			//Extract applications score
+			//XXX: score may be null before grant or for bad behaviour, replace NULL with 'NULL' to avoid silent drop in mysql
+			$result['sa_score'] = array_map(function($v){return $v==='NULL'?null:$v;}, explode("\n", $result['sa_score']));
+			//Extract applications created
+			$result['sa_created'] = array_map(function($v){return new \DateTime($v);}, explode("\n", $result['sa_created']));
+			//Extract applications updated
+			$result['sa_updated'] = array_map(function($v){return new \DateTime($v);}, explode("\n", $result['sa_updated']));
+			//Extract applications canceled
+			//XXX: canceled is null before cancelation, replace NULL with 'NULL' to avoid silent drop in mysql
+			$result['sa_canceled'] = array_map(function($v){return $v==='NULL'?null:new \DateTime($v);}, explode("\n", $result['sa_canceled']));
+
+			//Extract applications user id
+			$result['sau_id'] = explode("\n", $result['sau_id']);
+			//Extract applications user pseudonym
+			$result['sau_pseudonym'] = explode("\n", $result['sau_pseudonym']);
+
+			//Init applications
+			$session['applications'] = [];
+
+			//Iterate on each applications id
+			foreach($result['sa_id'] as $i => $sa_id) {
+				$session['applications'][$sa_id] = [
+					'user' => null,
+					'score' => $result['sa_score'][$i],
+					'created' => $result['sa_created'][$i],
+					'updated' => $result['sa_updated'][$i],
+					'canceled' => $result['sa_canceled'][$i]
+				];
+				if (!empty($result['sau_id'][$i])) {
+					$session['applications'][$sa_id]['user'] = [
+						'id' => $result['sau_id'][$i],
+						'title' => $result['sau_pseudonym'][$i],
+						'slug' => $this->slugger->slug($result['sau_pseudonym'][$i])
+					];
+				}
+			}
+		}
+
+		//Set link
+		$session['link'] = $this->router->generate($route, $routeParams);
+
+		//Set canonical
+		$session['canonical'] = $this->router->generate($route, $routeParams, UrlGeneratorInterface::ABSOLUTE_URL);
+
+		//Set alternates
+		$session['alternates'] = [];
+
+		//Iterate on each locales
+		foreach($this->translator->getFallbackLocales() as $fallback) {
+			//Set titles
+			$titles = [];
+
+			//Set route params location
+			$routeParams['location'] = $this->slugger->slug($this->translator->trans($result['l_title'], [], null, $fallback));
+
+			//With route params dance
+			if (!empty($routeParams['dance'])) {
+			       $routeParams['dance'] = $this->slugger->slug($this->translator->trans($result['ad_name'].' '.lcfirst($result['ad_type']), [], null, $fallback));
+			}
+
+			//With route params user
+			if (!empty($routeParams['user'])) {
+			       $routeParams['user'] = $this->slugger->slug($result['au_pseudonym']);
+			}
+
+			//With current locale
+			if ($fallback === $locale) {
+				//Set current locale title
+				$titles[$locale] = $this->translator->trans($this->languages[$locale]);
+			//Without current locale
+			} else {
+				//Iterate on other locales
+				foreach(array_diff($this->translator->getFallbackLocales(), [$fallback]) as $other) {
+					//Set other locale title
+					$titles[$other] = $this->translator->trans($this->languages[$fallback], [], null, $other);
+				}
+
+				//Add alternates locale
+				$session['alternates'][str_replace('_', '-', $fallback)] = [
+					'absolute' => $this->router->generate($route, ['_locale' => $fallback]+$routeParams, UrlGeneratorInterface::ABSOLUTE_URL),
+					'relative' => $this->router->generate($route, ['_locale' => $fallback]+$routeParams),
+					'title' => implode('/', $titles),
+					'translated' => $this->translator->trans($this->languages[$fallback], [], null, $fallback)
+				];
+			}
+
+			//Add alternates shorter locale
+			if (empty($parameters['alternates'][$shortFallback = substr($fallback, 0, 2)])) {
+				//Set locale locales context
+				$session['alternates'][$shortFallback] = [
+					'absolute' => $this->router->generate($route, ['_locale' => $fallback]+$routeParams, UrlGeneratorInterface::ABSOLUTE_URL),
+					'relative' => $this->router->generate($route, ['_locale' => $fallback]+$routeParams),
+					'title' => implode('/', $titles),
+					'translated' => $this->translator->trans($this->languages[$fallback], [], null, $fallback)
+				];
+			}
+		}
+
+		//Return session
+		return $session;
+	}
+
+	/**
+	 * Find sessions as calendar array by date period
+	 *
+	 * @param DatePeriod $period The date period
+	 * @param string $locale The locale
+	 * @param ?bool $granted The session is granted
+	 * @param ?float $latitude The latitude
+	 * @param ?float $longitude The longitude
+	 * @param ?int $userId The user id
+	 * @return array The session data
+	 */
+
+	//TODO: calculer un titre de la page intelligent ?
+	//(utiliser la liste des villes par exemple ???)
+
+	//TODO: finir cette merde pour toutes les pages de listing !!!
+
+	//TODO: compute a max updated ???
+
+	//TODO: à priori si l'userId est fourni, qu'on veut pas juste les granted et que l'userId correspond pas à l'utilisateur à qui ça a été attribué et que la personne a demandé la session, on a envie de lui afficher le disputed ???
+	//(ce serait même plus un refused, voir le cas où c'est pas encore attribué, comment ça se passe ???)
+
+	//TODO: la gestion des sessions pas granted et contestées est à faire au niveau du contrôleur userView si l'user est connecté
+	//On peut utiliser le système des applications, l'id user dans application et l'id utilisateur connecté pour faire la détection
+	//Ça se résume à coller un $class[] = 'disputed' ou 'lost' ? sur la session ???
+
+	#TODO: mettre en grisé les sessions pas granted
+	#TODO: mettre en highlight (violet) les sessions de la location ou de l'user si fourni
+		//TODO: penser au cas où on est sur un utilisateur, on veut mettre
+						//TODO: faire la détection des séances perdues par l'utilisateur ???
+						//XXX: à priori ça va se jouer au niveau du contrôleur où on va setter ça
+							/*} elseif (!empty($userId) && $session['au_id'] != $userId) {
+							$class[] = 'disputed';*/
+
+
+	public function findAllByPeriodAsArray(\DatePeriod $period, string $locale, ?bool $granted = null, ?float $latitude = null, ?float $longitude = null, ?int $userId = null) {
+		//Init granted sql
+		$grantSql = '';
+
+		//When granted is set
+		if (empty($granted)) {
+			//Set application and user as optional
+			$grantSql = 'LEFT ';
+		}
+
+		//Init location sql
+		$locationSql = '';
+
+		//When latitude and longitude
+		if ($latitude !== null && $longitude !== null) {
+			//Set the request
+			//XXX: get every location between 0 and 15 km of latitude and longitude
+			$req = <<<SQL
+SELECT l.id
+FROM RapsysAirBundle:Location AS l
+WHERE ACOS(SIN(RADIANS(:latitude))*SIN(RADIANS(l.latitude))+COS(RADIANS(:latitude))*COS(RADIANS(l.latitude))*COS(RADIANS(:longitude - l.longitude)))*40030.17/2/PI() BETWEEN 0 AND 15
+SQL;
+
+			//Replace bundle entity name by table name
+			$req = str_replace($this->tableKeys, $this->tableValues, $req);
+
+			//Get result set mapping instance
+			//XXX: DEBUG: see ../blog.orig/src/Rapsys/BlogBundle/Repository/ArticleRepository.php
+			$rsm = new ResultSetMapping();
+
+			//Declare all fields
+			//XXX: see vendor/doctrine/dbal/lib/Doctrine/DBAL/Types/Types.php
+			//addScalarResult($sqlColName, $resColName, $type = 'string');
+			$rsm->addScalarResult('id', 'id', 'integer')
+			       ->addIndexByScalar('id');
+
+			//Set location ids
+			//XXX: check that latitude and longitude have not be swapped !!!
+			//XXX: latitude ~= 48.x longitude ~= 2.x
+			$locationIds = array_keys(
+				$this->_em
+					->createNativeQuery($req, $rsm)
+					->setParameter('latitude', $latitude)
+					->setParameter('longitude', $longitude)
+					->getArrayResult()
+			);
+
+			//Add location id clause
+			$locationSql = "\n\t".'AND s.location_id IN (:lids)';
+		//When user id
+		} elseif ($userId !== null) {
+			//Set the request
+			//XXX: get every location between 0 and 15 km
+			$req = <<<SQL
+SELECT l2.id
+FROM (
+	SELECT l.id, l.latitude, l.longitude
+	FROM RapsysAirBundle:Application AS a
+	JOIN RapsysAirBundle:Session AS s ON (s.id = a.session_id)
+	JOIN RapsysAirBundle:Location AS l ON (l.id = s.location_id)
+	WHERE a.user_id = :id
+	GROUP BY l.id
+	ORDER BY NULL
+	LIMIT 0, :limit
+) AS a
+JOIN RapsysAirBundle:Location AS l2
+WHERE ACOS(SIN(RADIANS(a.latitude))*SIN(RADIANS(l2.latitude))+COS(RADIANS(a.latitude))*COS(RADIANS(l2.latitude))*COS(RADIANS(a.longitude - l2.longitude)))*40030.17/2/PI() BETWEEN 0 AND 15
+GROUP BY l2.id
+ORDER BY NULL
+SQL;
+
+			//Replace bundle entity name by table name
+			$req = str_replace($this->tableKeys, $this->tableValues, $req);
+
+			//Get result set mapping instance
+			//XXX: DEBUG: see ../blog.orig/src/Rapsys/BlogBundle/Repository/ArticleRepository.php
+			$rsm = new ResultSetMapping();
+
+			//Declare all fields
+			//XXX: see vendor/doctrine/dbal/lib/Doctrine/DBAL/Types/Types.php
+			//addScalarResult($sqlColName, $resColName, $type = 'string');
+			$rsm->addScalarResult('id', 'id', 'integer')
+			       ->addIndexByScalar('id');
+
+			//Set location ids
+			$locationIds = array_keys(
+				$this->_em
+					->createNativeQuery($req, $rsm)
+					->setParameter('id', $userId)
+					->getArrayResult()
+			);
+
+			//With location ids
+			if (!empty($locationIds)) {
+				//Add location id clause
+				$locationSql = "\n\t".'AND s.location_id IN (:lids)';
+			}
+		}
+
+		//Set the request
+		$req = <<<SQL
+
+SELECT
+	s.id,
+	s.date,
+	s.rainrisk,
+	s.rainfall,
+	s.realfeel,
+	s.temperature,
+	s.locked,
+	ADDDATE(ADDTIME(s.date, s.begin), INTERVAL IF(s.slot_id = :afterid, 1, 0) DAY) AS start,
+	ADDDATE(ADDTIME(ADDTIME(s.date, s.begin), s.length), INTERVAL IF(s.slot_id = :afterid, 1, 0) DAY) AS stop,
+	s.location_id AS l_id,
+	l.title AS l_title,
+	l.zipcode AS l_zipcode,
+	l.city AS l_city,
+	l.latitude AS l_latitude,
+	l.longitude AS l_longitude,
+	l.indoor AS l_indoor,
+	s.slot_id AS t_id,
+	t.title AS t_title,
+	s.application_id AS a_id,
+	a.canceled AS a_canceled,
+	a.dance_id AS ad_id,
+	ad.name AS ad_name,
+	ad.type AS ad_type,
+	a.user_id AS au_id,
+	au.pseudonym AS au_pseudonym,
+	p.rate AS p_rate,
+	p.hat AS p_hat,
+	GROUP_CONCAT(sa.user_id ORDER BY sa.user_id SEPARATOR "\\n") AS sau_id,
+	GROUP_CONCAT(sau.pseudonym ORDER BY sa.user_id SEPARATOR "\\n") AS sau_pseudonym,
+	GROUP_CONCAT(sa.dance_id ORDER BY sa.user_id SEPARATOR "\\n") AS sad_id,
+	GROUP_CONCAT(sad.name ORDER BY sa.user_id SEPARATOR "\\n") AS sad_name,
+	GROUP_CONCAT(sad.type ORDER BY sa.user_id SEPARATOR "\\n") AS sad_type,
+	GREATEST(COALESCE(s.updated, 0), COALESCE(l.updated, 0), COALESCE(p.updated, 0), COALESCE(MAX(sa.updated), 0), COALESCE(MAX(sau.updated), 0), COALESCE(MAX(sad.updated), 0)) AS modified
+FROM RapsysAirBundle:Session AS s
+JOIN RapsysAirBundle:Location AS l ON (l.id = s.location_id)
+JOIN RapsysAirBundle:Slot AS t ON (t.id = s.slot_id)
+${grantSql}JOIN RapsysAirBundle:Application AS a ON (a.id = s.application_id)
+${grantSql}JOIN RapsysAirBundle:Dance AS ad ON (ad.id = a.dance_id)
+${grantSql}JOIN RapsysAirBundle:User AS au ON (au.id = a.user_id)
+LEFT JOIN RapsysAirBundle:Snippet AS p ON (p.location_id = s.location_id AND p.user_id = a.user_id AND p.locale = :locale)
+LEFT JOIN RapsysAirBundle:Application AS sa ON (sa.session_id = s.id)
+LEFT JOIN RapsysAirBundle:Dance AS sad ON (sad.id = sa.dance_id)
+LEFT JOIN RapsysAirBundle:User AS sau ON (sau.id = sa.user_id)
+WHERE s.date BETWEEN :begin AND :end${locationSql}
+GROUP BY s.id
+ORDER BY NULL
+SQL;
+
+		//Replace bundle entity name by table name
+		$req = str_replace($this->tableKeys, $this->tableValues, $req);
+
+		//Get result set mapping instance
+		//XXX: DEBUG: see ../blog.orig/src/Rapsys/BlogBundle/Repository/ArticleRepository.php
+		$rsm = new ResultSetMapping();
+
+		//Declare all fields
+		//XXX: see vendor/doctrine/dbal/lib/Doctrine/DBAL/Types/Types.php
+		//addScalarResult($sqlColName, $resColName, $type = 'string');
+		$rsm->addScalarResult('id', 'id', 'integer')
+			->addScalarResult('date', 'date', 'date')
+			->addScalarResult('rainrisk', 'rainrisk', 'float')
+			->addScalarResult('rainfall', 'rainfall', 'float')
+			->addScalarResult('realfeel', 'realfeel', 'float')
+			->addScalarResult('temperature', 'temperature', 'float')
+			->addScalarResult('locked', 'locked', 'datetime')
+			->addScalarResult('start', 'start', 'datetime')
+			->addScalarResult('stop', 'stop', 'datetime')
+			->addScalarResult('modified', 'modified', 'datetime')
+			->addScalarResult('t_id', 't_id', 'integer')
+			->addScalarResult('t_title', 't_title', 'string')
+			->addScalarResult('l_id', 'l_id', 'integer')
+			->addScalarResult('l_title', 'l_title', 'string')
+			->addScalarResult('l_zipcode', 'l_zipcode', 'string')
+			->addScalarResult('l_city', 'l_city', 'string')
+			->addScalarResult('l_latitude', 'l_latitude', 'float')
+			->addScalarResult('l_longitude', 'l_longitude', 'float')
+			->addScalarResult('l_indoor', 'l_indoor', 'boolean')
+			->addScalarResult('a_id', 'a_id', 'integer')
+			->addScalarResult('a_canceled', 'a_canceled', 'datetime')
+			->addScalarResult('ad_id', 'ad_id', 'string')
+			->addScalarResult('ad_name', 'ad_name', 'string')
+			->addScalarResult('ad_type', 'ad_type', 'string')
+			->addScalarResult('au_id', 'au_id', 'integer')
+			->addScalarResult('au_pseudonym', 'au_pseudonym', 'string')
+			->addScalarResult('p_rate', 'p_rate', 'integer')
+			->addScalarResult('p_hat', 'p_hat', 'boolean')
+			//XXX: is a string because of \n separator
+			->addScalarResult('sau_id', 'sau_id', 'string')
+			//XXX: is a string because of \n separator
+			->addScalarResult('sau_pseudonym', 'sau_pseudonym', 'string')
+			//XXX: is a string because of \n separator
+			->addScalarResult('sad_id', 'sad_id', 'string')
+			//XXX: is a string because of \n separator
+			->addScalarResult('sad_name', 'sad_name', 'string')
+			//XXX: is a string because of \n separator
+			->addScalarResult('sad_type', 'sad_type', 'string')
+			->addIndexByScalar('id');
+
+		//Fetch result
+		$res = $this->_em
+			->createNativeQuery($req, $rsm)
+			->setParameter('begin', $period->getStartDate())
+			->setParameter('end', $period->getEndDate())
+			->setParameter('locale', $locale);
+
+		//Add optional location ids
+		if (!empty($locationIds)) {
+			$res->setParameter('lids', $locationIds);
+		}
+
+		//Get result
+		$result = $res->getResult();
+
+		//Init calendar
+		$calendar = [];
+
+		//Init month
+		$month = null;
+
+		//Set route
+		$route = 'rapsys_air_session_view';
+
+		//Iterate on each day
+		foreach($period as $date) {
+			//Init day in calendar
+			$calendar[$Ymd = $date->format('Ymd')] = [
+				'title' => $this->translator->trans($date->format('l')).' '.$date->format('d'),
+				'modified' => null,
+				'class' => [],
+				'sessions' => []
+			];
+
+			//Detect month change
+			if ($month != $date->format('m')) {
+				$month = $date->format('m');
+				//Append month for first day of month
+				//XXX: except if today to avoid double add
+				if ($date->format('U') != strtotime('today')) {
+					$calendar[$Ymd]['title'] .= '/'.$month;
+				}
+			}
+			//Deal with today
+			if ($date->format('U') == ($today = strtotime('today'))) {
+				$calendar[$Ymd]['title'] .= '/'.$month;
+				$calendar[$Ymd]['current'] = true;
+				$calendar[$Ymd]['class'][] = 'current';
+			}
+			//Disable passed days
+			if ($date->format('U') < $today) {
+				$calendar[$Ymd]['disabled'] = true;
+				$calendar[$Ymd]['class'][] = 'disabled';
+			}
+			//Set next month days
+			if ($date->format('m') > date('m')) {
+				$calendar[$Ymd]['next'] = true;
+				#$calendar[$Ymd]['class'][] = 'next';
+			}
+
+			//Detect sunday
+			if ($date->format('w') == 0) {
+				$calendar[$Ymd]['class'][] = 'sunday';
+			}
+
+			//Iterate on each session to find the one of the day
+			foreach($result as $session) {
+				if (($sessionYmd = $session['date']->format('Ymd')) == $Ymd) {
+					//With empty or greatest modified
+					if ($calendar[$Ymd]['modified'] === null || $session['modified'] >= $calendar[$Ymd]['modified']) {
+						//Update modified
+						$calendar[$Ymd]['modified'] = $session['modified'];
+					}
+
+					//Set applications
+					$applications = array_combine($candidates = explode("\n", $session['sau_id']), explode("\n", $session['sau_pseudonym']));
+
+					//Compute classes
+					$class = [];
+
+					//With locked
+					if (!empty($session['locked'])) {
+						$class[] = 'locked';
+					//Without locked
+					} else {
+						//With application
+						if (!empty($session['a_id'])) {
+							//With canceled session
+							if (!empty($session['a_canceled'])) {
+								$class[] = 'canceled';
+							//With disputed session
+							} elseif ($userId !== null && $session['au_id'] != $userId && !empty($candidates[$userId])) {
+								$class[] = 'disputed';
+							//Session is granted
+							} else {
+								$class[] = 'granted';
+							}
+
+							//With user id
+							if ($userId !== null && $session['au_id'] == $userId) {
+								$class[] = 'highlight';
+							}
+						} else {
+							$class[] = 'pending';
+						}
+
+						//With latitude and longitude
+						if ($latitude !== null && $longitude !== null && $session['l_latitude'] == $latitude && $session['l_longitude'] == $longitude) {
+							$class[] = 'highlight';
+						}
+					}
+
+					//Set temperature
+					$temperature = [
+						'glyph' => self::GLYPHS['Cleary'],
+						'title' => []
+					];
+
+					//Compute temperature glyph
+					//XXX: temperature may be null
+					if ($session['temperature'] >= 17 && $session['temperature'] < 24) {
+						$temperature['glyph'] = self::GLYPHS['Sunny'];
+					} elseif ($session['temperature'] >= 10 && $session['temperature'] < 17) {
+						$temperature['glyph'] = self::GLYPHS['Cloudy'];
+					} elseif ($session['temperature'] !== null && $session['temperature'] < 10) {
+						$temperature['glyph'] = self::GLYPHS['Winty'];
+					}
+
+					//Check if temperature is available
+					if ($session['temperature'] !== null) {
+						$temperature['title'][] = $session['temperature'].'°C';
+					}
+
+					//Check if realfeel is available
+					if ($session['realfeel'] !== null) {
+						$temperature['title'][] = $session['realfeel'].'°R';
+					}
+
+					//Compute temperature title
+					$temperature['title'] = implode(' ', $temperature['title']);
+
+					//Set rain
+					$rain = [
+						'glyph' => self::GLYPHS['Cleary'],
+						'title' => []
+					];
+
+					//Compute rain glyph
+					//XXX: rainfall and rainrisk may be null
+					if ($session['rainrisk'] > 0.50 || $session['rainfall'] > 2) {
+						$rain['glyph'] = self::GLYPHS['Stormy'];
+					} elseif ($session['rainrisk'] > 0.40 || $session['rainfall'] > 1) {
+						$rain['glyph'] = self::GLYPHS['Rainy'];
+					}
+
+					//Check if rainrisk is available
+					if ($session['rainrisk'] !== null) {
+						$rain['title'][] = ($session['rainrisk']*100).'%';
+					}
+
+					//Check if rainfall is available
+					if ($session['rainfall'] !== null) {
+						$rain['title'][] = $session['rainfall'].'mm';
+					}
+
+					//Compute rain title
+					$rain['title'] = implode(' ', $rain['title']);
+
+					//Set application
+					$application = null;
+
+					//Set rate
+					$rate = null;
+
+					//Set route params
+					$routeParams = ['id' => $session['id'], 'location' => $this->slugger->slug($this->translator->trans($session['l_title']))];
+
+					//With application
+					if (!empty($session['a_id'])) {
+						//Set dance
+						$routeParams['dance'] = $this->slugger->slug($dance = $this->translator->trans($session['ad_name'].' '.lcfirst($session['ad_type'])));
+
+						//Set user
+						$routeParams['user'] =  $this->slugger->slug($session['au_pseudonym']);
+
+						//Set title
+						$title = $this->translator->trans('%dance% %id% by %pseudonym% %location% %city%', ['%dance%' => $dance, '%id%' => $session['id'], '%pseudonym%' => $session['au_pseudonym'], '%location%' => $this->translator->trans('at '.$session['l_title']), '%city%' => $this->translator->trans('in '.$session['l_city'])]);
+
+						//Set pseudonym
+						$application = [
+							'dance' => [
+								'id' => $session['ad_id'],
+								'name' => $this->translator->trans($session['ad_name']),
+								'type' => $this->translator->trans($session['ad_type']),
+								'title' => $dance
+							],
+							'user' => [
+								'id' => $session['au_id'],
+								'title' => $session['au_pseudonym']
+							]
+						];
+
+						//Set rate
+						$rate = [
+							'glyph' => self::GLYPHS['Free'],
+							'rate' => null,
+							'title' => $this->translator->trans('Free')
+						];
+
+						//With hat
+						if (!empty($session['p_hat'])) {
+							//Set glyph
+							$rate['glyph'] = self::GLYPHS['Hat'];
+
+							//With rate
+							if (!empty($session['p_rate'])) {
+								//Set rate
+								$rate['rate'] = $session['p_rate'];
+
+								//Set title
+								$rate['title'] = $this->translator->trans('To the hat, ideally %rate% €', ['%rate%' => $session['p_rate']]);
+							//Without rate
+							} else {
+								//Set title
+								$rate['title'] = $this->translator->trans('To the hat');
+							}
+						//With rate
+						} elseif (!empty($session['p_rate'])) {
+							//Set glyph
+							$rate['glyph'] = self::GLYPHS['Euro'];
+
+							//Set rate
+							$rate['rate'] = $session['p_rate'];
+
+							//Set title
+							$rate['title'] = $session['p_rate'].' €';
+						}
+					//With unique application
+					} elseif (count($applications) == 1) {
+						//Set dance
+						$dance = $this->translator->trans($session['sad_name'].' '.lcfirst($session['sad_type']));
+
+						//Set title
+						$title = $this->translator->trans('%dance% %id% by %pseudonym% %location% %city%', ['%dance%' => $dance, '%id%' => $session['id'], '%pseudonym%' => $session['sau_pseudonym'], '%location%' => $this->translator->trans('at '.$session['l_title']), '%city%' => $this->translator->trans('in '.$session['l_city'])]);
+
+						//Set pseudonym
+						$application = [
+							'dance' => [
+								'id' => $session['sad_id'],
+								'name' => $this->translator->trans($session['sad_name']),
+								'type' => $this->translator->trans($session['sad_type']),
+								'title' => $dance
+							],
+							'user' => [
+								'id' => $session['sau_id'],
+								'title' => $session['sau_pseudonym']
+							]
+						];
+
+						//TODO: glyph stuff ???
+					//Without application
+					} else {
+						//Set title
+						$title = $this->translator->trans('%slot% %id% %location%', ['%slot%' => $this->translator->trans($session['t_title']), '%id%' => $session['id'], '%location%' => $this->translator->trans('at '.$session['l_title'])]);
+					}
+
+					//Add the session
+					$calendar[$Ymd]['sessions'][$session['t_id'].sprintf('%05d', $session['id'])] = [
+						'id' => $session['id'],
+						'start' => $session['start'],
+						'stop' => $session['stop'],
+						'class' => $class,
+						'temperature' => $temperature,
+						'rain' => $rain,
+						'title' => $title,
+						'link' => $this->router->generate($route, $routeParams),
+						'location' => [
+							'id' => $session['l_id'],
+							'title' => $this->translator->trans($session['l_title']),
+							'latitude' => $session['l_latitude'],
+							'longitude' => $session['l_longitude'],
+							'indoor' => $session['l_indoor'],
+							'at' => $at = $this->translator->trans('at '.$session['l_title']),
+							'in' => $in = $this->translator->trans('in '.$session['l_city']),
+							'atin' => $at.' '.$in,
+							'city' => $session['l_city'],
+							'zipcode' => $session['l_zipcode']
+						],
+						'application' => $application,
+						'slot' => [
+							'glyph' => self::GLYPHS[$session['t_title']],
+							'title' => $this->translator->trans($session['t_title'])
+						],
+						'rate' => $rate,
+						'applications' => $applications
+					];
+				}
+			}
+
+			//Sort sessions
+			ksort($calendar[$Ymd]['sessions']);
+		}
+
+		//Send result
+		return $calendar;
+	}
+
 	/**
 	 * Find session by location, slot and date
 	 *
@@ -97,22 +1002,6 @@ class SessionRepository extends \Doctrine\ORM\EntityRepository {
 	 * @param $user The user id
 	 */
 	public function findOneWithinLastMonthByLocationUser($location, $user) {
-		//Get entity manager
-		$em = $this->getEntityManager();
-
-		//Get quote strategy
-		$qs = $em->getConfiguration()->getQuoteStrategy();
-		$dp = $em->getConnection()->getDatabasePlatform();
-
-		//Get quoted table names
-		//XXX: this allow to make this code table name independent
-		$tables = [
-			'RapsysAirBundle:Session' => $qs->getTableName($em->getClassMetadata('RapsysAirBundle:Session'), $dp),
-			'RapsysAirBundle:Application' => $qs->getTableName($em->getClassMetadata('RapsysAirBundle:Application'), $dp),
-			"\t" => '',
-			"\n" => ' '
-		];
-
 		//Set the request
 		//XXX: give the gooddelay to guest just in case
 		$req =<<<SQL
@@ -123,7 +1012,7 @@ WHERE s.location_id = :lid AND s.date >= DATE_ADD(DATE_SUB(NOW(), INTERVAL 1 MON
 SQL;
 
 		//Replace bundle entity name by table name
-		$req = str_replace(array_keys($tables), array_values($tables), $req);
+		$req = str_replace($this->tableKeys, $this->tableValues, $req);
 
 		//Get result set mapping instance
 		$rsm = new ResultSetMapping();
@@ -134,7 +1023,7 @@ SQL;
 			->addIndexByScalar('id');
 
 		//Return result
-		return $em
+		return $this->_em
 			->createNativeQuery($req, $rsm)
 			->setParameter('lid', $location)
 			->setParameter('uid', $user)
@@ -149,26 +1038,6 @@ SQL;
 	 * @param $locale The locale
 	 */
 	public function fetchAllByDatePeriod($period, $locale = null) {
-		//Get entity manager
-		$em = $this->getEntityManager();
-
-		//Get quote strategy
-		$qs = $em->getConfiguration()->getQuoteStrategy();
-		$dp = $em->getConnection()->getDatabasePlatform();
-
-		//Get quoted table names
-		//XXX: this allow to make this code table name independent
-		$tables = [
-			'RapsysAirBundle:Application' => $qs->getTableName($em->getClassMetadata('RapsysAirBundle:Application'), $dp),
-			'RapsysAirBundle:Location' => $qs->getTableName($em->getClassMetadata('RapsysAirBundle:Location'), $dp),
-			'RapsysAirBundle:Session' => $qs->getTableName($em->getClassMetadata('RapsysAirBundle:Session'), $dp),
-			'RapsysAirBundle:Snippet' => $qs->getTableName($em->getClassMetadata('RapsysAirBundle:Snippet'), $dp),
-			'RapsysAirBundle:User' => $qs->getTableName($em->getClassMetadata('RapsysAirBundle:User'), $dp),
-			':afterid' => 4,
-			"\t" => '',
-			"\n" => ' '
-		];
-
 		//Set the request
 		//TODO: exclude opera and others ?
 		$req = <<<SQL
@@ -183,12 +1052,14 @@ SELECT
 	l.address AS l_address,
 	l.zipcode AS l_zipcode,
 	l.city AS l_city,
-	l.short AS l_short,
 	l.title AS l_title,
+	l.description AS l_description,
 	l.latitude AS l_latitude,
 	l.longitude AS l_longitude,
 	s.application_id AS a_id,
 	a.canceled AS a_canceled,
+	ad.name AS ad_name,
+	ad.type AS ad_type,
 	a.user_id AS au_id,
 	au.forename AS au_forename,
 	au.pseudonym AS au_pseudonym,
@@ -196,6 +1067,7 @@ SELECT
 	p.description AS p_description,
 	p.class AS p_class,
 	p.short AS p_short,
+	p.hat AS p_hat,
 	p.rate AS p_rate,
 	p.contact AS p_contact,
 	p.donate AS p_donate,
@@ -204,6 +1076,7 @@ SELECT
 FROM RapsysAirBundle:Session AS s
 JOIN RapsysAirBundle:Location AS l ON (l.id = s.location_id)
 JOIN RapsysAirBundle:Application AS a ON (a.id = s.application_id)
+JOIN RapsysAirBundle:Dance AS ad ON (ad.id = a.dance_id)
 JOIN RapsysAirBundle:User AS au ON (au.id = a.user_id)
 LEFT JOIN RapsysAirBundle:Snippet AS p ON (p.location_id = s.location_id AND p.user_id = a.user_id AND p.locale = :locale)
 WHERE s.date BETWEEN :begin AND :end
@@ -211,7 +1084,7 @@ ORDER BY NULL
 SQL;
 
 		//Replace bundle entity name by table name
-		$req = str_replace(array_keys($tables), array_values($tables), $req);
+		$req = str_replace($this->tableKeys, $this->tableValues, $req);
 
 		//Get result set mapping instance
 		//XXX: DEBUG: see ../blog.orig/src/Rapsys/BlogBundle/Repository/ArticleRepository.php
@@ -232,12 +1105,14 @@ SQL;
 			->addScalarResult('l_city', 'l_city', 'string')
 			->addScalarResult('l_latitude', 'l_latitude', 'float')
 			->addScalarResult('l_longitude', 'l_longitude', 'float')
-			->addScalarResult('l_short', 'l_short', 'string')
 			->addScalarResult('l_title', 'l_title', 'string')
+			->addScalarResult('l_description', 'l_description', 'string')
 			->addScalarResult('t_id', 't_id', 'integer')
 			->addScalarResult('t_title', 't_title', 'string')
 			->addScalarResult('a_id', 'a_id', 'integer')
 			->addScalarResult('a_canceled', 'a_canceled', 'datetime')
+			->addScalarResult('ad_name', 'ad_name', 'string')
+			->addScalarResult('ad_type', 'ad_type', 'string')
 			->addScalarResult('au_id', 'au_id', 'integer')
 			->addScalarResult('au_forename', 'au_forename', 'string')
 			->addScalarResult('au_pseudonym', 'au_pseudonym', 'string')
@@ -245,6 +1120,7 @@ SQL;
 			->addScalarResult('p_description', 'p_description', 'string')
 			->addScalarResult('p_class', 'p_class', 'string')
 			->addScalarResult('p_short', 'p_short', 'string')
+			->addScalarResult('p_hat', 'p_hat', 'integer')
 			->addScalarResult('p_rate', 'p_rate', 'integer')
 			->addScalarResult('p_contact', 'p_contact', 'string')
 			->addScalarResult('p_donate', 'p_donate', 'string')
@@ -253,7 +1129,7 @@ SQL;
 			->addIndexByScalar('id');
 
 		//Fetch result
-		$res = $em
+		$res = $this->_em
 			->createNativeQuery($req, $rsm)
 			->setParameter('begin', $period->getStartDate())
 			->setParameter('end', $period->getEndDate())
@@ -266,34 +1142,15 @@ SQL;
 	/**
 	 * Fetch session by id
 	 *
+	 * @todo drop fetchOneById when migration is complete
+	 * @todo FIX the updated computation, we can drop the group_concat for a MAX()
+	 * @XXX DO NOT ADD a.updated as we already compute that with applications !!!
+	 *
 	 * @param $id The session id
 	 * @param $locale The locale
 	 * @return array The session data
 	 */
 	public function fetchOneById($id, $locale = null) {
-		//Get entity manager
-		$em = $this->getEntityManager();
-
-		//Get quote strategy
-		$qs = $em->getConfiguration()->getQuoteStrategy();
-		$dp = $em->getConnection()->getDatabasePlatform();
-
-		//Get quoted table names
-		//XXX: this allow to make this code table name independent
-		$tables = [
-			'RapsysAirBundle:Application' => $qs->getTableName($em->getClassMetadata('RapsysAirBundle:Application'), $dp),
-			'RapsysAirBundle:Group' => $qs->getTableName($em->getClassMetadata('RapsysAirBundle:Group'), $dp),
-			'RapsysAirBundle:GroupUser' => $qs->getJoinTableName($em->getClassMetadata('RapsysAirBundle:User')->getAssociationMapping('groups'), $em->getClassMetadata('RapsysAirBundle:User'), $dp),
-			'RapsysAirBundle:Location' => $qs->getTableName($em->getClassMetadata('RapsysAirBundle:Location'), $dp),
-			'RapsysAirBundle:Session' => $qs->getTableName($em->getClassMetadata('RapsysAirBundle:Session'), $dp),
-			'RapsysAirBundle:Snippet' => $qs->getTableName($em->getClassMetadata('RapsysAirBundle:Snippet'), $dp),
-			'RapsysAirBundle:Slot' => $qs->getTableName($em->getClassMetadata('RapsysAirBundle:Slot'), $dp),
-			'RapsysAirBundle:User' => $qs->getTableName($em->getClassMetadata('RapsysAirBundle:User'), $dp),
-			':afterid' => 4,
-			"\t" => '',
-			"\n" => ' '
-		];
-
 		//Set the request
 		//TODO: compute scores ?
 		//TODO: compute delivery date ? (J-3/J-4 ?)
@@ -317,19 +1174,24 @@ SELECT
 	s.created,
 	s.updated,
 	s.location_id AS l_id,
-	l.short AS l_short,
 	l.title AS l_title,
+	l.description AS l_description,
 	l.address AS l_address,
 	l.zipcode AS l_zipcode,
 	l.city AS l_city,
 	l.latitude AS l_latitude,
 	l.longitude AS l_longitude,
+	l.indoor AS l_indoor,
 	l.updated AS l_updated,
 	s.slot_id AS t_id,
 	t.title AS t_title,
 	t.updated AS t_updated,
 	s.application_id AS a_id,
 	a.canceled AS a_canceled,
+	a.dance_id AS ad_id,
+	ad.name AS ad_name,
+	ad.type AS ad_type,
+	ad.updated AS ad_updated,
 	a.user_id AS au_id,
 	au.pseudonym AS au_pseudonym,
 	p.id AS p_id,
@@ -353,17 +1215,18 @@ FROM RapsysAirBundle:Session AS s
 JOIN RapsysAirBundle:Location AS l ON (l.id = s.location_id)
 JOIN RapsysAirBundle:Slot AS t ON (t.id = s.slot_id)
 LEFT JOIN RapsysAirBundle:Application AS a ON (a.id = s.application_id)
+LEFT JOIN RapsysAirBundle:Dance AS ad ON (ad.id = a.dance_id)
 LEFT JOIN RapsysAirBundle:User AS au ON (au.id = a.user_id)
 LEFT JOIN RapsysAirBundle:Snippet AS p ON (p.location_id = s.location_id AND p.user_id = a.user_id AND p.locale = :locale)
 LEFT JOIN RapsysAirBundle:Application AS sa ON (sa.session_id = s.id)
 LEFT JOIN RapsysAirBundle:User AS sau ON (sau.id = sa.user_id)
-WHERE s.id = :sid
+WHERE s.id = :id
 GROUP BY s.id
 ORDER BY NULL
 SQL;
 
 		//Replace bundle entity name by table name
-		$req = str_replace(array_keys($tables), array_values($tables), $req);
+		$req = str_replace($this->tableKeys, $this->tableValues, $req);
 
 		//Get result set mapping instance
 		//XXX: DEBUG: see ../blog.orig/src/Rapsys/BlogBundle/Repository/ArticleRepository.php
@@ -389,19 +1252,24 @@ SQL;
 			->addScalarResult('created', 'created', 'datetime')
 			->addScalarResult('updated', 'updated', 'datetime')
 			->addScalarResult('l_id', 'l_id', 'integer')
-			->addScalarResult('l_short', 'l_short', 'string')
 			->addScalarResult('l_title', 'l_title', 'string')
+			->addScalarResult('l_description', 'l_description', 'string')
 			->addScalarResult('l_address', 'l_address', 'string')
 			->addScalarResult('l_zipcode', 'l_zipcode', 'string')
 			->addScalarResult('l_city', 'l_city', 'string')
 			->addScalarResult('l_latitude', 'l_latitude', 'float')
 			->addScalarResult('l_longitude', 'l_longitude', 'float')
+			->addScalarResult('l_indoor', 'l_indoor', 'boolean')
 			->addScalarResult('l_updated', 'l_updated', 'datetime')
 			->addScalarResult('t_id', 't_id', 'integer')
 			->addScalarResult('t_title', 't_title', 'string')
 			->addScalarResult('t_updated', 't_updated', 'datetime')
 			->addScalarResult('a_id', 'a_id', 'integer')
 			->addScalarResult('a_canceled', 'a_canceled', 'datetime')
+			->addScalarResult('ad_id', 'ad_id', 'integer')
+			->addScalarResult('ad_name', 'ad_name', 'string')
+			->addScalarResult('ad_type', 'ad_type', 'string')
+			->addScalarResult('ad_updated', 'ad_updated', 'datetime')
 			->addScalarResult('au_id', 'au_id', 'integer')
 			->addScalarResult('au_pseudonym', 'au_pseudonym', 'string')
 			->addScalarResult('p_id', 'p_id', 'integer')
@@ -430,10 +1298,10 @@ SQL;
 			->addScalarResult('sau_pseudonym', 'sau_pseudonym', 'string')
 			->addIndexByScalar('id');
 
-		//Return result
-		return $em
+		//Set result
+		return $this->_em
 			->createNativeQuery($req, $rsm)
-			->setParameter('sid', $id)
+			->setParameter('id', $id)
 			->setParameter('locale', $locale)
 			->getOneOrNullResult();
 	}
@@ -441,36 +1309,12 @@ SQL;
 	/**
 	 * Fetch sessions calendar with translated location by date period
 	 *
-	 * @param $translator The TranslatorInterface instance
 	 * @param $period The date period
 	 * @param $locationId The location id
 	 * @param $sessionId The session id
 	 * @param $granted The session is granted
 	 */
-	public function fetchCalendarByDatePeriod(TranslatorInterface $translator, $period, $locationId = null, $sessionId = null, $granted = false, $locale = null) {
-		//Get entity manager
-		$em = $this->getEntityManager();
-
-		//Get quote strategy
-		$qs = $em->getConfiguration()->getQuoteStrategy();
-		$dp = $em->getConnection()->getDatabasePlatform();
-
-		//Get quoted table names
-		//XXX: this allow to make this code table name independent
-		$tables = [
-			'RapsysAirBundle:GroupUser' => $qs->getJoinTableName($em->getClassMetadata('RapsysAirBundle:User')->getAssociationMapping('groups'), $em->getClassMetadata('RapsysAirBundle:User'), $dp),
-			'RapsysAirBundle:Session' => $qs->getTableName($em->getClassMetadata('RapsysAirBundle:Session'), $dp),
-			'RapsysAirBundle:Application' => $qs->getTableName($em->getClassMetadata('RapsysAirBundle:Application'), $dp),
-			'RapsysAirBundle:Group' => $qs->getTableName($em->getClassMetadata('RapsysAirBundle:Group'), $dp),
-			'RapsysAirBundle:Location' => $qs->getTableName($em->getClassMetadata('RapsysAirBundle:Location'), $dp),
-			'RapsysAirBundle:Slot' => $qs->getTableName($em->getClassMetadata('RapsysAirBundle:Slot'), $dp),
-			'RapsysAirBundle:Snippet' => $qs->getTableName($em->getClassMetadata('RapsysAirBundle:Snippet'), $dp),
-			'RapsysAirBundle:User' => $qs->getTableName($em->getClassMetadata('RapsysAirBundle:User'), $dp),
-			':afterid' => 4,
-			"\t" => '',
-			"\n" => ' '
-		];
-
+	public function fetchCalendarByDatePeriod($period, $locationId = null, $sessionId = null, $granted = false, $locale = null) {
 		//Init granted sql
 		$grantSql = '';
 
@@ -503,12 +1347,13 @@ SELECT
 	ADDDATE(ADDTIME(s.date, s.begin), INTERVAL IF(s.slot_id = :afterid, 1, 0) DAY) AS start,
 	ADDDATE(ADDTIME(ADDTIME(s.date, s.begin), s.length), INTERVAL IF(s.slot_id = :afterid, 1, 0) DAY) AS stop,
 	s.location_id AS l_id,
-	l.short AS l_short,
 	l.title AS l_title,
 	s.slot_id AS t_id,
 	t.title AS t_title,
 	s.application_id AS a_id,
 	a.canceled AS a_canceled,
+	ad.name AS ad_name,
+	ad.type AS ad_type,
 	a.user_id AS au_id,
 	au.pseudonym AS au_pseudonym,
 	p.rate AS p_rate,
@@ -519,6 +1364,7 @@ FROM RapsysAirBundle:Session AS s
 JOIN RapsysAirBundle:Location AS l ON (l.id = s.location_id)
 JOIN RapsysAirBundle:Slot AS t ON (t.id = s.slot_id)
 ${grantSql}JOIN RapsysAirBundle:Application AS a ON (a.id = s.application_id)
+${grantSql}JOIN RapsysAirBundle:Dance AS ad ON (ad.id = a.dance_id)
 ${grantSql}JOIN RapsysAirBundle:User AS au ON (au.id = a.user_id)
 LEFT JOIN RapsysAirBundle:Application AS sa ON (sa.session_id = s.id)
 LEFT JOIN RapsysAirBundle:Snippet AS p ON (p.location_id = s.location_id AND p.user_id = a.user_id AND p.locale = :locale)
@@ -529,7 +1375,7 @@ ORDER BY NULL
 SQL;
 
 		//Replace bundle entity name by table name
-		$req = str_replace(array_keys($tables), array_values($tables), $req);
+		$req = str_replace($this->tableKeys, $this->tableValues, $req);
 
 		//Get result set mapping instance
 		//XXX: DEBUG: see ../blog.orig/src/Rapsys/BlogBundle/Repository/ArticleRepository.php
@@ -550,10 +1396,11 @@ SQL;
 			->addScalarResult('t_id', 't_id', 'integer')
 			->addScalarResult('t_title', 't_title', 'string')
 			->addScalarResult('l_id', 'l_id', 'integer')
-			->addScalarResult('l_short', 'l_short', 'string')
 			->addScalarResult('l_title', 'l_title', 'string')
 			->addScalarResult('a_id', 'a_id', 'integer')
 			->addScalarResult('a_canceled', 'a_canceled', 'datetime')
+			->addScalarResult('ad_name', 'ad_name', 'string')
+			->addScalarResult('ad_type', 'ad_type', 'string')
 			->addScalarResult('au_id', 'au_id', 'integer')
 			->addScalarResult('au_pseudonym', 'au_pseudonym', 'string')
 			->addScalarResult('p_rate', 'p_rate', 'integer')
@@ -565,7 +1412,7 @@ SQL;
 			->addIndexByScalar('id');
 
 		//Fetch result
-		$res = $em
+		$res = $this->_em
 			->createNativeQuery($req, $rsm)
 			->setParameter('begin', $period->getStartDate())
 			->setParameter('end', $period->getEndDate())
@@ -589,7 +1436,7 @@ SQL;
 		foreach($period as $date) {
 			//Init day in calendar
 			$calendar[$Ymd = $date->format('Ymd')] = [
-				'title' => $translator->trans($date->format('l')).' '.$date->format('d'),
+				'title' => $this->translator->trans($date->format('l')).' '.$date->format('d'),
 				'class' => [],
 				'sessions' => []
 			];
@@ -699,12 +1546,15 @@ SQL;
 
 					//Set applications
 					$applications = [
-						0 => $translator->trans($session['t_title']).' '.$translator->trans('at '.$session['l_title']).$translator->trans(':')
+						0 => $this->translator->trans($session['t_title']).' '.$this->translator->trans('at '.$session['l_title']).$this->translator->trans(':')
 					];
 
 					//Fetch pseudonyms from session applications
 					$applications += array_combine(explode("\n", $session['sau_id']), array_map(function ($v) {return '- '.$v;}, explode("\n", $session['sau_pseudonym'])));
 
+					//Set dance
+					$dance = null;
+
 					//Set pseudonym
 					$pseudonym = null;
 
@@ -720,6 +1570,9 @@ SQL;
 						//Replace granted application
 						$applications[$session['au_id']] = '* '.$session['au_pseudonym'];
 
+						//Set dance
+						$dance = $this->translator->trans($session['ad_name'].' '.lcfirst($session['ad_type']));
+
 						//Set pseudonym
 						$pseudonym = $session['au_pseudonym'].($count > 1 ? ' ['.$count.']':'');
 					}
@@ -729,11 +1582,12 @@ SQL;
 						'id' => $session['id'],
 						'start' => $session['start'],
 						'stop' => $session['stop'],
-						'location' => $translator->trans($session['l_short']),
+						'location' => $this->translator->trans($session['l_title']),
+						'dance' => $dance,
 						'pseudonym' => $pseudonym,
 						'class' => $class,
 						'slot' => self::GLYPHS[$session['t_title']],
-						'slottitle' => $translator->trans($session['t_title']),
+						'slottitle' => $this->translator->trans($session['t_title']),
 						'weather' => $weather,
 						'weathertitle' => implode(' ', $weathertitle),
 						'applications' => $applications,
@@ -754,35 +1608,11 @@ SQL;
 	/**
 	 * Fetch sessions calendar with translated location by date period and user
 	 *
-	 * @param $translator The TranslatorInterface instance
 	 * @param $period The date period
 	 * @param $userId The user id
 	 * @param $sessionId The session id
 	 */
-	public function fetchUserCalendarByDatePeriod(TranslatorInterface $translator, $period, $userId = null, $sessionId = null, $locale = null) {
-		//Get entity manager
-		$em = $this->getEntityManager();
-
-		//Get quote strategy
-		$qs = $em->getConfiguration()->getQuoteStrategy();
-		$dp = $em->getConnection()->getDatabasePlatform();
-
-		//Get quoted table names
-		//XXX: this allow to make this code table name independent
-		$tables = [
-			'RapsysAirBundle:GroupUser' => $qs->getJoinTableName($em->getClassMetadata('RapsysAirBundle:User')->getAssociationMapping('groups'), $em->getClassMetadata('RapsysAirBundle:User'), $dp),
-			'RapsysAirBundle:Session' => $qs->getTableName($em->getClassMetadata('RapsysAirBundle:Session'), $dp),
-			'RapsysAirBundle:Application' => $qs->getTableName($em->getClassMetadata('RapsysAirBundle:Application'), $dp),
-			'RapsysAirBundle:Group' => $qs->getTableName($em->getClassMetadata('RapsysAirBundle:Group'), $dp),
-			'RapsysAirBundle:Location' => $qs->getTableName($em->getClassMetadata('RapsysAirBundle:Location'), $dp),
-			'RapsysAirBundle:Slot' => $qs->getTableName($em->getClassMetadata('RapsysAirBundle:Slot'), $dp),
-			'RapsysAirBundle:Snippet' => $qs->getTableName($em->getClassMetadata('RapsysAirBundle:Snippet'), $dp),
-			'RapsysAirBundle:User' => $qs->getTableName($em->getClassMetadata('RapsysAirBundle:User'), $dp),
-			':afterid' => 4,
-			"\t" => '',
-			"\n" => ' '
-		];
-
+	public function fetchUserCalendarByDatePeriod($period, $userId = null, $sessionId = null, $locale = null) {
 		//Init user sql
 		$userJoinSql = $userWhereSql = '';
 
@@ -808,11 +1638,12 @@ SELECT
 	ADDDATE(ADDTIME(s.date, s.begin), INTERVAL IF(s.slot_id = :afterid, 1, 0) DAY) AS start,
 	ADDDATE(ADDTIME(ADDTIME(s.date, s.begin), s.length), INTERVAL IF(s.slot_id = :afterid, 1, 0) DAY) AS stop,
 	s.location_id AS l_id,
-	l.short AS l_short,
 	l.title AS l_title,
 	s.slot_id AS t_id,
 	t.title AS t_title,
 	s.application_id AS a_id,
+	ad.name AS ad_name,
+	ad.type AS ad_type,
 	a.user_id AS au_id,
 	au.pseudonym AS au_pseudonym,
 	p.rate AS p_rate,
@@ -824,6 +1655,7 @@ JOIN RapsysAirBundle:Location AS l ON (l.id = s.location_id)
 JOIN RapsysAirBundle:Slot AS t ON (t.id = s.slot_id)
 ${userJoinSql}LEFT JOIN RapsysAirBundle:Application AS a ON (a.id = s.application_id)
 LEFT JOIN RapsysAirBundle:Snippet AS p ON (p.location_id = s.location_id AND p.user_id = a.user_id AND p.locale = :locale)
+LEFT JOIN RapsysAirBundle:Dance AS ad ON (ad.id = a.dance_id)
 LEFT JOIN RapsysAirBundle:User AS au ON (au.id = a.user_id)
 LEFT JOIN RapsysAirBundle:Application AS sa ON (sa.session_id = s.id)
 LEFT JOIN RapsysAirBundle:User AS sau ON (sau.id = sa.user_id)
@@ -833,7 +1665,7 @@ ORDER BY NULL
 SQL;
 
 		//Replace bundle entity name by table name
-		$req = str_replace(array_keys($tables), array_values($tables), $req);
+		$req = str_replace($this->tableKeys, $this->tableValues, $req);
 
 		//Get result set mapping instance
 		//XXX: DEBUG: see ../blog.orig/src/Rapsys/BlogBundle/Repository/ArticleRepository.php
@@ -854,9 +1686,10 @@ SQL;
 			->addScalarResult('t_id', 't_id', 'integer')
 			->addScalarResult('t_title', 't_title', 'string')
 			->addScalarResult('l_id', 'l_id', 'integer')
-			->addScalarResult('l_short', 'l_short', 'string')
 			->addScalarResult('l_title', 'l_title', 'string')
 			->addScalarResult('a_id', 'a_id', 'integer')
+			->addScalarResult('ad_name', 'ad_name', 'string')
+			->addScalarResult('ad_type', 'ad_type', 'string')
 			->addScalarResult('au_id', 'au_id', 'integer')
 			->addScalarResult('au_pseudonym', 'au_pseudonym', 'string')
 			->addScalarResult('p_rate', 'p_rate', 'integer')
@@ -868,7 +1701,7 @@ SQL;
 			->addIndexByScalar('id');
 
 		//Fetch result
-		$res = $em
+		$res = $this->_em
 			->createNativeQuery($req, $rsm)
 			->setParameter('begin', $period->getStartDate())
 			->setParameter('end', $period->getEndDate())
@@ -886,7 +1719,7 @@ SQL;
 		foreach($period as $date) {
 			//Init day in calendar
 			$calendar[$Ymd = $date->format('Ymd')] = [
-				'title' => $translator->trans($date->format('l')).' '.$date->format('d'),
+				'title' => $this->translator->trans($date->format('l')).' '.$date->format('d'),
 				'class' => [],
 				'sessions' => []
 			];
@@ -996,12 +1829,15 @@ SQL;
 
 					//Set applications
 					$applications = [
-						0 => $translator->trans($session['t_title']).' '.$translator->trans('at '.$session['l_title']).$translator->trans(':')
+						0 => $this->translator->trans($session['t_title']).' '.$this->translator->trans('at '.$session['l_title']).$this->translator->trans(':')
 					];
 
 					//Fetch pseudonyms from session applications
 					$applications += array_combine(explode("\n", $session['sau_id']), array_map(function ($v) {return '- '.$v;}, explode("\n", $session['sau_pseudonym'])));
 
+					//Set dance
+					$dance = null;
+
 					//Set pseudonym
 					$pseudonym = null;
 
@@ -1017,23 +1853,27 @@ SQL;
 						//Replace granted application
 						$applications[$session['au_id']] = '* '.$session['au_pseudonym'];
 
+						//Set dance
+						$dance = $this->translator->trans($session['ad_name'].' '.lcfirst($session['ad_type']));
+
 						//Set pseudonym
 						$pseudonym = $session['au_pseudonym'].($count > 1 ? ' ['.$count.']':'');
 					}
 
 					//Set title
-					$title = $translator->trans($session['l_title']).($count > 1 ? ' ['.$count.']':'');
+					$title = $this->translator->trans($session['l_title']).($count > 1 ? ' ['.$count.']':'');
 
 					//Add the session
 					$calendar[$Ymd]['sessions'][$session['t_id'].sprintf('%02d', $session['l_id'])] = [
 						'id' => $session['id'],
 						'start' => $session['start'],
 						'stop' => $session['stop'],
-						'location' => $translator->trans($session['l_short']),
+						'location' => $this->translator->trans($session['l_title']),
+						'dance' => $dance,
 						'pseudonym' => $pseudonym,
 						'class' => $class,
 						'slot' => self::GLYPHS[$session['t_title']],
-						'slottitle' => $translator->trans($session['t_title']),
+						'slottitle' => $this->translator->trans($session['t_title']),
 						'weather' => $weather,
 						'weathertitle' => implode(' ', $weathertitle),
 						'applications' => $applications,
@@ -1057,26 +1897,6 @@ SQL;
 	 * @return array<Session> The sessions to update
 	 */
 	public function findAllPendingHourlyWeather() {
-		//Get entity manager
-		$em = $this->getEntityManager();
-
-		//Get quote strategy
-		$qs = $em->getConfiguration()->getQuoteStrategy();
-		$dp = $em->getConnection()->getDatabasePlatform();
-
-		//Get quoted table names
-		//XXX: this allow to make this code table name independent
-		$tables = [
-			'RapsysAirBundle:Session' => $qs->getTableName($em->getClassMetadata('RapsysAirBundle:Session'), $dp),
-			'RapsysAirBundle:Location' => $qs->getTableName($em->getClassMetadata('RapsysAirBundle:Location'), $dp),
-			//Accuweather
-			':accuhourly' => self::ACCUWEATHER_HOURLY,
-			//Delay
-			':afterid' => 4,
-			"\t" => '',
-			"\n" => ' '
-		];
-
 		//Select all sessions starting and stopping in the next 3 days
 		//XXX: select session starting after now and stopping before date(now)+3d as accuweather only provide hourly data for the next 3 days (INTERVAL 3 DAY)
 		$req = <<<SQL
@@ -1087,7 +1907,7 @@ WHERE ADDDATE(ADDTIME(s.date, s.begin), INTERVAL IF(s.slot_id = :afterid, 1, 0)
 SQL;
 
 		//Replace bundle entity name by table name
-		$req = str_replace(array_keys($tables), array_values($tables), $req);
+		$req = str_replace($this->tableKeys, $this->tableValues, $req);
 
 		//Get result set mapping instance
 		$rsm = new ResultSetMapping();
@@ -1115,7 +1935,7 @@ SQL;
 			->addIndexBy('s', 'id');
 
 		//Send result
-		return $em
+		return $this->_em
 			->createNativeQuery($req, $rsm)
 			->getResult();
 	}
@@ -1126,27 +1946,6 @@ SQL;
 	 * @return array<Session> The sessions to update
 	 */
 	public function findAllPendingDailyWeather() {
-		//Get entity manager
-		$em = $this->getEntityManager();
-
-		//Get quote strategy
-		$qs = $em->getConfiguration()->getQuoteStrategy();
-		$dp = $em->getConnection()->getDatabasePlatform();
-
-		//Get quoted table names
-		//XXX: this allow to make this code table name independent
-		$tables = [
-			'RapsysAirBundle:Session' => $qs->getTableName($em->getClassMetadata('RapsysAirBundle:Session'), $dp),
-			'RapsysAirBundle:Location' => $qs->getTableName($em->getClassMetadata('RapsysAirBundle:Location'), $dp),
-			//Accuweather
-			':accudaily' => self::ACCUWEATHER_DAILY,
-			':accuhourly' => self::ACCUWEATHER_HOURLY,
-			//Delay
-			':afterid' => 4,
-			"\t" => '',
-			"\n" => ' '
-		];
-
 		//Select all sessions stopping after next 3 days
 		//XXX: select session stopping after or equal date(now)+3d as accuweather only provide hourly data for the next 3 days (INTERVAL 3 DAY)
 		$req = <<<SQL
@@ -1157,7 +1956,7 @@ WHERE ADDDATE(ADDTIME(ADDTIME(s.date, s.begin), s.length), INTERVAL IF(s.slot_id
 SQL;
 
 		//Replace bundle entity name by table name
-		$req = str_replace(array_keys($tables), array_values($tables), $req);
+		$req = str_replace($this->tableKeys, $this->tableValues, $req);
 
 		//Get result set mapping instance
 		$rsm = new ResultSetMapping();
@@ -1185,7 +1984,7 @@ SQL;
 			->addIndexBy('s', 'id');
 
 		//Send result
-		return $em
+		return $this->_em
 			->createNativeQuery($req, $rsm)
 			->getResult();
 	}
@@ -1196,27 +1995,6 @@ SQL;
 	 * @return array<Session> The sessions to update
 	 */
 	public function findAllPendingApplication() {
-		//Get entity manager
-		$em = $this->getEntityManager();
-
-		//Get quote strategy
-		$qs = $em->getConfiguration()->getQuoteStrategy();
-		$dp = $em->getConnection()->getDatabasePlatform();
-
-		//Get quoted table names
-		//XXX: this allow to make this code table name independent
-		$tables = [
-			'RapsysAirBundle:Application' => $qs->getTableName($em->getClassMetadata('RapsysAirBundle:Application'), $dp),
-			'RapsysAirBundle:Session' => $qs->getTableName($em->getClassMetadata('RapsysAirBundle:Session'), $dp),
-			//Delay
-			':regulardelay' => self::REGULAR_DELAY * 24 * 3600,
-			':seniordelay' => self::SENIOR_DELAY * 24 * 3600,
-			//Slot
-			':afterid' => 4,
-			"\t" => '',
-			"\n" => ' '
-		];
-
 		//Select all sessions not locked without application or canceled application within attribution period
 		//XXX: DIFF(start, now) <= IF(DIFF(start, created) <= SENIOR_DELAY in DAY, DIFF(start, created) * 3 / 4, SENIOR_DELAY)
 		//TODO: remonter les données pour le mail ?
@@ -1235,9 +2013,8 @@ GROUP BY s.id
 ORDER BY @dt_start ASC, s.created ASC
 SQL;
 
-
 		//Replace bundle entity name by table name
-		$req = str_replace(array_keys($tables), array_values($tables), $req);
+		$req = str_replace($this->tableKeys, $this->tableValues, $req);
 
 		//Get result set mapping instance
 		$rsm = new ResultSetMapping();
@@ -1249,7 +2026,7 @@ SQL;
 			->addIndexBy('s', 'id');
 
 		//Send result
-		return $em
+		return $this->_em
 			->createNativeQuery($req, $rsm)
 			->getResult();
 	}
@@ -1261,46 +2038,6 @@ SQL;
 	 * @return Application|null The application or null
 	 */
 	public function findBestApplicationById($id) {
-		//Get entity manager
-		$em = $this->getEntityManager();
-
-		//Get quote strategy
-		$qs = $em->getConfiguration()->getQuoteStrategy();
-		$dp = $em->getConnection()->getDatabasePlatform();
-
-		//Get quoted table names
-		//XXX: this allow to make this code table name independent
-		$tables = [
-			'RapsysAirBundle:Application' => $qs->getTableName($em->getClassMetadata('RapsysAirBundle:Application'), $dp),
-			'RapsysAirBundle:GroupUser' => $qs->getJoinTableName($em->getClassMetadata('RapsysAirBundle:User')->getAssociationMapping('groups'), $em->getClassMetadata('RapsysAirBundle:User'), $dp),
-			'RapsysAirBundle:Location' => $qs->getTableName($em->getClassMetadata('RapsysAirBundle:Location'), $dp),
-			'RapsysAirBundle:Session' => $qs->getTableName($em->getClassMetadata('RapsysAirBundle:Session'), $dp),
-			//XXX: Set limit used to workaround mariadb subselect optimization
-			':limit' => PHP_INT_MAX,
-			//Delay
-			':guestdelay' => self::GUEST_DELAY * 24 * 3600,
-			':regulardelay' => self::REGULAR_DELAY * 24 * 3600,
-			':seniordelay' => self::SENIOR_DELAY * 24 * 3600,
-			//Group
-			':guestid' => 2,
-			':regularid' => 3,
-			':seniorid' => 4,
-			//Slot
-			':afternoonid' => 2,
-			':eveningid' => 3,
-			':afterid' => 4,
-			//XXX: days since last session after which guest regain normal priority
-			':guestwait' => 30,
-			//XXX: session count until considered at regular delay
-			':scount' => 5,
-			//XXX: pn_ratio over which considered at regular delay
-			':pnratio' => 1,
-			//XXX: tr_ratio diff over which considered at regular delay
-			':trdiff' => 5,
-			"\t" => '',
-			"\n" => ' '
-		];
-
 		/**
 		 * Query session applications ranked by location score, global score, created and user_id
 		 *
@@ -1333,7 +2070,7 @@ FROM (
 		d.l_previous,
 		d.g_score,
 		d.o_tr_ratio,
-		MAX(gu.group_id) AS group_id,
+		MAX(ug.group_id) AS group_id,
 		d.remaining,
 		d.premium,
 		d.hotspot,
@@ -1409,7 +2146,7 @@ FROM (
 		ORDER BY NULL
 		LIMIT 0, :limit
 	) AS d
-	LEFT JOIN RapsysAirBundle:GroupUser AS gu ON (gu.user_id = d.user_id)
+	LEFT JOIN RapsysAirBundle:UserGroup AS ug ON (ug.user_id = d.user_id)
 	GROUP BY d.id
 	LIMIT 0, :limit
 ) AS e
@@ -1423,13 +2160,13 @@ ORDER BY e.l_score ASC, e.g_score ASC, e.created ASC, e.user_id ASC
 SQL;
 
 		//Replace bundle entity name by table name
-		$req = str_replace(array_keys($tables), array_values($tables), $req);
+		$req = str_replace($this->tableKeys, $this->tableValues, $req);
 
 		//Set update request
 		$upreq = 'UPDATE RapsysAirBundle:Application SET score = :score, updated = NOW() WHERE id = :id';
 
 		//Replace bundle entity name by table name
-		$upreq = str_replace(array_keys($tables), array_values($tables), $upreq);
+		$upreq = str_replace($this->tableKeys, $this->tableValues, $upreq);
 
 		//Get result set mapping instance
 		$rsm = new ResultSetMapping();
@@ -1443,11 +2180,9 @@ SQL;
 
 		//Get result
 		//XXX: setting limit in subqueries is required to prevent mariadb optimisation
-		$applications = $em
+		$applications = $this->_em
 			->createNativeQuery($req, $rsm)
 			->setParameter('sid', $id)
-			//XXX: removed, we update score before returning best candidate
-			//->getOneOrNullResult(Query::HYDRATE_SINGLE_SCALAR);
 			->getResult();
 
 		//Init ret
@@ -1463,7 +2198,7 @@ SQL;
 
 			//Update application updated field
 			//XXX: updated field is not modified for user with bad behaviour as application is not retrieved until delay is reached
-			$em->getConnection()->executeUpdate($upreq, ['id' => $application->getId(), 'score' => $application->getScore()], ['id' => Type::INTEGER, 'score' => Type::FLOAT]);
+			$this->_em->getConnection()->executeUpdate($upreq, ['id' => $application->getId(), 'score' => $application->getScore()], ['id' => Types::INTEGER, 'score' => Types::FLOAT]);
 		}
 
 		//Return best ranked application
@@ -1477,25 +2212,8 @@ SQL;
 	 * @return bool The rekey success or failure
 	 */
 	function rekey(): bool {
-		//Get entity manager
-		$em = $this->getEntityManager();
-
 		//Get connection
-		$cnx = $em->getConnection();
-
-		//Get quote strategy
-		$qs = $em->getConfiguration()->getQuoteStrategy();
-		$dp = $em->getConnection()->getDatabasePlatform();
-
-		//Get quoted table names
-		//XXX: this allow to make this code table name independent
-		$tables = [
-			'RapsysAirBundle:Application' => $qs->getTableName($em->getClassMetadata('RapsysAirBundle:Application'), $dp),
-			'RapsysAirBundle:Session' => $qs->getTableName($em->getClassMetadata('RapsysAirBundle:Session'), $dp),
-			':afterid' => 4,
-			"\t" => '',
-			"\n" => ' '
-		];
+		$cnx = $this->_em->getConnection();
 
 		//Set the request
 		$req = <<<SQL
@@ -1518,7 +2236,7 @@ ORDER BY ADDDATE(ADDTIME(a.date, a.begin), INTERVAL IF(a.slot_id = :afterid, 1,
 SQL;
 
 		//Replace bundle entity name by table name
-		$req = str_replace(array_keys($tables), array_values($tables), $req);
+		$req = str_replace($this->tableKeys, $this->tableValues, $req);
 
 		//Get result set mapping instance
 		//XXX: DEBUG: see ../blog.orig/src/Rapsys/BlogBundle/Repository/ArticleRepository.php
@@ -1532,7 +2250,7 @@ SQL;
 			#->addIndexByScalar('id');
 
 		//Fetch result
-		$rnq = $em->createNativeQuery($req, $rsm);
+		$rnq = $this->_em->createNativeQuery($req, $rsm);
 
 		//Get result set
 		$res = $rnq->getResult();
@@ -1548,7 +2266,7 @@ WHERE id = :id
 SQL;
 
 		//Replace bundle entity name by table name
-		$sreq = str_replace(array_keys($tables), array_values($tables), $sreq);
+		$sreq = str_replace($this->tableKeys, $this->tableValues, $sreq);
 
 		//Set update application request
 		$areq = <<<SQL
@@ -1558,7 +2276,7 @@ WHERE session_id = :id
 SQL;
 
 		//Replace bundle entity name by table name
-		$areq = str_replace(array_keys($tables), array_values($tables), $areq);
+		$areq = str_replace($this->tableKeys, $this->tableValues, $areq);
 
 		//Set max value
 		$max = max(array_keys($res));
@@ -1618,7 +2336,7 @@ auto_increment = 1
 SQL;
 
 				//Replace bundle entity name by table name
-				$ireq = str_replace(array_keys($tables), array_values($tables), $ireq);
+				$ireq = str_replace($this->tableKeys, $this->tableValues, $ireq);
 
 				//Reset auto_increment
 				$cnx->exec($ireq);