<!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>[13338] CalendarServer/trunk</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/13338">13338</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2014-04-19 09:02:21 -0700 (Sat, 19 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make sure group attendee changes always trigger implicit scheduling. Fix a few related tests.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunktwistedcaldavicalpy">CalendarServer/trunk/twistedcaldav/ical.py</a></li>
<li><a href="#CalendarServertrunktxdavcaldavdatastoreschedulingimplicitpy">CalendarServer/trunk/txdav/caldav/datastore/scheduling/implicit.py</a></li>
<li><a href="#CalendarServertrunktxdavcaldavdatastoresqlpy">CalendarServer/trunk/txdav/caldav/datastore/sql.py</a></li>
<li><a href="#CalendarServertrunktxdavwhogroupspy">CalendarServer/trunk/txdav/who/groups.py</a></li>
<li><a href="#CalendarServertrunktxdavwhotesttest_group_attendeespy">CalendarServer/trunk/txdav/who/test/test_group_attendees.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunktwistedcaldavicalpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/ical.py (13337 => 13338)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/ical.py 2014-04-19 14:31:27 UTC (rev 13337)
+++ CalendarServer/trunk/twistedcaldav/ical.py 2014-04-19 16:02:21 UTC (rev 13338)
</span><span class="lines">@@ -3411,7 +3411,7 @@
</span><span class="cx"> memberCUAs = set()
</span><span class="cx"> for newAttendeeProp in memberAtttendeeProps:
</span><span class="cx"> memberCUA = newAttendeeProp.value()
</span><del>- if newAttendeeProp.value() not in oldAttendeeCUAs:
</del><ins>+ if memberCUA not in oldAttendeeCUAs:
</ins><span class="cx"> component.addProperty(newAttendeeProp)
</span><span class="cx"> changed = True
</span><span class="cx"> memberCUAs.add(memberCUA)
</span></span></pre></div>
<a id="CalendarServertrunktxdavcaldavdatastoreschedulingimplicitpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/scheduling/implicit.py (13337 => 13338)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/scheduling/implicit.py 2014-04-19 14:31:27 UTC (rev 13337)
+++ CalendarServer/trunk/txdav/caldav/datastore/scheduling/implicit.py 2014-04-19 16:02:21 UTC (rev 13338)
</span><span class="lines">@@ -508,20 +508,32 @@
</span><span class="cx"> "Only one organizer allowed in scheduling object resource",
</span><span class="cx"> ))
</span><span class="cx">
</span><ins>+ # Attendee details
+ yield self.extractAttendees()
+
+ # Some other useful things
+ self.uid = self.calendar.resourceUID()
+ self.instances = set(self.calendar.getComponentInstances())
+
+
+ @inlineCallbacks
+ def extractAttendees(self):
+ """
+ Extract details about the attendees from the new calendar data. We do this
+ in its own method because we might need to refresh this information if the attendee
+ list changes after a test_X call but before scheduling itself needs to happen. That
+ can occur when group attendee reconciliation occurs.
+ """
</ins><span class="cx"> # Coerce any local with SCHEDULE-AGENT=CLIENT
</span><span class="cx"> yield self.coerceAttendeeScheduleAgent()
</span><span class="cx">
</span><span class="cx"> # Get the ATTENDEEs
</span><span class="cx"> self.attendeesByInstance = self.calendar.getAttendeesByInstance(True, onlyScheduleAgentServer=True)
</span><del>- self.instances = set(self.calendar.getComponentInstances())
</del><span class="cx"> self.attendees = set()
</span><span class="cx"> for attendee, _ignore in self.attendeesByInstance:
</span><span class="cx"> self.attendees.add(attendee)
</span><span class="cx">
</span><del>- # Some other useful things
- self.uid = self.calendar.resourceUID()
</del><span class="cx">
</span><del>-
</del><span class="cx"> @inlineCallbacks
</span><span class="cx"> def hasCalendarResourceUIDSomewhereElse(self, check_resource, mode):
</span><span class="cx"> """
</span></span></pre></div>
<a id="CalendarServertrunktxdavcaldavdatastoresqlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/sql.py (13337 => 13338)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/sql.py 2014-04-19 14:31:27 UTC (rev 13337)
+++ CalendarServer/trunk/txdav/caldav/datastore/sql.py 2014-04-19 16:02:21 UTC (rev 13338)
</span><span class="lines">@@ -2447,7 +2447,9 @@
</span><span class="cx">
</span><span class="cx"> # group attendees
</span><span class="cx"> if scheduler.state == "organizer":
</span><del>- yield self.reconcileGroupAttendees(component, inserting)
</del><ins>+ changed = yield self.reconcileGroupAttendees(component, inserting)
+ if changed:
+ yield scheduler.extractAttendees()
</ins><span class="cx">
</span><span class="cx"> # Set an attribute on this object to indicate that it is valid to check for an event split. We need to do this here so that if a timeout
</span><span class="cx"> # occurs whilst doing implicit processing (most likely because the event is too big) we are able to subsequently detect that it is OK
</span></span></pre></div>
<a id="CalendarServertrunktxdavwhogroupspy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/who/groups.py (13337 => 13338)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/who/groups.py 2014-04-19 14:31:27 UTC (rev 13337)
+++ CalendarServer/trunk/txdav/who/groups.py 2014-04-19 16:02:21 UTC (rev 13338)
</span><span class="lines">@@ -182,7 +182,7 @@
</span><span class="cx"> component = component.duplicate()
</span><span class="cx">
</span><span class="cx"> # sync group attendees
</span><del>- if calendarObject.reconcileGroupAttendees(component):
</del><ins>+ if (yield calendarObject.reconcileGroupAttendees(component)):
</ins><span class="cx"> yield calendarObject.setComponent(component)
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktxdavwhotesttest_group_attendeespy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/who/test/test_group_attendees.py (13337 => 13338)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/who/test/test_group_attendees.py 2014-04-19 14:31:27 UTC (rev 13337)
+++ CalendarServer/trunk/txdav/who/test/test_group_attendees.py 2014-04-19 16:02:21 UTC (rev 13338)
</span><span class="lines">@@ -444,6 +444,24 @@
</span><span class="cx"> END:VCALENDAR
</span><span class="cx"> """
</span><span class="cx">
</span><ins>+ data_get_4 = """BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+BEGIN:VEVENT
+UID:event1@ninevah.local
+DTSTART;TZID=US/Eastern:20140101T100000
+DURATION:PT1H
+ATTENDEE;CN=User 02;EMAIL=user02@example.com;RSVP=TRUE:urn:x-uid:10000000-0000-0000-0000-000000000002
+ATTENDEE;CN=Group 01;CUTYPE=GROUP;EMAIL=group01@example.com;RSVP=TRUE;SCHEDULE-STATUS=3.7:urn:x-uid:20000000-0000-0000-0000-000000000001
+CREATED:20060101T150000Z
+ORGANIZER;CN=User 02;EMAIL=user02@example.com:urn:x-uid:10000000-0000-0000-0000-000000000002
+SEQUENCE:2
+SUMMARY:event 1
+END:VEVENT
+END:VCALENDAR
+"""
+
</ins><span class="cx"> @inlineCallbacks
</span><span class="cx"> def expandedMembers(self, records=None):
</span><span class="cx"> yield None
</span><span class="lines">@@ -490,7 +508,7 @@
</span><span class="cx">
</span><span class="cx"> cobj1 = yield self.calendarObjectUnderTest(name="data1.ics", calendar_name="calendar", home="10000000-0000-0000-0000-000000000002")
</span><span class="cx"> vcalendar3 = yield cobj1.component()
</span><del>- self.assertEqual(normalize_iCalStr(vcalendar3), normalize_iCalStr(data_get_2))
</del><ins>+ self.assertEqual(normalize_iCalStr(vcalendar3), normalize_iCalStr(data_get_4))
</ins><span class="cx">
</span><span class="cx"> cal1 = yield self.calendarUnderTest(name="calendar", home="10000000-0000-0000-0000-000000000001")
</span><span class="cx"> cobjs = yield cal1.objectResources()
</span></span></pre>
</div>
</div>
</body>
</html>