X-Git-Url: https://git.rapsys.eu/airbundle/blobdiff_plain/6176927836d9b190c78d59e1a986b3e7ee79e065..15a735d7556a74b145b8c1aa3dbf8e93e9662131:/Repository/UserRepository.php?ds=sidebyside

diff --git a/Repository/UserRepository.php b/Repository/UserRepository.php
index 8b490c4..985b3b2 100644
--- a/Repository/UserRepository.php
+++ b/Repository/UserRepository.php
@@ -10,11 +10,11 @@ use Doctrine\ORM\Query\ResultSetMapping;
  */
 class UserRepository extends \Doctrine\ORM\EntityRepository {
 	/**
-	 * Find users with translated highest group and title
+	 * Find users with translated highest group and civility
 	 *
 	 * @param $translator The TranslatorInterface instance
 	 */
-	public function findAllWithTranslatedGroupAndTitle(TranslatorInterface $translator) {
+	public function findAllWithTranslatedGroupAndCivility(TranslatorInterface $translator) {
 		//Get entity manager
 		$em = $this->getEntityManager();
 
@@ -25,9 +25,9 @@ class UserRepository extends \Doctrine\ORM\EntityRepository {
 		//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:UserGroup' => $qs->getJoinTableName($em->getClassMetadata('RapsysAirBundle:User')->getAssociationMapping('groups'), $em->getClassMetadata('RapsysAirBundle:User'), $dp),
 			'RapsysAirBundle:Group' => $qs->getTableName($em->getClassMetadata('RapsysAirBundle:Group'), $dp),
-			'RapsysAirBundle:Title' => $qs->getTableName($em->getClassMetadata('RapsysAirBundle:Title'), $dp),
+			'RapsysAirBundle:Civility' => $qs->getTableName($em->getClassMetadata('RapsysAirBundle:Civility'), $dp),
 			'RapsysAirBundle:User' => $qs->getTableName($em->getClassMetadata('RapsysAirBundle:User'), $dp)
 		];
 
@@ -35,8 +35,8 @@ class UserRepository extends \Doctrine\ORM\EntityRepository {
 		$req = 'SELECT a.id, a.forename, a.surname, a.t_id, a.t_short, a.t_title, a.g_id, a.g_title FROM (
 			SELECT u.id, u.forename, u.surname, t.id AS t_id, t.short AS t_short, t.title AS t_title, g.id AS g_id, g.title AS g_title
 			FROM RapsysAirBundle:User AS u
-			JOIN RapsysAirBundle:Title AS t ON (t.id = u.title_id)
-			LEFT JOIN RapsysAirBundle:GroupUser AS gu ON (gu.user_id = u.id)
+			JOIN RapsysAirBundle:Civility AS t ON (t.id = u.civility_id)
+			LEFT JOIN RapsysAirBundle:UserGroup AS gu ON (gu.user_id = u.id)
 			LEFT JOIN RapsysAirBundle:Group AS g ON (g.id = gu.group_id)
 			ORDER BY g.id DESC, NULL LIMIT '.PHP_INT_MAX.'
 		) AS a GROUP BY a.id ORDER BY NULL';
@@ -102,22 +102,102 @@ class UserRepository extends \Doctrine\ORM\EntityRepository {
 	}
 
 	/**
-	 * Find all user's pseudonym from session applications
+	 * Find all applicant by session
 	 *
-	 * @param $session The Session instance
+	 * @param $session The Session
 	 */
-	public function findAllPseudonymBySession($session) {
+	public function findAllApplicantBySession($session) {
 		//Get entity manager
 		$em = $this->getEntityManager();
 
 		//Fetch sessions
 		$ret = $this->getEntityManager()
-			->createQuery('SELECT u.id, u.pseudonym FROM RapsysAirBundle:Application a INNER JOIN RapsysAirBundle:User u WHERE u.id = a.user AND a.session = :session')
+			->createQuery('SELECT u.id, u.pseudonym FROM RapsysAirBundle:Application a JOIN RapsysAirBundle:User u WITH u.id = a.user WHERE a.session = :session')
 			->setParameter('session', $session)
 			->getResult();
 
 		//Process result
-		$ret = array_column($ret, 'pseudonym', 'id');
+		$ret = array_column($ret, 'id', 'pseudonym');
+
+		//Send result
+		return $ret;
+	}
+
+	/**
+	 * Find all users grouped by translated group
+	 *
+	 * @param $translator The TranslatorInterface instance
+	 * @return array|null The user array or null
+	 */
+	public function findUserGroupedByTranslatedGroup(TranslatorInterface $translator) {
+		//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:UserGroup' => $qs->getJoinTableName($em->getClassMetadata('RapsysAirBundle:User')->getAssociationMapping('groups'), $em->getClassMetadata('RapsysAirBundle:User'), $dp),
+			'RapsysAirBundle:Group' => $qs->getTableName($em->getClassMetadata('RapsysAirBundle:Group'), $dp),
+			'RapsysAirBundle:User' => $qs->getTableName($em->getClassMetadata('RapsysAirBundle:User'), $dp),
+			//XXX: Set limit used to workaround mariadb subselect optimization
+			':limit' => PHP_INT_MAX,
+			"\t" => '',
+			"\n" => ' '
+		];
+
+		//Set the request
+		$req = <<<SQL
+SELECT u.id, u.mail, u.pseudonym, g.id AS g_id, g.title AS g_title
+FROM RapsysAirBundle:User AS u
+JOIN RapsysAirBundle:UserGroup AS gu ON (gu.user_id = u.id)
+JOIN RapsysAirBundle:Group AS g ON (g.id = gu.group_id)
+ORDER BY g.id DESC, u.id ASC
+SQL;
+
+		//Replace bundle entity name by table name
+		$req = str_replace(array_keys($tables), array_values($tables), $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('mail', 'mail', 'string')
+			->addScalarResult('pseudonym', 'pseudonym', 'string')
+			->addScalarResult('g_id', 'g_id', 'integer')
+			->addScalarResult('g_title', 'g_title', 'string');
+
+		//Fetch result
+		$res = $em
+			->createNativeQuery($req, $rsm)
+			->getResult();
+
+		//Init return
+		$ret = [];
+
+		//Process result
+		foreach($res as $data) {
+			//Get translated group
+			$group = $translator->trans($data['g_title']);
+
+			//Init group subarray
+			if (!isset($ret[$group])) {
+				$ret[$group] = [];
+			}
+
+			//Set data
+			$ret[$group][$data['id']] = [
+				'mail' => $data['mail'],
+				'pseudonym' => $data['pseudonym']
+			];
+		}
 
 		//Send result
 		return $ret;