From 672a568871fb5f23f6653d94226b98efbbe93ef5 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Rapha=C3=ABl=20Gertz?= <git@rapsys.eu>
Date: Sat, 28 Aug 2021 09:59:51 +0200
Subject: [PATCH] Use pseudonym instead of full name Remove simple users from
application form Cleanup
---
Repository/UserRepository.php | 38 ++++++++++-------------------------
1 file changed, 11 insertions(+), 27 deletions(-)
diff --git a/Repository/UserRepository.php b/Repository/UserRepository.php
index 985b3b2..2d88e3d 100644
--- a/Repository/UserRepository.php
+++ b/Repository/UserRepository.php
@@ -27,15 +27,13 @@ class UserRepository extends \Doctrine\ORM\EntityRepository {
$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:Civility' => $qs->getTableName($em->getClassMetadata('RapsysAirBundle:Civility'), $dp),
'RapsysAirBundle:User' => $qs->getTableName($em->getClassMetadata('RapsysAirBundle:User'), $dp)
];
//Set the request
- $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
+ $req = '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: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.'
@@ -48,28 +46,11 @@ class UserRepository extends \Doctrine\ORM\EntityRepository {
//XXX: DEBUG: see ../blog.orig/src/Rapsys/BlogBundle/Repository/ArticleRepository.php
$rsm = new ResultSetMapping();
- /*XXX: we don't want a result set for our request
- $rsm->addEntityResult('RapsysAirBundle:User', 'u');
- $rsm->addFieldResult('u', 'id', 'id');
- $rsm->addFieldResult('u', 'forename', 'forename');
- $rsm->addFieldResult('u', 'surname', 'surname');
- $rsm->addFieldResult('u', 't_id', 'title_id');
- $rsm->addJoinedEntityResult('RapsysAirBundle:Title', 't', 'u', 'title');
- $rsm->addFieldResult('t', 't_id', 'id');
- $rsm->addFieldResult('t', 't_title', 'title');
- $rsm->addJoinedEntityResult('RapsysAirBundle:Group', 'g', 'u', 'groups');
- $rsm->addFieldResult('g', 'g_id', 'id');
- $rsm->addFieldResult('g', 'g_title', 'title');*/
-
//Declare all fields
//XXX: see vendor/doctrine/dbal/lib/Doctrine/DBAL/Types/Types.php
- //addScalarResult($sqlColName, $resColName, $type = 'string');
+ //XXX: we don't use a result set as we want to translate group and civility
$rsm->addScalarResult('id', 'id', 'integer')
- ->addScalarResult('forename', 'forename', 'string')
- ->addScalarResult('surname', 'surname', 'string')
- ->addScalarResult('t_id', 't_id', 'integer')
- ->addScalarResult('t_short', 't_short', 'string')
- ->addScalarResult('t_title', 't_title', 'string')
+ ->addScalarResult('pseudonym', 'pseudonym', 'string')
->addScalarResult('g_id', 'g_id', 'integer')
->addScalarResult('g_title', 'g_title', 'string')
->addIndexByScalar('id');
@@ -84,17 +65,20 @@ class UserRepository extends \Doctrine\ORM\EntityRepository {
//Process result
foreach($res as $data) {
+ //Without group or simple user
+ if (empty($data['g_title']) || $data['g_title'] == 'User') {
+ //Skip it
+ continue;
+ }
//Get translated group
- $group = $translator->trans($data['g_title']?:'User');
- //Get translated title
- $title = $translator->trans($data['t_short']);
+ $group = $translator->trans($data['g_title']);
//Init group subarray
if (!isset($ret[$group])) {
$ret[$group] = [];
}
//Set data
//XXX: ChoiceType use display string as key
- $ret[$group][$title.' '.$data['forename'].' '.$data['surname']] = $data['id'];
+ $ret[$group][$data['pseudonym']] = $data['id'];
}
//Send result
--
2.41.3