oss/Radicale
oss/Radicale
1
0
Fork 0
mirror of https://github.com/Kozea/Radicale.git synced 2025-09-12 20:30:57 +00:00
Code Wiki Activity

(#1812) Fixed an issue where non-recurring events were not included in

Browse source 
the response when requesting an expand report
This commit is contained in:
Georgiy 2025-07-21 20:58:58 +03:00
parent c553460365
commit 7cd918d036
4 changed files with 120 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

31
radicale/tests/static/event_issue1812_2.ics Normal file
View file

@ -0,0 +1,31 @@
BEGIN:VCALENDAR
VERSION:2.0
PRODID:-//algoo.fr//NONSGML Open Calendar v0.9//EN
BEGIN:VTIMEZONE
TZID:Europe/Paris
LAST-MODIFIED:20250523T094234Z
BEGIN:STANDARD
DTSTART:19701025T030000Z
RRULE:BYDAY=-1SU;BYMONTH=10;FREQ=YEARLY
TZNAME:CET
TZOFFSETFROM:+0200
TZOFFSETTO:+0100
END:STANDARD
BEGIN:DAYLIGHT
DTSTART:19700329T020000Z
RRULE:BYDAY=-1SU;BYMONTH=3;FREQ=YEARLY
TZNAME:CEST
TZOFFSETFROM:+0100
TZOFFSETTO:+0200
END:DAYLIGHT
END:VTIMEZONE
BEGIN:VEVENT
UID:a07cfa8b-0ce6-4956-800d-c0bfe1f0730a
DTSTART;TZID=Europe/Paris;VALUE=DATE:20250716
DTEND;TZID=Europe/Paris;VALUE=DATE:20250718
DTSTAMP;VALUE=DATE-TIME:20250721T075355Z
RRULE:FREQ=WEEKLY
SEQUENCE:1
SUMMARY:bla
END:VEVENT
END:VCALENDAR

31
radicale/tests/static/event_issue1812_3.ics Normal file
View file

@ -0,0 +1,31 @@
BEGIN:VCALENDAR
VERSION:2.0
PRODID:-//algoo.fr//NONSGML Open Calendar v0.9//EN
BEGIN:VTIMEZONE
TZID:Europe/Paris
LAST-MODIFIED:20250523T094234Z
BEGIN:STANDARD
DTSTART:19701025T030000Z
RRULE:BYDAY=-1SU;BYMONTH=10;FREQ=YEARLY
TZNAME:CET
TZOFFSETFROM:+0200
TZOFFSETTO:+0100
END:STANDARD
BEGIN:DAYLIGHT
DTSTART:19700329T020000Z
RRULE:BYDAY=-1SU;BYMONTH=3;FREQ=YEARLY
TZNAME:CEST
TZOFFSETFROM:+0100
TZOFFSETTO:+0200
END:DAYLIGHT
END:VTIMEZONE
BEGIN:VEVENT
UID:c6be8b2c-3d72-453c-b698-4f25cdf1569e
DTSTART;TZID=Europe/Paris;VALUE=DATE-TIME:20250716T110000
DTEND;TZID=Europe/Paris;VALUE=DATE-TIME:20250716T120000
ATTENDEE;CN=Corentin;ROLE=REQ-PARTICIPANT:MAILTO:corentin.jeanne@algoo.fr
DTSTAMP:20250718T151312Z
ORGANIZER;CN=Sigma:MAILTO:lambda@lambda.lambda
SUMMARY:Test mail notifications 2
END:VEVENT
END:VCALENDAR

7
radicale/tests/test_expand.py
View file

@ -474,8 +474,8 @@ permissions: RrWw""")
self.put("/test/event.ics/", get_file_content("event_issue1812_2.ics"))
self.put("/test/event2.ics/", get_file_content("event_issue1812_3.ics"))
request = f"""
<c:calendar-query xmlns:c="urn:ietf:params:xml:ns:caldav" xmlns:cs="http://calendarserver.org/ns/" xmlns:ca="http://apple.com/ns/ical/" xmlns:d="DAV:">
request = """
<c:calendar-query xmlns:c="urn:ietf:params:xml:ns:caldav" xmlns:d="DAV:">
<d:prop>
<d:getetag/>
<c:calendar-data>
@ -504,6 +504,9 @@ permissions: RrWw""")
status, event1_calendar_data = responses["/test/event.ics"]["C:calendar-data"]
assert event1_calendar_data.text
assert "UID:a07cfa8b-0ce6-4956-800d-c0bfe1f0730a" in event1_calendar_data.text
assert "RECURRENCE-ID:20250716" in event1_calendar_data.text
assert "RECURRENCE-ID:20250723" in event1_calendar_data.text
assert "RECURRENCE-ID:20250730" in event1_calendar_data.text
assert "C:calendar-data" in responses["/test/event2.ics"]
status, event2_calendar_data = responses["/test/event2.ics"]["C:calendar-data"]