<!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>[13350] 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/13350">13350</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2014-04-21 12:55:16 -0700 (Mon, 21 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Allow splitting using client supplied past-UID.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkrequirementsdevtxt">CalendarServer/trunk/requirements-dev.txt</a></li>
<li><a href="#CalendarServertrunktwistedcaldavstorebridgepy">CalendarServer/trunk/twistedcaldav/storebridge.py</a></li>
<li><a href="#CalendarServertrunktxdavcaldavdatastoresqlpy">CalendarServer/trunk/txdav/caldav/datastore/sql.py</a></li>
<li><a href="#CalendarServertrunktxdavcaldavdatastoretesttest_sqlpy">CalendarServer/trunk/txdav/caldav/datastore/test/test_sql.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunkrequirementsdevtxt"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/requirements-dev.txt (13349 => 13350)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/requirements-dev.txt 2014-04-21 19:50:13 UTC (rev 13349)
+++ CalendarServer/trunk/requirements-dev.txt 2014-04-21 19:55:16 UTC (rev 13350)
</span><span class="lines">@@ -7,4 +7,4 @@
</span><span class="cx"> mockldap
</span><span class="cx"> q
</span><span class="cx"> --editable svn+http://svn.calendarserver.org/repository/calendarserver/CalDAVClientLibrary/trunk@13311#egg=CalDAVClientLibrary
</span><del>---editable svn+http://svn.calendarserver.org/repository/calendarserver/CalDAVTester/trunk@13342#egg=CalDAVTester
</del><ins>+--editable svn+http://svn.calendarserver.org/repository/calendarserver/CalDAVTester/trunk@13349#egg=CalDAVTester
</ins></span></pre></div>
<a id="CalendarServertrunktwistedcaldavstorebridgepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/storebridge.py (13349 => 13350)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/storebridge.py 2014-04-21 19:50:13 UTC (rev 13349)
+++ CalendarServer/trunk/twistedcaldav/storebridge.py 2014-04-21 19:55:16 UTC (rev 13350)
</span><span class="lines">@@ -3025,8 +3025,14 @@
</span><span class="cx"> (caldav_namespace, "valid-rid-parameter",),
</span><span class="cx"> "The rid parameter in the request-URI contains an invalid value",
</span><span class="cx"> ))
</span><ins>+
+ # Client may provide optional UID for the split-off past component
+ pastUID = request.args.get("uid")
+ if pastUID is not None:
+ pastUID = pastUID[0]
+
</ins><span class="cx"> try:
</span><del>- otherStoreObject = yield self._newStoreObject.splitAt(rid)
</del><ins>+ otherStoreObject = yield self._newStoreObject.splitAt(rid, pastUID)
</ins><span class="cx"> except InvalidSplit:
</span><span class="cx"> raise HTTPError(ErrorResponse(
</span><span class="cx"> FORBIDDEN,
</span></span></pre></div>
<a id="CalendarServertrunktxdavcaldavdatastoresqlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/sql.py (13349 => 13350)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/sql.py 2014-04-21 19:50:13 UTC (rev 13349)
+++ CalendarServer/trunk/txdav/caldav/datastore/sql.py 2014-04-21 19:55:16 UTC (rev 13350)
</span><span class="lines">@@ -3898,7 +3898,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><del>- def splitAt(self, rid):
</del><ins>+ def splitAt(self, rid, pastUID=None):
</ins><span class="cx"> """
</span><span class="cx"> User initiated split. We need to verify it is OK to do so first. We will allow any recurring item to
</span><span class="cx"> be split, but will not allow attendees to split invites.
</span><span class="lines">@@ -3906,6 +3906,8 @@
</span><span class="cx"> @param rid: the date-time where the split should occur. This need not be a specific instance
</span><span class="cx"> date-time - this method will choose the next instance on or after this value.
</span><span class="cx"> @type rid: L{DateTime}
</span><ins>+ @param pastuid: the UID of the new (past) resource to be created
+ @type pastuid: L{str}
</ins><span class="cx"> """
</span><span class="cx">
</span><span class="cx"> # Must be recurring
</span><span class="lines">@@ -3927,7 +3929,7 @@
</span><span class="cx"> raise InvalidSplit()
</span><span class="cx">
</span><span class="cx"> # Do split and return new resource
</span><del>- olderObject = yield self.split(rid=rid)
</del><ins>+ olderObject = yield self.split(rid=rid, olderUID=pastUID)
</ins><span class="cx"> returnValue(olderObject)
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -3970,6 +3972,9 @@
</span><span class="cx"> newerUID = calendar.resourceUID()
</span><span class="cx"> if olderUID is None:
</span><span class="cx"> olderUID = str(uuid.uuid4())
</span><ins>+ olderResourceName = olderUID
+ else:
+ olderResourceName = "{0}.ics".format(olderUID.encode("base64")[:-1].rstrip("="))
</ins><span class="cx">
</span><span class="cx"> # Now process this resource, but do implicit scheduling for attendees not hosted on this server.
</span><span class="cx"> # We need to do this before processing attendee copies.
</span><span class="lines">@@ -3986,7 +3991,7 @@
</span><span class="cx"> # Store changed data
</span><span class="cx"> yield self._setComponentInternal(calendar_new, internal_state=ComponentUpdateState.SPLIT_OWNER, split_details=(rid, olderUID, True,))
</span><span class="cx"> olderObject = yield self.calendar()._createCalendarObjectWithNameInternal(
</span><del>- "{0}.ics".format(olderUID,),
</del><ins>+ olderResourceName,
</ins><span class="cx"> calendar_old,
</span><span class="cx"> ComponentUpdateState.SPLIT_OWNER,
</span><span class="cx"> split_details=(rid, newerUID, False,)
</span></span></pre></div>
<a id="CalendarServertrunktxdavcaldavdatastoretesttest_sqlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/test/test_sql.py (13349 => 13350)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/test/test_sql.py 2014-04-21 19:50:13 UTC (rev 13349)
+++ CalendarServer/trunk/txdav/caldav/datastore/test/test_sql.py 2014-04-21 19:55:16 UTC (rev 13350)
</span><span class="lines">@@ -6280,3 +6280,82 @@
</span><span class="cx"> cobjs = yield cal.calendarObjects()
</span><span class="cx"> self.assertEqual(len(cobjs), 1)
</span><span class="cx"> yield self.failUnlessFailure(cobjs[0].splitAt(DateTime.parseText("%(now_fwd25)s" % self.subs)), InvalidSplit)
</span><ins>+
+
+ @inlineCallbacks
+ def test_calendarObjectSplit_splitat_ok_pastuid(self):
+ """
+ Test that user triggered splitting of calendar objects works.
+ """
+
+ pastUID = "XXXX-YYYY-ZZZZ"
+ data_future, data_past, data_future2, data_past2, data_inbox2 = yield self._setupSplitAt()
+
+ # Update it
+ cobj = yield self.calendarObjectUnderTest(name="data1.ics", calendar_name="calendar", home="user01")
+ oldobj = yield cobj.splitAt(DateTime.parseText("%(now_back14)s" % self.subs), pastUID=pastUID)
+ oldname = oldobj.name()
+ self.assertFalse(hasattr(cobj, "_workItems"))
+ yield self.commit()
+
+ w = schema.CALENDAR_OBJECT_SPLITTER_WORK
+ rows = yield Select(
+ [w.RESOURCE_ID, ],
+ From=w
+ ).on(self.transactionUnderTest())
+ self.assertEqual(len(rows), 0)
+ yield self.abort()
+
+ rows = yield Select(
+ [w.RESOURCE_ID, ],
+ From=w
+ ).on(self.transactionUnderTest())
+ self.assertEqual(len(rows), 0)
+ yield self.abort()
+
+ # Get the existing and new object data
+ cobj1 = yield self.calendarObjectUnderTest(name="data1.ics", calendar_name="calendar", home="user01")
+ self.assertTrue(cobj1.isScheduleObject)
+ ical1 = yield cobj1.component()
+ relID = ical1.masterComponent().propertyValue("RELATED-TO")
+
+ cobj2 = yield self.calendarObjectUnderTest(name=oldname, calendar_name="calendar", home="user01")
+ self.assertTrue(cobj2 is not None)
+ self.assertTrue(cobj2.isScheduleObject)
+ ical2 = yield cobj2.component()
+ newUID = ical2.masterComponent().propertyValue("UID")
+
+ self.assertEqual(newUID, pastUID)
+
+ ical_future = yield cobj1.component()
+ ical_past = yield cobj2.component()
+
+ # Verify user01 data
+ title = "user01"
+ relsubs = dict(self.subs)
+ relsubs["uid"] = newUID
+ relsubs["relID"] = relID
+ self.assertEqual(normalize_iCalStr(ical_future), normalize_iCalStr(data_future) % relsubs, "Failed future: %s" % (title,))
+ self.assertEqual(normalize_iCalStr(ical_past), normalize_iCalStr(data_past) % relsubs, "Failed past: %s" % (title,))
+
+ # Get user02 data
+ cal = yield self.calendarUnderTest(name="calendar", home="user02")
+ cobjs = yield cal.calendarObjects()
+ self.assertEqual(len(cobjs), 2)
+ for cobj in cobjs:
+ ical = yield cobj.component()
+ if ical.resourceUID() == "12345-67890":
+ ical_future = ical
+ else:
+ ical_past = ical
+
+ cal = yield self.calendarUnderTest(name="inbox", home="user02")
+ cobjs = yield cal.calendarObjects()
+ self.assertEqual(len(cobjs), 1)
+ ical_inbox = yield cobjs[0].component()
+
+ # Verify user02 data
+ title = "user02"
+ self.assertEqual(normalize_iCalStr(ical_future), normalize_iCalStr(data_future2) % relsubs, "Failed future: %s" % (title,))
+ self.assertEqual(normalize_iCalStr(ical_past), normalize_iCalStr(data_past2) % relsubs, "Failed past: %s" % (title,))
+ self.assertEqual(normalize_iCalStr(ical_inbox), normalize_iCalStr(data_inbox2) % relsubs, "Failed inbox: %s" % (title,))
</ins></span></pre>
</div>
</div>
</body>
</html>