From c62495a280675bedbe8da450a594f6dc97c83d5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Mon, 16 Oct 2023 16:20:09 +0200
Subject: [PATCH] Fix export of all users and mapping of columns in user csv
 export (admin zone)

---
 .../ChillMainBundle/Controller/UserExportController.php  | 2 +-
 src/Bundle/ChillMainBundle/Repository/UserRepository.php | 9 +++------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Controller/UserExportController.php b/src/Bundle/ChillMainBundle/Controller/UserExportController.php
index 450be8dd7..fe318c4ae 100644
--- a/src/Bundle/ChillMainBundle/Controller/UserExportController.php
+++ b/src/Bundle/ChillMainBundle/Controller/UserExportController.php
@@ -50,7 +50,7 @@ final readonly class UserExportController
                 fn (string $e) => $this->translator->trans('admin.users.export.' . $e),
                 [
                     'id',
-                    'username',
+                    //  'username',
                     'email',
                     'enabled',
                     'civility_id',
diff --git a/src/Bundle/ChillMainBundle/Repository/UserRepository.php b/src/Bundle/ChillMainBundle/Repository/UserRepository.php
index 222dae2b5..17775f475 100644
--- a/src/Bundle/ChillMainBundle/Repository/UserRepository.php
+++ b/src/Bundle/ChillMainBundle/Repository/UserRepository.php
@@ -109,15 +109,12 @@ final readonly class UserRepository implements UserRepositoryInterface
             LEFT JOIN chill_main_civility civility ON u.civility_id = civility.id
             LEFT JOIN centers mainCenter ON u.maincenter_id = mainCenter.id
             LEFT JOIN chill_main_user_job_history userJobHistory ON u.id = userJobHistory.user_id
-            LEFT JOIN chill_main_user_job userJob ON userJobHistory.job_id = userJob.id
-            LEFT JOIN chill_main_user_scope_history userScopeHistory ON u.id = userScopeHistory.user_id
+            LEFT JOIN chill_main_user_job userJob ON userJobHistory.job_id = userJob.id AND tstzrange(userJobHistory.startdate, userJobHistory.enddate) @> NOW()
+            LEFT JOIN chill_main_user_scope_history userScopeHistory ON u.id = userScopeHistory.user_id AND tstzrange(userScopeHistory.startdate, userScopeHistory.enddate) @> NOW()
             LEFT JOIN scopes mainScope ON userScopeHistory.scope_id = mainScope.id
             LEFT JOIN chill_main_location currentLocation ON u.currentlocation_id = currentLocation.id
             LEFT JOIN chill_main_location mainLocation ON u.mainlocation_id = mainLocation.id
-            WHERE
-                tstzrange(userScopeHistory.startdate, userScopeHistory.enddate) @> NOW()
-            AND
-                tstzrange(userJobHistory.startdate, userJobHistory.enddate) @> NOW()
+            ORDER BY u.label, u.id
         SQL);
 
         $query = $this->connection->prepare($sql);