From 15a9061af3a8afa03c12e393da975ecd5323456b Mon Sep 17 00:00:00 2001
From: srosse <stephane.rosse@frentix.com>
Date: Tue, 19 May 2020 08:13:54 +0200
Subject: [PATCH] OO-4696: adapt the query to clean up the invitations
---
.../olat/modules/portfolio/manager/InvitationDAO.java | 2 --
.../modules/portfolio/manager/InvitationDAOTest.java | 11 ++++++++---
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/olat/modules/portfolio/manager/InvitationDAO.java b/src/main/java/org/olat/modules/portfolio/manager/InvitationDAO.java
index 3b5e73d6ef2..092b38f8f5e 100644
--- a/src/main/java/org/olat/modules/portfolio/manager/InvitationDAO.java
+++ b/src/main/java/org/olat/modules/portfolio/manager/InvitationDAO.java
@@ -317,7 +317,6 @@ public class InvitationDAO {
public void cleanUpInvitations() {
Calendar cal = Calendar.getInstance();
cal.setTime(new Date());
- Date currentTime = cal.getTime();
cal.add(Calendar.HOUR, -6);
Date dateLimit = cal.getTime();
@@ -328,7 +327,6 @@ public class InvitationDAO {
List<Invitation> oldInvitations = dbInstance.getCurrentEntityManager()
.createQuery(sb.toString(), Invitation.class)
- .setParameter("currentDate", currentTime)
.setParameter("dateLimit", dateLimit)
.getResultList();
diff --git a/src/test/java/org/olat/modules/portfolio/manager/InvitationDAOTest.java b/src/test/java/org/olat/modules/portfolio/manager/InvitationDAOTest.java
index 8a1f8ca0ad7..af3e5d24108 100644
--- a/src/test/java/org/olat/modules/portfolio/manager/InvitationDAOTest.java
+++ b/src/test/java/org/olat/modules/portfolio/manager/InvitationDAOTest.java
@@ -19,7 +19,6 @@
*/
package org.olat.modules.portfolio.manager;
-import java.util.Date;
import java.util.Locale;
import java.util.UUID;
@@ -93,11 +92,9 @@ public class InvitationDAOTest extends OlatTestCase {
Assert.assertEquals(invitation.getToken(), reloadedInvitation.getToken());
}
-
@Test
public void hasInvitationPolicies_testHQL() {
String token = UUID.randomUUID().toString();
- Date atDate = new Date();
boolean hasInvitation = invitationDao.hasInvitations(token);
Assert.assertFalse(hasInvitation);
}
@@ -176,5 +173,13 @@ public class InvitationDAOTest extends OlatTestCase {
long numOfInvitations = invitationDao.countInvitations();
Assert.assertTrue(numOfInvitations > 0l);
}
+
+ /**
+ * Only check if the query is valid.
+ */
+ @Test
+ public void cleanUpInvitations() {
+ invitationDao.cleanUpInvitations();
+ }
}
--
GitLab