From b6359625245b2d4081cfe615d60a5e4846f02dd1 Mon Sep 17 00:00:00 2001
From: srosse <stephane.rosse@frentix.com>
Date: Tue, 11 Feb 2020 16:50:35 +0100
Subject: [PATCH] no-jira: ignore explicitly entry were completion is null
(older MySQL)
---
src/main/java/org/olat/modules/coach/manager/CoachingDAO.java | 1 +
.../java/org/olat/modules/coach/manager/CoachingDAOTest.java | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/main/java/org/olat/modules/coach/manager/CoachingDAO.java b/src/main/java/org/olat/modules/coach/manager/CoachingDAO.java
index 6075eebbb84..6c00ffbcf85 100644
--- a/src/main/java/org/olat/modules/coach/manager/CoachingDAO.java
+++ b/src/main/java/org/olat/modules/coach/manager/CoachingDAO.java
@@ -898,6 +898,7 @@ public class CoachingDAO {
.append(" and sg_ae.a_entry_root=").appendTrue();
}
sb.append(")")
+ .append(" and ae.a_completion is not null")
.append(" group by ae.fk_identity");
List<?> rawList = dbInstance.getCurrentEntityManager()
diff --git a/src/test/java/org/olat/modules/coach/manager/CoachingDAOTest.java b/src/test/java/org/olat/modules/coach/manager/CoachingDAOTest.java
index eff357256ce..42447b0548a 100644
--- a/src/test/java/org/olat/modules/coach/manager/CoachingDAOTest.java
+++ b/src/test/java/org/olat/modules/coach/manager/CoachingDAOTest.java
@@ -778,7 +778,7 @@ public class CoachingDAOTest extends OlatTestCase {
RepositoryEntry re4 = JunitTestHelper.deployCourse(null, "Coaching course 4", courseUrl);
dbInstance.commitAndCloseSession();
- Identity coach = JunitTestHelper.createAndPersistIdentityAsAuthor("Coach-1-" + UUID.randomUUID());
+ Identity coach = JunitTestHelper.createAndPersistIdentityAsRndAuthor("Coach-1-");
Identity participant1 = JunitTestHelper.createAndPersistIdentityAsRndUser("Coaching-Part-1");
Identity participant2 = JunitTestHelper.createAndPersistIdentityAsRndUser("Coaching-Part-2");
Identity participant3 = JunitTestHelper.createAndPersistIdentityAsRndUser("Coaching-Part-3");
--
GitLab