<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[13983] CalendarServer/branches/release/CalendarServer-6.0-dev/txdav</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.calendarserver.org//changeset/13983">13983</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2014-09-19 14:05:34 -0700 (Fri, 19 Sep 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make sure reconciled group attendees receive all split scheduling messages.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServerbranchesreleaseCalendarServer60devtxdavcaldavdatastoresqlpy">CalendarServer/branches/release/CalendarServer-6.0-dev/txdav/caldav/datastore/sql.py</a></li>
<li><a href="#CalendarServerbranchesreleaseCalendarServer60devtxdavwhotesttest_group_attendeespy">CalendarServer/branches/release/CalendarServer-6.0-dev/txdav/who/test/test_group_attendees.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServerbranchesreleaseCalendarServer60devtxdavcaldavdatastoresqlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/release/CalendarServer-6.0-dev/txdav/caldav/datastore/sql.py (13982 => 13983)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/release/CalendarServer-6.0-dev/txdav/caldav/datastore/sql.py 2014-09-19 21:01:09 UTC (rev 13982)
+++ CalendarServer/branches/release/CalendarServer-6.0-dev/txdav/caldav/datastore/sql.py 2014-09-19 21:05:34 UTC (rev 13983)
</span><span class="lines">@@ -2526,7 +2526,7 @@
</span><span class="cx"> break_point = DateTime.getToday() + Duration(seconds=config.GroupAttendees.AutoUpdateSecondsFromNow)
</span><span class="cx"> rid = splitter.whereSplit(component, break_point=break_point)
</span><span class="cx"> if rid is not None:
</span><del>- yield self.split(onlyThis=True, rid=rid)
</del><ins>+ yield self.split(onlyThis=False, rid=rid)
</ins><span class="cx">
</span><span class="cx"> # remove group link to ensure update (update to unknown hash would work too)
</span><span class="cx"> # FIXME: its possible that more than one group id gets updated during this single work item, so we
</span></span></pre></div>
<a id="CalendarServerbranchesreleaseCalendarServer60devtxdavwhotesttest_group_attendeespy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/release/CalendarServer-6.0-dev/txdav/who/test/test_group_attendees.py (13982 => 13983)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/release/CalendarServer-6.0-dev/txdav/who/test/test_group_attendees.py 2014-09-19 21:01:09 UTC (rev 13982)
+++ CalendarServer/branches/release/CalendarServer-6.0-dev/txdav/who/test/test_group_attendees.py 2014-09-19 21:05:34 UTC (rev 13983)
</span><span class="lines">@@ -1099,6 +1099,26 @@
</span><span class="cx"> END:VCALENDAR
</span><span class="cx"> """
</span><span class="cx">
</span><ins>+ data_get_1_user01 = """BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+BEGIN:VEVENT
+UID:event1@ninevah.local
+DTSTART:20120101T100000Z
+DURATION:PT1H
+ATTENDEE;CN=User 02;EMAIL=user02@example.com;RSVP=TRUE:urn:x-uid:user02
+ATTENDEE;CN=Group 01;CUTYPE=X-SERVER-GROUP;EMAIL=group01@example.com:urn:x-uid:group01
+ATTENDEE;CN=User 01;EMAIL=user01@example.com;MEMBER="urn:x-uid:group01";PARTSTAT=NEEDS-ACTION;RSVP=TRUE:urn:x-uid:user01
+CREATED:20060101T150000Z
+ORGANIZER;CN=User 02;EMAIL=user02@example.com:urn:x-uid:user02
+RRULE:FREQ=DAILY;UNTIL=20240101T100000
+SUMMARY:event 1
+TRANSP:TRANSPARENT
+END:VEVENT
+END:VCALENDAR
+"""
+
</ins><span class="cx"> data_get_2 = """BEGIN:VCALENDAR
</span><span class="cx"> VERSION:2.0
</span><span class="cx"> CALSCALE:GREGORIAN
</span><span class="lines">@@ -1134,6 +1154,45 @@
</span><span class="cx"> END:VCALENDAR
</span><span class="cx"> """
</span><span class="cx">
</span><ins>+ data_get_2_user01 = """BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+BEGIN:VEVENT
+UID:event1@ninevah.local
+{start}DURATION:PT1H
+ATTENDEE;CN=User 02;EMAIL=user02@example.com;RSVP=TRUE:urn:x-uid:user02
+ATTENDEE;CN=Group 01;CUTYPE=X-SERVER-GROUP;EMAIL=group01@example.com:urn:x-uid:group01
+ATTENDEE;CN=User 01;EMAIL=user01@example.com;MEMBER="urn:x-uid:group01";PARTSTAT=NEEDS-ACTION;RSVP=TRUE:urn:x-uid:user01
+CREATED:20060101T150000Z
+ORGANIZER;CN=User 02;EMAIL=user02@example.com:urn:x-uid:user02
+{relatedTo}RRULE:FREQ=DAILY;UNTIL=20240101T100000
+SEQUENCE:2
+STATUS:CANCELLED
+SUMMARY:event 1
+TRANSP:TRANSPARENT
+END:VEVENT
+END:VCALENDAR
+"""
+ data_get_3_user01 = """BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+BEGIN:VEVENT
+{uid}DTSTART:20120101T100000Z
+DURATION:PT1H
+ATTENDEE;CN=User 02;EMAIL=user02@example.com;RSVP=TRUE:urn:x-uid:user02
+ATTENDEE;CN=Group 01;CUTYPE=X-SERVER-GROUP;EMAIL=group01@example.com:urn:x-uid:group01
+ATTENDEE;CN=User 01;EMAIL=user01@example.com;MEMBER="urn:x-uid:group01";PARTSTAT=NEEDS-ACTION;RSVP=TRUE:urn:x-uid:user01
+CREATED:20060101T150000Z
+ORGANIZER;CN=User 02;EMAIL=user02@example.com:urn:x-uid:user02
+{relatedTo}{rule}SEQUENCE:1
+SUMMARY:event 1
+TRANSP:TRANSPARENT
+END:VEVENT
+END:VCALENDAR
+"""
+
</ins><span class="cx"> @inlineCallbacks
</span><span class="cx"> def expandedMembers(self, records=None, seen=None):
</span><span class="cx"> yield None
</span><span class="lines">@@ -1150,7 +1209,12 @@
</span><span class="cx"> vcalendar = yield cobj.component()
</span><span class="cx"> self.assertEqual(normalize_iCalStr(vcalendar), normalize_iCalStr(data_get_1))
</span><span class="cx">
</span><del>- yield self._verifyObjectResourceCount("user01", 1)
</del><ins>+ cal = yield self.calendarUnderTest(name="calendar", home="user01")
+ cobjs = yield cal.objectResources()
+ self.assertEqual(len(cobjs), 1)
+ vcalendar = yield cobjs[0].componentForUser()
+ self.assertEqual(normalize_iCalStr(vcalendar), normalize_iCalStr(data_get_1_user01))
+ user01_cname = cobjs[0].name()
</ins><span class="cx">
</span><span class="cx"> self.patch(CalendarDirectoryRecordMixin, "expandedMembers", expandedMembers)
</span><span class="cx">
</span><span class="lines">@@ -1166,43 +1230,51 @@
</span><span class="cx"> for component in vcalendar.subcomponents():
</span><span class="cx"> if component.name() in ignoredComponents:
</span><span class="cx"> continue
</span><del>- relatedTo = component.getProperty("RELATED-TO")
- start = component.getProperty("DTSTART")
- rule = component.getProperty("RRULE")
- uid = component.getProperty("UID")
</del><ins>+ props = {
+ "relatedTo": component.getProperty("RELATED-TO"),
+ "start": component.getProperty("DTSTART"),
+ "rule": component.getProperty("RRULE"),
+ "uid": component.getProperty("UID"),
+ }
</ins><span class="cx"> break
</span><span class="cx">
</span><span class="cx"> if cobj.name() == "data1.ics":
</span><span class="cx"> self.assertEqual(
</span><span class="cx"> normalize_iCalStr(vcalendar),
</span><span class="cx"> normalize_iCalStr(
</span><del>- data_get_2.format(
- start=start,
- relatedTo=relatedTo,
- )
</del><ins>+ data_get_2.format(**props)
</ins><span class="cx"> )
</span><span class="cx"> )
</span><ins>+ props_orig = props
</ins><span class="cx"> else:
</span><span class="cx"> self.assertEqual(
</span><span class="cx"> normalize_iCalStr(vcalendar),
</span><span class="cx"> normalize_iCalStr(
</span><del>- data_get_3.format(
- relatedTo=relatedTo,
- rule=rule,
- uid=uid
- )
</del><ins>+ data_get_3.format(**props)
</ins><span class="cx"> )
</span><span class="cx"> )
</span><ins>+ props_new = props
</ins><span class="cx">
</span><del>- # TODO: add some meaningful test
- '''
</del><span class="cx"> cal = yield self.calendarUnderTest(name="calendar", home="user01")
</span><span class="cx"> cobjs = yield cal.objectResources()
</span><span class="cx"> for cobj in cobjs:
</span><del>- vcalendar = yield cobj.component()
- print("vcalendar = %s" % (vcalendar,))
- '''
</del><ins>+ vcalendar = yield cobj.componentForUser()
+ if cobj.name() == user01_cname:
+ self.assertEqual(
+ normalize_iCalStr(vcalendar),
+ normalize_iCalStr(
+ data_get_2_user01.format(**props_orig)
+ )
+ )
+ else:
+ self.assertEqual(
+ normalize_iCalStr(vcalendar),
+ normalize_iCalStr(
+ data_get_3_user01.format(**props_new)
+ )
+ )
</ins><span class="cx">
</span><ins>+
</ins><span class="cx"> @inlineCallbacks
</span><span class="cx"> def test_groupChangeLargerSpanningEvent(self):
</span><span class="cx"> """
</span><span class="lines">@@ -1263,6 +1335,7 @@
</span><span class="cx"> END:VEVENT
</span><span class="cx"> END:VCALENDAR
</span><span class="cx"> """
</span><ins>+
</ins><span class="cx"> data_get_3 = """BEGIN:VCALENDAR
</span><span class="cx"> VERSION:2.0
</span><span class="cx"> CALSCALE:GREGORIAN
</span><span class="lines">@@ -1280,6 +1353,27 @@
</span><span class="cx"> END:VCALENDAR
</span><span class="cx"> """
</span><span class="cx">
</span><ins>+ data_get_2_user01 = """BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+BEGIN:VEVENT
+UID:event1@ninevah.local
+{start}DURATION:PT1H
+ATTENDEE;CN=User 02;EMAIL=user02@example.com;RSVP=TRUE:urn:x-uid:user02
+ATTENDEE;CN=Group 01;CUTYPE=X-SERVER-GROUP;EMAIL=group01@example.com:urn:x-uid:group01
+ATTENDEE;CN=User 01;EMAIL=user01@example.com;MEMBER="urn:x-uid:group01";PARTSTAT=NEEDS-ACTION;RSVP=TRUE:urn:x-uid:user01
+CREATED:20060101T150000Z
+ORGANIZER;CN=User 02;EMAIL=user02@example.com:urn:x-uid:user02
+{relatedTo}RRULE:FREQ=DAILY;UNTIL=20240101T100000
+SEQUENCE:2
+SUMMARY:event 1
+TRANSP:TRANSPARENT
+END:VEVENT
+END:VCALENDAR
+"""
+
+
</ins><span class="cx"> @inlineCallbacks
</span><span class="cx"> def expandedMembers(self, records=None, seen=None):
</span><span class="cx"> yield None
</span><span class="lines">@@ -1315,44 +1409,40 @@
</span><span class="cx"> for component in vcalendar.subcomponents():
</span><span class="cx"> if component.name() in ignoredComponents:
</span><span class="cx"> continue
</span><del>- relatedTo = component.getProperty("RELATED-TO")
- start = component.getProperty("DTSTART")
- rule = component.getProperty("RRULE")
- uid = component.getProperty("UID")
</del><ins>+ props = {
+ "relatedTo": component.getProperty("RELATED-TO"),
+ "start": component.getProperty("DTSTART"),
+ "rule": component.getProperty("RRULE"),
+ "uid": component.getProperty("UID"),
+ }
</ins><span class="cx"> break
</span><span class="cx">
</span><span class="cx"> if cobj.name() == "data1.ics":
</span><span class="cx"> self.assertEqual(
</span><span class="cx"> normalize_iCalStr(vcalendar),
</span><span class="cx"> normalize_iCalStr(
</span><del>- data_get_2.format(
- start=start,
- relatedTo=relatedTo,
- )
</del><ins>+ data_get_2.format(**props)
</ins><span class="cx"> )
</span><span class="cx"> )
</span><ins>+ props_orig = props
</ins><span class="cx"> else:
</span><span class="cx"> self.assertEqual(
</span><span class="cx"> normalize_iCalStr(vcalendar),
</span><span class="cx"> normalize_iCalStr(
</span><del>- data_get_3.format(
- relatedTo=relatedTo,
- rule=rule,
- uid=uid
- )
</del><ins>+ data_get_3.format(**props)
</ins><span class="cx"> )
</span><span class="cx"> )
</span><span class="cx">
</span><del>- yield self._verifyObjectResourceCount("user01", 1)
- # TODO: add some meaningful test
- '''
</del><span class="cx"> cal = yield self.calendarUnderTest(name="calendar", home="user01")
</span><span class="cx"> cobjs = yield cal.objectResources()
</span><del>- for cobj in cobjs:
- vcalendar = yield cobj.component()
- print("vcalendar = %s" % (vcalendar,))
- '''
</del><ins>+ self.assertEqual(len(cobjs), 1)
+ vcalendar = yield cobjs[0].componentForUser()
+ self.assertEqual(
+ normalize_iCalStr(vcalendar),
+ normalize_iCalStr(data_get_2_user01.format(**props_orig))
+ )
</ins><span class="cx">
</span><ins>+
</ins><span class="cx"> @inlineCallbacks
</span><span class="cx"> def test_groupRemovalFromDirectory(self):
</span><span class="cx"> """
</span></span></pre>
</div>
</div>
</body>
</html>