<!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>[14478] 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/14478">14478</a></dd>
<dt>Author</dt> <dd>sagen@apple.com</dd>
<dt>Date</dt> <dd>2015-02-26 17:40:13 -0800 (Thu, 26 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Checkpoint, still working on attendee trash</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServerbranchesuserssagentrashcan5txdavcaldavdatastoreschedulingprocessingpy">CalendarServer/branches/users/sagen/trashcan-5/txdav/caldav/datastore/scheduling/processing.py</a></li>
<li><a href="#CalendarServerbranchesuserssagentrashcan5txdavcaldavdatastoresqlpy">CalendarServer/branches/users/sagen/trashcan-5/txdav/caldav/datastore/sql.py</a></li>
<li><a href="#CalendarServerbranchesuserssagentrashcan5txdavcommondatastoresqlpy">CalendarServer/branches/users/sagen/trashcan-5/txdav/common/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="CalendarServerbranchesuserssagentrashcan5txdavcaldavdatastoreschedulingprocessingpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/trashcan-5/txdav/caldav/datastore/scheduling/processing.py (14477 => 14478)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/trashcan-5/txdav/caldav/datastore/scheduling/processing.py 2015-02-25 19:06:11 UTC (rev 14477)
+++ CalendarServer/branches/users/sagen/trashcan-5/txdav/caldav/datastore/scheduling/processing.py 2015-02-27 01:40:13 UTC (rev 14478)
</span><span class="lines">@@ -517,6 +517,21 @@
</span><span class="cx">
</span><span class="cx"> # Update the attendee's copy of the event
</span><span class="cx"> log.debug("ImplicitProcessing - originator '%s' to recipient '%s' processing METHOD:REQUEST, UID: '%s' - updating event" % (self.originator.cuaddr, self.recipient.cuaddr, self.uid))
</span><ins>+
+ # Only move from trash if attendee is not fully declined:
+ isTrash = yield self.recipient_calendar_resource.isTrash()
+ print("XYZZY is trash?", self.recipient_calendar_resource, self.recipient_calendar_resource._parentCollection, isTrash)
+ if isTrash:
+ print("XYZZY MESSAGE", self.message)
+ attendees = self.message.getAttendeeProperties((self.recipient.cuaddr,))
+ print("ATTENDEES", attendees, attendees[0].parameterValue("PARTSTAT", "blah"))
+ if not all([attendee.parameterValue("PARTSTAT", "NEEDS-ACTION") == "DECLINED" for attendee in attendees]):
+ print("XYZZY fromTrash start", self.recipient_calendar_resource)
+ yield self.recipient_calendar_resource.fromTrash()
+ print("XYZZY fromTrash end", self.recipient_calendar_resource)
+ else:
+ print("ATTENDEE IS FULLY DECLINED")
+
</ins><span class="cx"> new_resource = (yield self.writeCalendarResource(None, self.recipient_calendar_resource, new_calendar))
</span><span class="cx">
</span><span class="cx"> if send_reply:
</span></span></pre></div>
<a id="CalendarServerbranchesuserssagentrashcan5txdavcaldavdatastoresqlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/trashcan-5/txdav/caldav/datastore/sql.py (14477 => 14478)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/trashcan-5/txdav/caldav/datastore/sql.py 2015-02-25 19:06:11 UTC (rev 14477)
+++ CalendarServer/branches/users/sagen/trashcan-5/txdav/caldav/datastore/sql.py 2015-02-27 01:40:13 UTC (rev 14478)
</span><span class="lines">@@ -4919,7 +4919,6 @@
</span><span class="cx"> organizerAddress = yield calendarUserFromCalendarUserAddress(organizer, self._txn)
</span><span class="cx">
</span><span class="cx"> if organizerAddress.record.uid == uid:
</span><del>- print("XYZZY ORGANIZER")
</del><span class="cx"> # If the ORGANIZER is moving the event from trash
</span><span class="cx"> splitter = iCalSplitter()
</span><span class="cx"> willSplit = splitter.willSplit(caldata)
</span><span class="lines">@@ -4963,7 +4962,6 @@
</span><span class="cx">
</span><span class="cx"> else:
</span><span class="cx"> # If an ATTENDEE is moving the event from trash
</span><del>- print("XYZZY ATTENDEE")
</del><span class="cx"> yield ImplicitScheduler().sendAttendeeReply(
</span><span class="cx"> self._txn,
</span><span class="cx"> self
</span></span></pre></div>
<a id="CalendarServerbranchesuserssagentrashcan5txdavcommondatastoresqlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/trashcan-5/txdav/common/datastore/sql.py (14477 => 14478)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/trashcan-5/txdav/common/datastore/sql.py 2015-02-25 19:06:11 UTC (rev 14477)
+++ CalendarServer/branches/users/sagen/trashcan-5/txdav/common/datastore/sql.py 2015-02-27 01:40:13 UTC (rev 14478)
</span><span class="lines">@@ -7523,8 +7523,24 @@
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><span class="cx"> def fromTrash(self):
</span><del>- trash = self._parentCollection
- self._parentCollection = yield trash.originalParentForResource(self)
</del><ins>+
+ # First make sure this is actually in the trash
+ isTrash = yield self.isTrash()
+ if not isTrash:
+ returnValue(None)
+
+ if self._parentCollection.isTrash():
+ # The parent is indeed the trash collection
+ trash = self._parentCollection
+ self._parentCollection = yield trash.originalParentForResource(self)
+ _ignore, newName = trash.parseName(self._name)
+ else:
+ # The parent is the original collection because it was retrieved
+ # via that parent, not the trash collection
+ home = self._parentCollection.viewerHome()
+ trash = yield home.childWithName("trash")
+ newName = self._name
+
</ins><span class="cx"> yield self._updateIsTrashQuery.on(
</span><span class="cx"> self._txn, isTrash=False, trashed=None, resourceID=self._resourceID
</span><span class="cx"> )
</span><span class="lines">@@ -7534,13 +7550,14 @@
</span><span class="cx"> self
</span><span class="cx"> )
</span><span class="cx"> )
</span><del>- _ignored, self._name = trash.parseName(self._name)
</del><ins>+ self._name = newName
</ins><span class="cx">
</span><span class="cx"> yield self._parentCollection.addedObjectResource(self)
</span><span class="cx"> yield self._parentCollection._insertRevision(self.name())
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> @classproperty
</span><span class="cx"> def _selectIsTrashQuery(cls):
</span><span class="cx"> obj = cls._objectSchema
</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 (14477 => 14478)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/trashcan-5/txdav/common/datastore/test/test_sql.py 2015-02-25 19:06:11 UTC (rev 14477)
+++ CalendarServer/branches/users/sagen/trashcan-5/txdav/common/datastore/test/test_sql.py 2015-02-27 01:40:13 UTC (rev 14478)
</span><span class="lines">@@ -972,6 +972,23 @@
</span><span class="cx"> END:VCALENDAR
</span><span class="cx"> """ % subs
</span><span class="cx">
</span><ins>+ data4 = """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:CHANGED!
+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">@@ -1034,9 +1051,6 @@
</span><span class="cx"> resource = yield self._getResource(txn, "user01", "inbox", "")
</span><span class="cx"> yield resource.remove()
</span><span class="cx">
</span><del>- # result = yield txn.execSQL("select * from calendar_object", [])
- # for row in result:
- # print("ROW", row)
</del><span class="cx">
</span><span class="cx"> # user02's copy is in the trash only, and still has ACCEPTED
</span><span class="cx"> resourceNames = yield self._getResourceNames(txn, "user02", "trash")
</span><span class="lines">@@ -1050,8 +1064,16 @@
</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><del>- print("user02 trash copy before user01 updates it", data)
</del><span class="cx">
</span><ins>+ # result = yield txn.execSQL("select * from calendar_object", [])
+ # for row in result:
+ # print("calendar object ROW", row)
+
+ # result = yield txn.execSQL("select * from calendar_metadata", [])
+ # for row in result:
+ # print("calendar ROW", row)
+
+
</ins><span class="cx"> yield txn.commit()
</span><span class="cx">
</span><span class="cx"> # user01 makes a change to event while user02's copy is in the trash
</span><span class="lines">@@ -1063,27 +1085,95 @@
</span><span class="cx"> yield JobItem.waitEmpty(self.store.newTransaction, reactor, 60)
</span><span class="cx">
</span><span class="cx"> txn = self.store.newTransaction()
</span><ins>+
+ # result = yield txn.execSQL("select * from calendar_object", [])
+ # for row in result:
+ # print("ROW", row)
+
+ 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), 1)
+
+ data = yield self._getResourceData(txn, "user02", "calendar", "")
+ self.assertTrue("EMAIL=user02@example.com;RSVP=TRUE" in data)
+
+ resource = yield self._getResource(txn, "user01", "inbox", "")
+ yield resource.remove()
+
+ yield txn.commit()
+
+ # yield JobItem.waitEmpty(self.store.newTransaction, reactor, 60)
+
+ # txn = self.store.newTransaction()
+
+ # result = yield txn.execSQL("select * from calendar_object", [])
+ # for row in result:
+ # print("ROW", row)
+ # resourceNames = yield self._getResourceNames(txn, "user02", "calendar")
+ # print ("user02 calendar again", resourceNames)
+ # yield txn.commit()
+
+ # user02 trashes event again
+ 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()
+
</ins><span class="cx"> data = yield self._getResourceData(txn, "user01", "calendar", "test.ics")
</span><del>- print("user01 calendar copy", data)
</del><ins>+ self.assertTrue("PARTSTAT=DECLINED" in data)
</ins><span class="cx">
</span><ins>+ # 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()
+
+ yield txn.commit()
+ yield JobItem.waitEmpty(self.store.newTransaction, reactor, 60)
+
+ # user01 makes a SUMMARY change to event while user02's copy is in the trash
+ txn = self.store.newTransaction()
+
+ print("USER CHANGING SUMMARY")
+ yield self._updateResource(txn, "user01", "calendar", "test.ics", data4)
+ yield txn.commit()
+
+ yield JobItem.waitEmpty(self.store.newTransaction, reactor, 60)
+
+
+ txn = self.store.newTransaction()
+
+ # result = yield txn.execSQL("select * from calendar_object", [])
+ # for row in result:
+ # print("ROW", row)
+
</ins><span class="cx"> resourceNames = yield self._getResourceNames(txn, "user02", "trash")
</span><del>- print ("user02 trash", resourceNames)
- data = yield self._getResourceData(txn, "user02", "trash", "")
- print("user02 trash copy", data)
</del><ins>+ self.assertEqual(len(resourceNames), 1)
</ins><span class="cx">
</span><del>-
</del><span class="cx"> resourceNames = yield self._getResourceNames(txn, "user02", "calendar")
</span><del>- print ("user02 calendar", resourceNames)
</del><ins>+ self.assertEqual(len(resourceNames), 0)
</ins><span class="cx">
</span><del>- # FIXME: user02 calendar should have the event!
-
</del><span class="cx"> resourceNames = yield self._getResourceNames(txn, "user02", "inbox")
</span><del>- print ("user02 inbox", resourceNames)
- data = yield self._getResourceData(txn, "user02", "inbox", "")
- print("user02 inbox copy", data)
</del><ins>+ self.assertEqual(len(resourceNames), 0)
</ins><span class="cx">
</span><ins>+ data = yield self._getResourceData(txn, "user02", "trash", "")
+ print("User02 trash copy", data)
+ # self.assertTrue("EMAIL=user02@example.com;RSVP=TRUE" in data)
+
</ins><span class="cx"> yield txn.commit()
</span><span class="cx">
</span><ins>+# FIXME: we should have a test where after the attendee's copy is trashed, it is fully removed, then have the organizer make a SUMMARY change, then a time change
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><span class="lines">@@ -1825,6 +1915,8 @@
</span><span class="cx"> self.assertEqual(len(resourceNames), 1)
</span><span class="cx"> resourceNames = yield self._getResourceNames(txn, "user01", "inbox")
</span><span class="cx"> self.assertEqual(len(resourceNames), 1)
</span><ins>+ resource = yield self._getResource(txn, "user01", "inbox", "")
+ yield resource.remove()
</ins><span class="cx">
</span><span class="cx"> # user02's copy is in the trash only, and still has ACCEPTED
</span><span class="cx"> resourceNames = yield self._getResourceNames(txn, "user02", "trash")
</span></span></pre>
</div>
</div>
</body>
</html>