<!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>[14976] CalendarServer/branches/release/CalendarServer-5.4-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/14976">14976</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2015-07-16 12:53:36 -0700 (Thu, 16 Jul 2015)</dd>
</dl>

<h3>Log Message</h3>
<pre>Fix for missing organizer record during attendee refresh.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServerbranchesreleaseCalendarServer54devtxdavcaldavdatastoreschedulingimplicitpy">CalendarServer/branches/release/CalendarServer-5.4-dev/txdav/caldav/datastore/scheduling/implicit.py</a></li>
<li><a href="#CalendarServerbranchesreleaseCalendarServer54devtxdavcaldavdatastoreschedulingtesttest_implicitpy">CalendarServer/branches/release/CalendarServer-5.4-dev/txdav/caldav/datastore/scheduling/test/test_implicit.py</a></li>
<li><a href="#CalendarServerbranchesreleaseCalendarServer54devtxdavcommondatastoretestutilpy">CalendarServer/branches/release/CalendarServer-5.4-dev/txdav/common/datastore/test/util.py</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServerbranchesreleaseCalendarServer54devtxdavcaldavdatastoreschedulingimplicitpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/release/CalendarServer-5.4-dev/txdav/caldav/datastore/scheduling/implicit.py (14975 => 14976)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/release/CalendarServer-5.4-dev/txdav/caldav/datastore/scheduling/implicit.py        2015-07-16 19:02:35 UTC (rev 14975)
+++ CalendarServer/branches/release/CalendarServer-5.4-dev/txdav/caldav/datastore/scheduling/implicit.py        2015-07-16 19:53:36 UTC (rev 14976)
</span><span class="lines">@@ -427,7 +427,10 @@
</span><span class="cx">         self.originatorPrincipal = self.calendar_home.directoryService().recordWithUID(self.calendar_home.uid())
</span><span class="cx"> 
</span><span class="cx">         # Pick the canonical CUA:
</span><del>-        self.originator = self.originatorPrincipal.canonicalCalendarUserAddress()
</del><ins>+        if self.originatorPrincipal is not None:
+            self.originator = self.originatorPrincipal.canonicalCalendarUserAddress()
+        else:
+            self.originator = &quot;urn:uuid:{}&quot;.format(self.calendar_home.uid())
</ins><span class="cx"> 
</span><span class="cx">         # Get the ORGANIZER and verify it is the same for all components
</span><span class="cx">         try:
</span></span></pre></div>
<a id="CalendarServerbranchesreleaseCalendarServer54devtxdavcaldavdatastoreschedulingtesttest_implicitpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/release/CalendarServer-5.4-dev/txdav/caldav/datastore/scheduling/test/test_implicit.py (14975 => 14976)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/release/CalendarServer-5.4-dev/txdav/caldav/datastore/scheduling/test/test_implicit.py        2015-07-16 19:02:35 UTC (rev 14975)
+++ CalendarServer/branches/release/CalendarServer-5.4-dev/txdav/caldav/datastore/scheduling/test/test_implicit.py        2015-07-16 19:53:36 UTC (rev 14976)
</span><span class="lines">@@ -40,6 +40,7 @@
</span><span class="cx"> 
</span><span class="cx"> import hashlib
</span><span class="cx"> import sys
</span><ins>+from calendarserver.platform.darwin.od.opendirectory import Directory
</ins><span class="cx"> 
</span><span class="cx"> class FakeScheduler(object):
</span><span class="cx">     &quot;&quot;&quot;
</span><span class="lines">@@ -1563,6 +1564,91 @@
</span><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx">     @inlineCallbacks
</span><ins>+    def test_doImplicitScheduling_refreshAllAttendeesExceptSome_MissingOriginator(self):
+        &quot;&quot;&quot;
+        Test that doImplicitScheduling delivers scheduling messages to attendees who can then reply,
+        even in the case of a missing originator record.
+        &quot;&quot;&quot;
+
+        data1 = &quot;&quot;&quot;BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+BEGIN:VEVENT
+UID:12345-67890-attendee-reply
+DTSTAMP:20080601T120000Z
+DTSTART:20080601T120000Z
+DTEND:20080601T130000Z
+ORGANIZER;CN=&quot;User 01&quot;:mailto:user01@example.com
+ATTENDEE:mailto:user01@example.com
+ATTENDEE:mailto:user02@example.com
+ATTENDEE:mailto:user03@example.com
+END:VEVENT
+END:VCALENDAR
+&quot;&quot;&quot;
+        data2 = &quot;&quot;&quot;BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+BEGIN:VEVENT
+UID:12345-67890-attendee-reply
+DTSTAMP:20080601T120000Z
+DTSTART:20080601T120000Z
+DTEND:20080601T130000Z
+ORGANIZER;CN=&quot;User 01&quot;:mailto:user01@example.com
+ATTENDEE:mailto:user01@example.com
+ATTENDEE;PARTSTAT=ACCEPTED:mailto:user02@example.com
+ATTENDEE:mailto:user03@example.com
+END:VEVENT
+END:VCALENDAR
+&quot;&quot;&quot;
+
+        # Need refreshes to occur immediately, not via reactor.callLater
+        self.patch(config.Scheduling.Options, &quot;AttendeeRefreshBatch&quot;, False)
+
+        yield self._createCalendarObject(data1, &quot;user01&quot;, &quot;test.ics&quot;)
+
+        list1 = (yield self._listCalendarObjects(&quot;user01&quot;, &quot;inbox&quot;))
+        self.assertEqual(len(list1), 0)
+
+        calendar1 = (yield self._getCalendarData(&quot;user01&quot;, &quot;test.ics&quot;))
+        self.assertTrue(&quot;SCHEDULE-STATUS=1.2&quot; in calendar1)
+
+        list2 = (yield self._listCalendarObjects(&quot;user02&quot;, &quot;inbox&quot;))
+        self.assertEqual(len(list2), 1)
+
+        calendar2 = (yield self._getCalendarData(&quot;user02&quot;))
+        self.assertTrue(&quot;PARTSTAT=ACCEPTED&quot; not in calendar2)
+
+        list3 = (yield self._listCalendarObjects(&quot;user03&quot;, &quot;inbox&quot;))
+        self.assertEqual(len(list3), 1)
+
+        calendar3 = (yield self._getCalendarData(&quot;user03&quot;))
+        self.assertTrue(&quot;PARTSTAT=ACCEPTED&quot; not in calendar3)
+
+        self._sqlCalendarStore.directoryService().destroyRecord(&quot;user01&quot;)
+
+        yield self._setCalendarData(data2, &quot;user02&quot;)
+
+        list1 = (yield self._listCalendarObjects(&quot;user01&quot;, &quot;inbox&quot;))
+        self.assertEqual(len(list1), 1)
+
+        calendar1 = (yield self._getCalendarData(&quot;user01&quot;, &quot;test.ics&quot;))
+        self.assertTrue(&quot;SCHEDULE-STATUS=2.0&quot; in calendar1)
+        self.assertTrue(&quot;PARTSTAT=ACCEPTED&quot; in calendar1)
+
+        list2 = (yield self._listCalendarObjects(&quot;user02&quot;, &quot;inbox&quot;))
+        self.assertEqual(len(list2), 1)
+
+        calendar2 = (yield self._getCalendarData(&quot;user02&quot;))
+        self.assertTrue(&quot;PARTSTAT=ACCEPTED&quot; in calendar2)
+
+        list3 = (yield self._listCalendarObjects(&quot;user03&quot;, &quot;inbox&quot;))
+        self.assertEqual(len(list3), 1)
+
+        calendar3 = (yield self._getCalendarData(&quot;user03&quot;))
+        self.assertTrue(&quot;PARTSTAT=ACCEPTED&quot; in calendar3)
+
+
+    @inlineCallbacks
</ins><span class="cx">     def test_doImplicitScheduling_OrganizerEventTimezoneDST(self):
</span><span class="cx">         &quot;&quot;&quot;
</span><span class="cx">         Test that doImplicitScheduling delivers scheduling messages to attendees. This test
</span></span></pre></div>
<a id="CalendarServerbranchesreleaseCalendarServer54devtxdavcommondatastoretestutilpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/release/CalendarServer-5.4-dev/txdav/common/datastore/test/util.py (14975 => 14976)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/release/CalendarServer-5.4-dev/txdav/common/datastore/test/util.py        2015-07-16 19:02:35 UTC (rev 14975)
+++ CalendarServer/branches/release/CalendarServer-5.4-dev/txdav/common/datastore/test/util.py        2015-07-16 19:53:36 UTC (rev 14976)
</span><span class="lines">@@ -123,7 +123,11 @@
</span><span class="cx">         self.records[record.uid] = record
</span><span class="cx"> 
</span><span class="cx"> 
</span><ins>+    def destroyRecord(self, uid):
+        del self.records[uid]
</ins><span class="cx"> 
</span><ins>+
+
</ins><span class="cx"> class TestStoreDirectoryRecord(object):
</span><span class="cx"> 
</span><span class="cx">     implements(IStoreDirectoryRecord)
</span></span></pre>
</div>
</div>

</body>
</html>