inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

ALF-9156 Support for repeating events in the Calendar get events canned query, and more tests

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@29231 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Nick Burch
2011-07-20 16:11:33 +00:00
parent 78d5cb0f42
commit f1e73ef459
10 changed files with 444 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
source/java/org/alfresco/repo/calendar/cannedqueries/GetCalendarEntriesCannedQuery.java
View File

@@ -33,6 +33,7 @@ import org.alfresco.repo.domain.query.CannedQueryDAO;
import org.alfresco.repo.security.permissions.impl.acegi.AbstractCannedQueryPermissions;
import org.alfresco.repo.security.permissions.impl.acegi.MethodSecurityBean;
import org.alfresco.service.cmr.calendar.CalendarEntry;
import org.alfresco.service.cmr.calendar.CalendarRecurrenceHelper;
import org.alfresco.service.cmr.calendar.CalendarService;
import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter;
@@ -59,6 +60,7 @@ public class GetCalendarEntriesCannedQuery extends AbstractCannedQueryPermission
private final CannedQueryDAO cannedQueryDAO;
private final TaggingService taggingService;
private final NodeService nodeService;
private GetCalendarEntriesCannedQueryTestHook testHook;
public GetCalendarEntriesCannedQuery(
CannedQueryDAO cannedQueryDAO,
@@ -101,6 +103,9 @@ public class GetCalendarEntriesCannedQuery extends AbstractCannedQueryPermission
toDate = fromDate;
}
String recurringRule = result.getRecurrenceRule();
Date recurringLastDate = DefaultTypeConverter.INSTANCE.convert(Date.class, result.getRecurrenceLastMeeting());
// Only return entries in the right period
if(entriesFromDate != null)
{
@@ -112,13 +117,72 @@ public class GetCalendarEntriesCannedQuery extends AbstractCannedQueryPermission
}
if(entriesToDate != null)
{
// Needs to start on or after the Filter End date
// Needs have started by the Filter To date
if(fromDate == null || fromDate.after(entriesToDate))
{
nextNodeIsAcceptable = false;
}
}
// Handle recurring events specially
if(recurringRule != null && !nextNodeIsAcceptable)
{
if(entriesToDate != null || recurringLastDate != null)
{
Date searchFrom = entriesFromDate;
if(searchFrom == null)
{
searchFrom = fromDate;
}
Date searchTo = entriesToDate;
if(searchTo == null)
{
searchTo = recurringLastDate;
}
List<Date> dates = CalendarRecurrenceHelper.getRecurrencesOnOrAfter(
recurringRule, fromDate, toDate, recurringLastDate,
searchFrom, searchTo, false
);
if(dates != null && dates.size() > 0)
{
// Do any of these fit?
for(Date date : dates)
{
if(entriesFromDate != null && entriesToDate != null)
{
// From and To date given, needs to sit between them
if(entriesFromDate.getTime() <= date.getTime() &&
date.getTime() <= entriesToDate.getTime())
{
nextNodeIsAcceptable = true;
break;
}
}
else if(entriesFromDate != null)
{
// From date but no end date, needs to be after the from
if(entriesFromDate.getTime() <= date.getTime())
{
nextNodeIsAcceptable = true;
break;
}
}
else if(entriesToDate != null)
{
// End date but no start date, needs to be before the from
if(date.getTime() <= entriesToDate.getTime())
{
nextNodeIsAcceptable = true;
break;
}
}
}
}
}
}
// Did it make the cut
if (nextNodeIsAcceptable)
{
filtered.add(result);
@@ -155,6 +219,11 @@ public class GetCalendarEntriesCannedQuery extends AbstractCannedQueryPermission
logger.debug("Base query: "+calendarEntries.size()+" in "+(System.currentTimeMillis()-start)+" msecs");
}
if(testHook != null)
{
testHook.notifyComplete(results, filtered);
}
return calendarEntries;
}
@@ -165,6 +234,11 @@ public class GetCalendarEntriesCannedQuery extends AbstractCannedQueryPermission
return false;
}
public void setTestHook(GetCalendarEntriesCannedQueryTestHook hook)
{
this.testHook = hook;
}
private class CalendarEntryImpl extends org.alfresco.repo.calendar.CalendarEntryImpl
{
private CalendarEntryImpl(CalendarEntity entity)