Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2026-03-22 05:38:08 +00:00
Code Issues Actions Projects Releases Wiki Activity

Refactor user repository fields management and enhance query structure

Browse Source 
- Moved the `FIELDS` constant from `UserRepository` to `UserRepositoryInterface` to improve consistency and sharing.
- Updated SQL queries to include new fields (`absenceStart`, `mainLanguage`, and `isRoleSeeAuditTrails`).
- Streamlined CSV export logic to reference the shared `FIELDS` constant.
This commit is contained in:
Julien Fastré
2026-03-03 14:13:16 +01:00
parent cd29e3150a
commit 95437bd06d
3 changed files with 33 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/Bundle/ChillMainBundle/Repository/UserRepository.php
View File

@@ -27,26 +27,6 @@ final readonly class UserRepository implements UserRepositoryInterface
{
private EntityRepository $repository;
private const FIELDS = [
'id',
'email',
'enabled',
'civility_id',
'civility_abbreviation',
'civility_name',
'label',
'mainCenter_id',
'mainCenter_name',
'mainScope_id',
'mainScope_name',
'userJob_id',
'userJob_name',
'currentLocation_id',
'currentLocation_name',
'mainLocation_id',
'mainLocation_name',
];
public function __construct(private EntityManagerInterface $entityManager, private Connection $connection)
{
$this->repository = $entityManager->getRepository(User::class);
@@ -119,7 +99,9 @@ final readonly class UserRepository implements UserRepositoryInterface
currentLocation.name AS currentLocation_name,
mainLocation.id AS mainLocation_id,
mainLocation.name AS mainLocation_name,
u.absenceStart
u.absenceStart AS absenceStart,
u.locale AS mainLanguage,
u.roles @> jsonb_build_array('%s') AS isRoleSeeAuditTrails
FROM users u
LEFT JOIN chill_main_civility civility ON u.civility_id = civility.id
LEFT JOIN centers mainCenter ON u.maincenter_id = mainCenter.id
@@ -130,13 +112,13 @@ final readonly class UserRepository implements UserRepositoryInterface
LEFT JOIN chill_main_location currentLocation ON u.currentlocation_id = currentLocation.id
LEFT JOIN chill_main_location mainLocation ON u.mainlocation_id = mainLocation.id
ORDER BY u.label, u.id
SQL);
SQL, User::ROLE_SEE_AUDIT_TRAILS);
$query = $this->connection->prepare($sql);
foreach ($query->executeQuery(['lang' => $lang])->iterateAssociative() as $u) {
$converted = [];
foreach (self::FIELDS as $f) {
foreach (UserRepositoryInterface::FIELDS as $f) {
$converted[$f] = $u[strtolower($f)];
}

24
src/Bundle/ChillMainBundle/Repository/UserRepositoryInterface.php
View File

@@ -19,6 +19,30 @@ use Doctrine\Persistence\ObjectRepository;
*/
interface UserRepositoryInterface extends ObjectRepository
{
public const FIELDS = [
'id',
'username',
'email',
'enabled',
'civility_id',
'civility_abbreviation',
'civility_name',
'label',
'mainCenter_id',
'mainCenter_name',
'mainScope_id',
'mainScope_name',
'userJob_id',
'userJob_name',
'currentLocation_id',
'currentLocation_name',
'mainLocation_id',
'mainLocation_name',
'absenceStart',
'mainLanguage',
'isRoleSeeAuditTrails',
];
public function countBy(array $criteria): int;
public function countByActive(): int;