<!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>[14475] CalendarServer/branches/users/sagen/trashcan-5/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/14475">14475</a></dd>
<dt>Author</dt> <dd>sagen@apple.com</dd>
<dt>Date</dt> <dd>2015-02-24 15:14:43 -0800 (Tue, 24 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Handle re-applying PARTSTATs when ATTENDEE moves an event from the trash</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServerbranchesuserssagentrashcan5txdavcaldavdatastoresqlpy">CalendarServer/branches/users/sagen/trashcan-5/txdav/caldav/datastore/sql.py</a></li>
<li><a href="#CalendarServerbranchesuserssagentrashcan5txdavcommondatastoretesttest_sqlpy">CalendarServer/branches/users/sagen/trashcan-5/txdav/common/datastore/test/test_sql.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServerbranchesuserssagentrashcan5txdavcaldavdatastoresqlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/trashcan-5/txdav/caldav/datastore/sql.py (14474 => 14475)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/trashcan-5/txdav/caldav/datastore/sql.py 2015-02-24 18:19:13 UTC (rev 14474)
+++ CalendarServer/branches/users/sagen/trashcan-5/txdav/caldav/datastore/sql.py 2015-02-24 23:14:43 UTC (rev 14475)
</span><span class="lines">@@ -4911,52 +4911,66 @@
</span><span class="cx"> yield super(CalendarObject, self).fromTrash()
</span><span class="cx">
</span><span class="cx"> caldata = yield self.componentForUser()
</span><del>- if caldata.getOrganizer():
</del><ins>+ organizer = caldata.getOrganizer()
+ if organizer:
</ins><span class="cx"> # This is a scheduled event
</span><span class="cx">
</span><del>- splitter = iCalSplitter()
- willSplit = splitter.willSplit(caldata)
- if willSplit:
- yield self.split(
- coercePartstatsInExistingResource=True,
- splitter=splitter
- )
- # original resource is the ongoing one,
- # the new resource is the past one
</del><ins>+ uid = self._parentCollection.viewerHome().uid()
+ organizerAddress = yield calendarUserFromCalendarUserAddress(organizer, self._txn)
</ins><span class="cx">
</span><del>- # Update the attendee's copy of the ongoing one
- yield ImplicitScheduler().refreshAllAttendeesExceptSome(
- self._txn,
- self,
- )
- else:
- now = DateTime.getNowUTC()
- now.setHHMMSS(0, 0, 0)
- instances = caldata.cacheExpandedTimeRanges(now)
- instances = sorted(instances.instances.values(), key=lambda x: x.start)
- if instances[0].start >= now:
- # future
- newdata = caldata.duplicate()
- newdata.bumpiTIPInfo(doSequence=True)
- for attendee in newdata.getAllAttendeeProperties():
- if attendee.parameterValue("SCHEDULE-AGENT", "SERVER").upper() == "SERVER" and attendee.hasParameter("PARTSTAT"):
- attendee.setParameter("PARTSTAT", "NEEDS-ACTION")
-
-
- yield self._setComponentInternal(
- newdata, inserting=True, updateSelf=True
</del><ins>+ if organizerAddress.record.uid == uid:
+ print("XYZZY ORGANIZER")
+ # If the ORGANIZER is moving the event from trash
+ splitter = iCalSplitter()
+ willSplit = splitter.willSplit(caldata)
+ if willSplit:
+ yield self.split(
+ coercePartstatsInExistingResource=True,
+ splitter=splitter
</ins><span class="cx"> )
</span><ins>+ # original resource is the ongoing one,
+ # the new resource is the past one
</ins><span class="cx">
</span><del>- else:
- # past
</del><ins>+ # Update the attendee's copy of the ongoing one
</ins><span class="cx"> yield ImplicitScheduler().refreshAllAttendeesExceptSome(
</span><span class="cx"> self._txn,
</span><span class="cx"> self,
</span><span class="cx"> )
</span><ins>+ else:
+ now = DateTime.getNowUTC()
+ now.setHHMMSS(0, 0, 0)
+ instances = caldata.cacheExpandedTimeRanges(now)
+ instances = sorted(instances.instances.values(), key=lambda x: x.start)
+ if instances[0].start >= now:
+ # future
+ newdata = caldata.duplicate()
+ newdata.bumpiTIPInfo(doSequence=True)
+ for attendee in newdata.getAllAttendeeProperties():
+ if attendee.parameterValue("SCHEDULE-AGENT", "SERVER").upper() == "SERVER" and attendee.hasParameter("PARTSTAT"):
+ attendee.setParameter("PARTSTAT", "NEEDS-ACTION")
</ins><span class="cx">
</span><span class="cx">
</span><ins>+ yield self._setComponentInternal(
+ newdata, inserting=True, updateSelf=True
+ )
</ins><span class="cx">
</span><ins>+ else:
+ # past
+ yield ImplicitScheduler().refreshAllAttendeesExceptSome(
+ self._txn,
+ self,
+ )
</ins><span class="cx">
</span><ins>+ else:
+ # If an ATTENDEE is moving the event from trash
+ print("XYZZY ATTENDEE")
+ yield ImplicitScheduler().sendAttendeeReply(
+ self._txn,
+ self
+ )
+
+
+
</ins><span class="cx"> class AttachmentStorageTransport(StorageTransportBase):
</span><span class="cx">
</span><span class="cx"> _TEMPORARY_UPLOADS_DIRECTORY = "Temporary"
</span></span></pre></div>
<a id="CalendarServerbranchesuserssagentrashcan5txdavcommondatastoretesttest_sqlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/trashcan-5/txdav/common/datastore/test/test_sql.py (14474 => 14475)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/trashcan-5/txdav/common/datastore/test/test_sql.py 2015-02-24 18:19:13 UTC (rev 14474)
+++ CalendarServer/branches/users/sagen/trashcan-5/txdav/common/datastore/test/test_sql.py 2015-02-24 23:14:43 UTC (rev 14475)
</span><span class="lines">@@ -903,7 +903,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><del>- def test_trashScheduledFullyInFutureAttendeeRemove(self):
</del><ins>+ def test_trashScheduledFullyInFutureAttendeeTrashedThenOrganizerChanged(self):
</ins><span class="cx">
</span><span class="cx"> from twistedcaldav.stdconfig import config
</span><span class="cx"> self.patch(config, "EnableTrashCollection", True)
</span><span class="lines">@@ -952,6 +952,26 @@
</span><span class="cx"> END:VCALENDAR
</span><span class="cx"> """ % subs
</span><span class="cx">
</span><ins>+
+ start.offsetHours(1)
+ end.offsetHours(1)
+
+ data3 = """BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+BEGIN:VEVENT
+UID:12345-67890-attendee-reply
+DTSTART;TZID=America/Los_Angeles:%(start)s
+DTEND;TZID=America/Los_Angeles:%(end)s
+DTSTAMP:20150204T192546Z
+SUMMARY:Scheduled
+ORGANIZER;CN="User 01":mailto:user01@example.com
+ATTENDEE:mailto:user01@example.com
+ATTENDEE:mailto:user02@example.com
+END:VEVENT
+END:VCALENDAR
+""" % subs
+
</ins><span class="cx"> # user01 invites user02
</span><span class="cx"> txn = self.store.newTransaction()
</span><span class="cx"> yield self._createResource(
</span><span class="lines">@@ -1030,11 +1050,211 @@
</span><span class="cx">
</span><span class="cx"> data = yield self._getResourceData(txn, "user02", "trash", "")
</span><span class="cx"> self.assertTrue("PARTSTAT=ACCEPTED" in data)
</span><ins>+ print("user02 trash copy before user01 updates it", data)
</ins><span class="cx">
</span><span class="cx"> yield txn.commit()
</span><span class="cx">
</span><ins>+ # user01 makes a change to event while user02's copy is in the trash
+ txn = self.store.newTransaction()
</ins><span class="cx">
</span><ins>+ yield self._updateResource(txn, "user01", "calendar", "test.ics", data3)
+ yield txn.commit()
+
+ yield JobItem.waitEmpty(self.store.newTransaction, reactor, 60)
+
+ txn = self.store.newTransaction()
+ data = yield self._getResourceData(txn, "user01", "calendar", "test.ics")
+ print("user01 calendar copy", data)
+
+ resourceNames = yield self._getResourceNames(txn, "user02", "trash")
+ print ("user02 trash", resourceNames)
+ data = yield self._getResourceData(txn, "user02", "trash", "")
+ print("user02 trash copy", data)
+
+
+ resourceNames = yield self._getResourceNames(txn, "user02", "calendar")
+ print ("user02 calendar", resourceNames)
+
+ # FIXME: user02 calendar should have the event!
+
+ resourceNames = yield self._getResourceNames(txn, "user02", "inbox")
+ print ("user02 inbox", resourceNames)
+ data = yield self._getResourceData(txn, "user02", "inbox", "")
+ print("user02 inbox copy", data)
+
+ yield txn.commit()
+
+
+
</ins><span class="cx"> @inlineCallbacks
</span><ins>+ def test_trashScheduledFullyInFutureAttendeeTrashedThenPutBack(self):
+
+ from twistedcaldav.stdconfig import config
+ self.patch(config, "EnableTrashCollection", True)
+
+ # A month in the future
+ start = DateTime.getNowUTC()
+ start.setHHMMSS(0, 0, 0)
+ start.offsetMonth(1)
+ end = DateTime.getNowUTC()
+ end.setHHMMSS(1, 0, 0)
+ end.offsetMonth(1)
+ subs = {
+ "start": start,
+ "end": end,
+ }
+
+ data1 = """BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+BEGIN:VEVENT
+UID:12345-67890-attendee-reply
+DTSTART;TZID=America/Los_Angeles:%(start)s
+DTEND;TZID=America/Los_Angeles:%(end)s
+DTSTAMP:20150204T192546Z
+SUMMARY:Scheduled
+ORGANIZER;CN="User 01":mailto:user01@example.com
+ATTENDEE:mailto:user01@example.com
+ATTENDEE:mailto:user02@example.com
+END:VEVENT
+END:VCALENDAR
+""" % subs
+
+ data2 = """BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+BEGIN:VEVENT
+UID:12345-67890-attendee-reply
+DTSTART;TZID=America/Los_Angeles:%(start)s
+DTEND;TZID=America/Los_Angeles:%(end)s
+DTSTAMP:20150204T192546Z
+SUMMARY:Scheduled
+ORGANIZER;CN="User 01":mailto:user01@example.com
+ATTENDEE:mailto:user01@example.com
+ATTENDEE;PARTSTAT=ACCEPTED:mailto:user02@example.com
+END:VEVENT
+END:VCALENDAR
+""" % subs
+
+
+ # user01 invites user02
+ txn = self.store.newTransaction()
+ yield self._createResource(
+ txn, "user01", "calendar", "test.ics", data1
+ )
+ yield txn.commit()
+
+ yield JobItem.waitEmpty(self.store.newTransaction, reactor, 60)
+
+ # user01's copy has SCHEDULE-STATUS update
+ txn = self.store.newTransaction()
+ data = yield self._getResourceData(txn, "user01", "calendar", "test.ics")
+ self.assertTrue("SCHEDULE-STATUS=1.2" in data)
+
+ # user02 has an inbox item
+ resourceNames = yield self._getResourceNames(txn, "user02", "inbox")
+ self.assertEqual(len(resourceNames), 1)
+
+ # user02 accepts
+ yield self._updateResource(txn, "user02", "calendar", "", data2)
+ yield txn.commit()
+
+ yield JobItem.waitEmpty(self.store.newTransaction, reactor, 60)
+
+ # user01 has an inbox item
+ txn = self.store.newTransaction()
+ resourceNames = yield self._getResourceNames(txn, "user01", "inbox")
+ self.assertEqual(len(resourceNames), 1)
+ resource = yield self._getResource(txn, "user01", "inbox", "")
+ yield resource.remove()
+
+ # user01's copy has SCHEDULE-STATUS update
+ data = yield self._getResourceData(txn, "user01", "calendar", "test.ics")
+ self.assertTrue("SCHEDULE-STATUS=2.0" in data)
+ self.assertTrue("PARTSTAT=ACCEPTED" in data)
+
+ resource = yield self._getResource(txn, "user02", "inbox", "")
+ yield resource.remove()
+
+ yield txn.commit()
+
+ # user02 trashes event
+ txn = self.store.newTransaction()
+ resource = yield self._getResource(txn, "user02", "calendar", "")
+ yield resource.remove()
+
+ yield txn.commit()
+
+ yield JobItem.waitEmpty(self.store.newTransaction, reactor, 60)
+
+ # user01's calendar copy shows user02 declined
+ txn = self.store.newTransaction()
+
+ data = yield self._getResourceData(txn, "user01", "calendar", "test.ics")
+ self.assertTrue("PARTSTAT=DECLINED" in data)
+
+ # user01's inbox copy also shows user02 declined
+ data = yield self._getResourceData(txn, "user01", "inbox", "")
+ self.assertTrue("PARTSTAT=DECLINED" in data)
+ resource = yield self._getResource(txn, "user01", "inbox", "")
+ yield resource.remove()
+
+ # result = yield txn.execSQL("select * from calendar_object", [])
+ # for row in result:
+ # print("ROW", row)
+
+ # user02's copy is in the trash only, and still has ACCEPTED
+ resourceNames = yield self._getResourceNames(txn, "user02", "trash")
+ self.assertEqual(len(resourceNames), 1)
+
+ resourceNames = yield self._getResourceNames(txn, "user02", "calendar")
+ self.assertEqual(len(resourceNames), 0)
+
+ resourceNames = yield self._getResourceNames(txn, "user02", "inbox")
+ self.assertEqual(len(resourceNames), 0)
+
+ data = yield self._getResourceData(txn, "user02", "trash", "")
+ self.assertTrue("PARTSTAT=ACCEPTED" in data)
+
+ yield txn.commit()
+
+ # user02 moves it from trash
+ txn = self.store.newTransaction()
+ resource = yield self._getResource(txn, "user02", "trash", "")
+ yield resource.fromTrash()
+ yield txn.commit()
+ yield JobItem.waitEmpty(self.store.newTransaction, reactor, 60)
+
+ # user01's calendar copy shows user02 accepted
+ txn = self.store.newTransaction()
+
+ data = yield self._getResourceData(txn, "user01", "calendar", "test.ics")
+ self.assertTrue("PARTSTAT=ACCEPTED" in data)
+
+ # user01's inbox copy also shows user02 accepted
+ data = yield self._getResourceData(txn, "user01", "inbox", "")
+ self.assertTrue("PARTSTAT=ACCEPTED" in data)
+ resource = yield self._getResource(txn, "user01", "inbox", "")
+ yield resource.remove()
+
+ # user02 has nothing in trash
+ resourceNames = yield self._getResourceNames(txn, "user02", "trash")
+ self.assertEqual(len(resourceNames), 0)
+
+ resourceNames = yield self._getResourceNames(txn, "user02", "calendar")
+ self.assertEqual(len(resourceNames), 1)
+
+ resourceNames = yield self._getResourceNames(txn, "user02", "inbox")
+ self.assertEqual(len(resourceNames), 0)
+
+ data = yield self._getResourceData(txn, "user02", "calendar", "")
+ self.assertTrue("PARTSTAT=ACCEPTED" in data)
+
+ yield txn.commit()
+
+
+
+ @inlineCallbacks
</ins><span class="cx"> def test_trashScheduledFullyInPast(self):
</span><span class="cx">
</span><span class="cx"> from twistedcaldav.stdconfig import config
</span><span class="lines">@@ -1173,7 +1393,166 @@
</span><span class="cx"> yield txn.commit()
</span><span class="cx">
</span><span class="cx">
</span><ins>+ @inlineCallbacks
+ def test_trashScheduledFullyInPastAttendeeTrashedThenPutBack(self):
</ins><span class="cx">
</span><ins>+ from twistedcaldav.stdconfig import config
+ self.patch(config, "EnableTrashCollection", True)
+
+ # A month in the past
+ start = DateTime.getNowUTC()
+ start.setHHMMSS(0, 0, 0)
+ start.offsetMonth(-1)
+ end = DateTime.getNowUTC()
+ end.setHHMMSS(1, 0, 0)
+ end.offsetMonth(-1)
+ subs = {
+ "start": start,
+ "end": end,
+ }
+
+ data1 = """BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+BEGIN:VEVENT
+UID:12345-67890-attendee-reply
+DTSTART;TZID=America/Los_Angeles:%(start)s
+DTEND;TZID=America/Los_Angeles:%(end)s
+DTSTAMP:20150204T192546Z
+SUMMARY:Scheduled
+ORGANIZER;CN="User 01":mailto:user01@example.com
+ATTENDEE:mailto:user01@example.com
+ATTENDEE:mailto:user02@example.com
+END:VEVENT
+END:VCALENDAR
+""" % subs
+
+ data2 = """BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+BEGIN:VEVENT
+UID:12345-67890-attendee-reply
+DTSTART;TZID=America/Los_Angeles:%(start)s
+DTEND;TZID=America/Los_Angeles:%(end)s
+DTSTAMP:20150204T192546Z
+SUMMARY:Scheduled
+ORGANIZER;CN="User 01":mailto:user01@example.com
+ATTENDEE:mailto:user01@example.com
+ATTENDEE;PARTSTAT=TENTATIVE:mailto:user02@example.com
+END:VEVENT
+END:VCALENDAR
+""" % subs
+
+ # user01 invites user02
+ txn = self.store.newTransaction()
+ yield self._createResource(
+ txn, "user01", "calendar", "test.ics", data1
+ )
+ yield txn.commit()
+
+ yield JobItem.waitEmpty(self.store.newTransaction, reactor, 60)
+
+ # user01's copy has SCHEDULE-STATUS update
+ txn = self.store.newTransaction()
+ data = yield self._getResourceData(txn, "user01", "calendar", "test.ics")
+ self.assertTrue("SCHEDULE-STATUS=1.2" in data)
+
+ # user02 has an inbox item
+ resourceNames = yield self._getResourceNames(txn, "user02", "inbox")
+ self.assertEqual(len(resourceNames), 1)
+
+ # user02 accepts
+ yield self._updateResource(txn, "user02", "calendar", "", data2)
+ yield txn.commit()
+
+ yield JobItem.waitEmpty(self.store.newTransaction, reactor, 60)
+
+ # user01 has an inbox item
+ txn = self.store.newTransaction()
+ resourceNames = yield self._getResourceNames(txn, "user01", "inbox")
+ self.assertEqual(len(resourceNames), 1)
+
+ # user01's copy has SCHEDULE-STATUS update
+ data = yield self._getResourceData(txn, "user01", "calendar", "test.ics")
+ self.assertTrue("SCHEDULE-STATUS=2.0" in data)
+ self.assertTrue("PARTSTAT=TENTATIVE" in data)
+ resource = yield self._getResource(txn, "user02", "inbox", "")
+ yield resource.remove()
+
+ yield txn.commit()
+
+ # user02 trashes event
+ txn = self.store.newTransaction()
+ resource = yield self._getResource(txn, "user02", "calendar", "")
+ yield resource.remove()
+ yield txn.commit()
+
+ yield JobItem.waitEmpty(self.store.newTransaction, reactor, 60)
+
+ # user01's calendar copy shows user02 declined
+ txn = self.store.newTransaction()
+
+ data = yield self._getResourceData(txn, "user01", "calendar", "test.ics")
+ self.assertTrue("PARTSTAT=DECLINED" in data)
+
+ # user01's inbox copy also shows user02 declined
+ data = yield self._getResourceData(txn, "user01", "inbox", "")
+ print("user01 inbox after trash", data)
+ self.assertTrue("PARTSTAT=DECLINED" in data) # FIXME -- this is not always true. Sometimes it shows PARTSTAT=TENTATIVE still, as if the implicit scheduling has not finished.
+ resource = yield self._getResource(txn, "user01", "inbox", "")
+ yield resource.remove()
+
+ # user02's copy is in the trash only, and still has TENTATIVE
+ resourceNames = yield self._getResourceNames(txn, "user02", "trash")
+ self.assertEqual(len(resourceNames), 1)
+
+ resourceNames = yield self._getResourceNames(txn, "user02", "calendar")
+ self.assertEqual(len(resourceNames), 0)
+
+ resourceNames = yield self._getResourceNames(txn, "user02", "inbox")
+ self.assertEqual(len(resourceNames), 0)
+
+ data = yield self._getResourceData(txn, "user02", "trash", "")
+ self.assertTrue("PARTSTAT=TENTATIVE" in data)
+
+ yield txn.commit()
+
+ # user02 moves it from trash
+ txn = self.store.newTransaction()
+ resource = yield self._getResource(txn, "user02", "trash", "")
+ yield resource.fromTrash()
+ yield txn.commit()
+ yield JobItem.waitEmpty(self.store.newTransaction, reactor, 60)
+
+ # user01's calendar copy shows user02 tentative again
+ txn = self.store.newTransaction()
+
+ data = yield self._getResourceData(txn, "user01", "calendar", "test.ics")
+ self.assertTrue("PARTSTAT=TENTATIVE" in data)
+
+ # user01's inbox copy also shows user02 tentative
+ data = yield self._getResourceData(txn, "user01", "inbox", "")
+ self.assertTrue("PARTSTAT=TENTATIVE" in data)
+ resource = yield self._getResource(txn, "user01", "inbox", "")
+ yield resource.remove()
+
+ # user02 has nothing in trash
+ resourceNames = yield self._getResourceNames(txn, "user02", "trash")
+ self.assertEqual(len(resourceNames), 0)
+
+ resourceNames = yield self._getResourceNames(txn, "user02", "calendar")
+ self.assertEqual(len(resourceNames), 1)
+
+ resourceNames = yield self._getResourceNames(txn, "user02", "inbox")
+ self.assertEqual(len(resourceNames), 0)
+
+ data = yield self._getResourceData(txn, "user02", "calendar", "")
+ self.assertTrue("PARTSTAT=TENTATIVE" in data)
+
+ yield txn.commit()
+
+
+
</ins><span class="cx"> @inlineCallbacks
</span><span class="cx"> def test_trashScheduledSpanningNow(self):
</span><span class="cx">
</span><span class="lines">@@ -1335,7 +1714,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><del>- def test_trashScheduledSpanningNowAttendeeRemove(self):
</del><ins>+ def test_trashScheduledSpanningNowAttendeeTrashedThenPutBack(self):
</ins><span class="cx">
</span><span class="cx"> from twistedcaldav.stdconfig import config
</span><span class="cx"> self.patch(config, "EnableTrashCollection", True)
</span><span class="lines">@@ -1436,59 +1815,58 @@
</span><span class="cx"> txn = self.store.newTransaction()
</span><span class="cx"> data = yield self._getResourceData(txn, "user01", "calendar", "test.ics")
</span><span class="cx"> self.assertTrue("PARTSTAT=DECLINED" in data)
</span><del>- yield txn.commit()
</del><ins>+ resource = yield self._getResource(txn, "user01", "inbox", "")
+ yield resource.remove()
</ins><span class="cx">
</span><del>- # # user02's copy is cancelled
- # txn = self.store.newTransaction()
- # data = yield self._getResourceData(txn, "user02", "inbox", "")
- # self.assertTrue("METHOD:CANCEL" in data)
- # resource = yield self._getResource(txn, "user02", "inbox", "")
- # yield resource.remove()
- # data = yield self._getResourceData(txn, "user02", "calendar", "")
- # self.assertTrue("STATUS:CANCELLED" in data)
- # resource = yield self._getResource(txn, "user02", "calendar", "")
- # yield resource.remove()
- # data = yield self._getResource(txn, "user02", "trash", "")
- # self.assertEquals(data, None)
- # yield txn.commit()
</del><ins>+ resourceNames = yield self._getResourceNames(txn, "user01", "calendar")
+ self.assertEqual(len(resourceNames), 1)
+ resourceNames = yield self._getResourceNames(txn, "user01", "inbox")
+ self.assertEqual(len(resourceNames), 1)
</ins><span class="cx">
</span><del>- # # user01 restores event from the trash
- # txn = self.store.newTransaction()
- # resource = yield self._getResource(txn, "user01", "trash", "")
- # yield resource.fromTrash()
- # yield txn.commit()
</del><ins>+ # user02's copy is in the trash only, and still has ACCEPTED
+ resourceNames = yield self._getResourceNames(txn, "user02", "trash")
+ self.assertEqual(len(resourceNames), 1)
</ins><span class="cx">
</span><del>- # yield JobItem.waitEmpty(self.store.newTransaction, reactor, 60)
</del><ins>+ resourceNames = yield self._getResourceNames(txn, "user02", "calendar")
+ self.assertEqual(len(resourceNames), 0)
</ins><span class="cx">
</span><del>- # txn = self.store.newTransaction()
</del><ins>+ resourceNames = yield self._getResourceNames(txn, "user02", "inbox")
+ self.assertEqual(len(resourceNames), 0)
</ins><span class="cx">
</span><del>- # # user01's trash should be empty
- # resourceNames = yield self._getResourceNames(txn, "user01", "trash")
- # self.assertEquals(len(resourceNames), 0)
</del><ins>+ data = yield self._getResourceData(txn, "user02", "trash", "")
+ self.assertTrue("PARTSTAT=ACCEPTED" in data)
</ins><span class="cx">
</span><del>- # # user01 should have test.ics and a new .ics
- # resourceNames = yield self._getResourceNames(txn, "user01", "calendar")
- # self.assertEquals(len(resourceNames), 2)
- # self.assertTrue("test.ics" in resourceNames)
- # resourceNames.remove("test.ics")
- # newName = resourceNames[0]
</del><ins>+ yield txn.commit()
+ # user02 moves it from trash
+ txn = self.store.newTransaction()
+ resource = yield self._getResource(txn, "user02", "trash", "")
+ yield resource.fromTrash()
+ yield txn.commit()
+ yield JobItem.waitEmpty(self.store.newTransaction, reactor, 60)
</ins><span class="cx">
</span><del>- # # user01's test.ics -- verify it got split correctly
- # data = yield self._getResourceData(txn, "user01", "calendar", "test.ics")
- # self.assertTrue("COUNT=15" in data)
</del><ins>+ # user01's calendar copy shows user02 accepted
+ txn = self.store.newTransaction()
</ins><span class="cx">
</span><del>- # # user01's new .ics -- verify it got split correctly
- # data = yield self._getResourceData(txn, "user01", "calendar", newName)
- # self.assertTrue("RRULE:FREQ=WEEKLY;UNTIL=" in data)
</del><ins>+ data = yield self._getResourceData(txn, "user01", "calendar", "test.ics")
+ self.assertTrue("PARTSTAT=ACCEPTED" in data)
</ins><span class="cx">
</span><del>- # # user02's copy should be back on their calendar, and not in trash
</del><ins>+ # user01's inbox copy also shows user02 accepted
+ data = yield self._getResourceData(txn, "user01", "inbox", "")
+ self.assertTrue("PARTSTAT=ACCEPTED" in data)
+ resource = yield self._getResource(txn, "user01", "inbox", "")
+ yield resource.remove()
</ins><span class="cx">
</span><del>- # resourceNames = yield self._getResourceNames(txn, "user02", "calendar")
- # self.assertEquals(len(resourceNames), 1)
- # resourceNames = yield self._getResourceNames(txn, "user02", "trash")
- # self.assertEquals(len(resourceNames), 0)
</del><ins>+ # user02 has nothing in trash
+ resourceNames = yield self._getResourceNames(txn, "user02", "trash")
+ self.assertEqual(len(resourceNames), 0)
</ins><span class="cx">
</span><del>- # data = yield self._getResourceData(txn, "user02", "calendar", "")
- # self.assertTrue("PARTSTAT=NEEDS-ACTION" in data)
</del><ins>+ resourceNames = yield self._getResourceNames(txn, "user02", "calendar")
+ self.assertEqual(len(resourceNames), 1)
</ins><span class="cx">
</span><del>- # yield txn.commit()
</del><ins>+ resourceNames = yield self._getResourceNames(txn, "user02", "inbox")
+ self.assertEqual(len(resourceNames), 0)
+
+ data = yield self._getResourceData(txn, "user02", "calendar", "")
+ self.assertTrue("PARTSTAT=ACCEPTED" in data)
+
+ yield txn.commit()
</ins></span></pre>
</div>
</div>
</body>
</html>