Switch on the fly locale with fb_locale=xx set

[airbundle] / Repository / UserRepository.php

diff --git a/Repository/UserRepository.php b/Repository/UserRepository.php
index 8660e39ca80909d2381057014d568ffe09b55976..985b3b229bb43b5763494924549ff71a738993f7 100644 (file)
--- a/Repository/UserRepository.php
+++ b/Repository/UserRepository.php
@@ -25,7 +25,7 @@ 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:Civility' => $qs->getTableName($em->getClassMetadata('RapsysAirBundle:Civility'), $dp),
                        'RapsysAirBundle:User' => $qs->getTableName($em->getClassMetadata('RapsysAirBundle:User'), $dp)
@@ -36,7 +36,7 @@ class UserRepository extends \Doctrine\ORM\EntityRepository {
                        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:Civility AS t ON (t.id = u.civility_id)
-                       LEFT JOIN RapsysAirBundle:GroupUser AS gu ON (gu.user_id = u.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';
@@ -140,7 +140,7 @@ 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:User' => $qs->getTableName($em->getClassMetadata('RapsysAirBundle:User'), $dp),
                        //XXX: Set limit used to workaround mariadb subselect optimization
@@ -151,17 +151,11 @@ class UserRepository extends \Doctrine\ORM\EntityRepository {
 
                //Set the request
                $req = <<<SQL
-SELECT a.id, a.pseudonym, a.g_id, a.g_title
-FROM (
-       SELECT u.id, u.pseudonym, g.id AS g_id, g.title AS g_title
-       FROM RapsysAirBundle:User AS u
-       JOIN RapsysAirBundle:GroupUser AS gu ON (gu.user_id = u.id)
-       JOIN RapsysAirBundle:Group AS g ON (g.id = gu.group_id)
-       ORDER BY g.id DESC
-       LIMIT 0, :limit
-) AS a
-GROUP BY a.id
-ORDER BY a.id ASC
+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
@@ -175,10 +169,10 @@ SQL;
                //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')
-                       ->addIndexByScalar('id');
+                       ->addScalarResult('g_title', 'g_title', 'string');
 
                //Fetch result
                $res = $em
@@ -191,7 +185,7 @@ SQL;
                //Process result
                foreach($res as $data) {
                        //Get translated group
-                       $group = $translator->trans($data['g_title']?:'User');
+                       $group = $translator->trans($data['g_title']);
 
                        //Init group subarray
                        if (!isset($ret[$group])) {
@@ -199,7 +193,10 @@ SQL;
                        }
 
                        //Set data
-                       $ret[$group][$data['id']] = $data['pseudonym'];
+                       $ret[$group][$data['id']] = [
+                               'mail' => $data['mail'],
+                               'pseudonym' => $data['pseudonym']
+                       ];
                }
 
                //Send result