From f618fa2dfd6395dd0776998bb215d249b60d7bbb Mon Sep 17 00:00:00 2001
From: ZAYTOUN abdellatif <zaytoun.abdellatif@gmail.com>
Date: Wed, 12 Mar 2025 12:12:37 +0100
Subject: [PATCH] =?UTF-8?q?feat():=20Brevo=20attribute=20=E2=80=9CNb=20Cre?=
 =?UTF-8?q?ated=20request=E2=80=9D=20generalized=20to=20all=20justice=20us?=
 =?UTF-8?q?ers.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

fix(): liquibase log errors : Caused by: java.lang.NoClassDefFoundError: org/yaml/snakeyaml/inspector/TagInspector
---
 pom.xml                                                     | 2 +-
 .../fr/gouv/beta/selexpert/repository/UserRepository.java   | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 9dfc379..ba5d024 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
     <org.mapstruct.version>1.6.3</org.mapstruct.version>
     <jackson.databind.nullable.version>0.2.6</jackson.databind.nullable.version>
     <brevo.version>1.0.0</brevo.version>
-    <liquibase.version>4.29.2</liquibase.version>
+    <liquibase.version>4.24.0</liquibase.version>
   </properties>
 
   <dependencies>
diff --git a/src/main/java/fr/gouv/beta/selexpert/repository/UserRepository.java b/src/main/java/fr/gouv/beta/selexpert/repository/UserRepository.java
index 0b590b2..ab6473e 100644
--- a/src/main/java/fr/gouv/beta/selexpert/repository/UserRepository.java
+++ b/src/main/java/fr/gouv/beta/selexpert/repository/UserRepository.java
@@ -34,10 +34,10 @@ public interface UserRepository extends JpaRepository<User, Integer> {
           + "LEFT JOIN UserMagistrate m ON u.id = m.id "
           + "LEFT JOIN Jurisdiction jm ON m.jurisdiction.id = jm.id "
           + "LEFT JOIN AppealCourt ac1 ON jm.appealCourt.id = ac1.id "
-          + "LEFT JOIN UserClerk c ON u.id = c.id "
-          + "LEFT JOIN Jurisdiction jc ON c.jurisdiction.id = jc.id "
+          + "LEFT JOIN UserClerk uc ON u.id = uc.id "
+          + "LEFT JOIN Jurisdiction jc ON uc.jurisdiction.id = jc.id "
           + "LEFT JOIN AppealCourt ac2 ON jc.appealCourt.id = ac2.id "
-          + "LEFT JOIN Request r ON u.id = r.magistrate.id "
+          + "LEFT JOIN Request r ON (r.magistrate.id = u.id OR EXISTS (SELECT 1 FROM r.requestClerks rc WHERE rc.id = u.id)) "
           + "LEFT JOIN AuthTokenPwdReset at ON at.user.id = u.id "
           + "WHERE u.role IN :roles AND (u.brevoSyncDate IS NULL OR u.brevoSyncDate < :timeThreshold) "
           + "GROUP BY u.id, jm.name, jc.name, ac1.name, ac2.name, at.token "
-- 
GitLab