Fix for frequency filter type

ical4j · Apr 9, 2021 · 73f0e03 · 73f0e03
1 parent 454d756
commit 73f0e03
Show file tree

Hide file tree

Showing 2 changed files with 80 additions and 7 deletions.
diff --git a/src/main/java/net/fortuna/ical4j/model/Recur.java b/src/main/java/net/fortuna/ical4j/model/Recur.java
@@ -374,10 +374,9 @@ private Frequency deriveFilterType() {
             return Frequency.WEEKLY;
         } else if (frequency == Frequency.MONTHLY || !getMonthList().isEmpty()) {
             return Frequency.MONTHLY;
-        } else if (frequency == Frequency.YEARLY) {
-            return Frequency.YEARLY;
+        } else {
+            return frequency;
         }
-        return null;
     }
 
     /**

diff --git a/src/test/groovy/net/fortuna/ical4j/transform/recurrence/ByDayRuleTest.groovy b/src/test/groovy/net/fortuna/ical4j/transform/recurrence/ByDayRuleTest.groovy
@@ -1,12 +1,18 @@
 package net.fortuna.ical4j.transform.recurrence
 
-import net.fortuna.ical4j.model.Date
-import net.fortuna.ical4j.model.DateList
-import net.fortuna.ical4j.model.WeekDay
-import net.fortuna.ical4j.model.WeekDayList
+import net.fortuna.ical4j.model.*
+import net.fortuna.ical4j.model.component.VEvent
 import net.fortuna.ical4j.model.parameter.Value
+import net.fortuna.ical4j.model.property.CalScale
+import net.fortuna.ical4j.model.property.ExRule
+import net.fortuna.ical4j.model.property.RRule
+import net.fortuna.ical4j.model.property.Version
+import net.fortuna.ical4j.util.RandomUidGenerator
+import net.fortuna.ical4j.util.UidGenerator
 import spock.lang.Specification
 
+import java.util.stream.IntStream
+
 import static net.fortuna.ical4j.model.Recur.Frequency.WEEKLY
 
 class ByDayRuleTest extends Specification {
@@ -26,4 +32,72 @@ class ByDayRuleTest extends Specification {
         rulePart    | frequency              | dates                  | expectedResult
         WeekDay.FR  | WEEKLY | [new Date('20150103')] | [new Date('20150102')]
     }
+
+    def 'test limit with FREQ=MINUTELY'() {
+        given: 'a calendar definition'
+        Calendar calendar = new Calendar();
+        calendar.getProperties().add(Version.VERSION_2_0);
+        calendar.getProperties().add(CalScale.GREGORIAN);
+
+        DateTime dateTime = new DateTime("20210104T130000Z");
+        VEvent e1 = new VEvent(dateTime, "even");
+        UidGenerator ug = new RandomUidGenerator();
+        e1.getProperties().add(ug.generateUid());
+
+        // recurency
+        final NumberList hourList = new NumberList();
+        hourList.add(13);
+        hourList.add(14);
+        hourList.add(15);
+        hourList.add(16);
+
+        Recur recur = new Recur.Builder()
+                .frequency(Recur.Frequency.MINUTELY)
+                .interval(15)
+                .hourList(hourList)
+                .dayList(new WeekDayList(WeekDay.WE))
+                .build();
+        e1.getProperties().add(new RRule(recur));
+
+        //exrules
+        final NumberList hourExList = new NumberList();
+        hourExList.add(16);
+        Recur recurEx = new Recur.Builder()
+                .frequency(Recur.Frequency.MINUTELY)
+                .interval(15)
+                .hourList(hourExList)
+                .minuteList(numberList(30, 60))
+                .build();
+        Recur recurEx2 = new Recur.Builder()
+                .frequency(Recur.Frequency.MINUTELY)
+                .interval(15)
+                .hourList(numberList(13, 14))
+                .minuteList(numberList(0, 30))
+                .build();
+
+        e1.getProperties().add(new ExRule(recurEx));
+        e1.getProperties().add(new ExRule(recurEx2));
+
+        calendar.getComponents().add(e1);
+        System.out.println(calendar);
+
+        expect: 'dates are calculated successfully'
+        System.out.println("--------------------------------------------------");
+        DateTime from = new DateTime("20200101T070000Z");
+        DateTime to = new DateTime("20210107T070000Z");
+
+        Period period = new Period(from, to);
+        for (Component c : calendar.getComponents("VEVENT")) {
+            PeriodList list = c.calculateRecurrenceSet(period);
+            for (Object po : list) {
+                System.out.println((Period) po);
+            }
+        }
+    }
+
+    private static NumberList numberList(int startInclusive, int endExclusive) {
+        final NumberList integers = new NumberList();
+        IntStream.range(startInclusive, endExclusive).forEach(integers::add);
+        return integers;
+    }
 }