<!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>[15014] CalendarServer/trunk/txdav/caldav/datastore</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/15014">15014</a></dd>
<dt>Author</dt> <dd>sagen@apple.com</dd>
<dt>Date</dt> <dd>2015-07-28 16:22:22 -0700 (Tue, 28 Jul 2015)</dd>
</dl>

<h3>Log Message</h3>
<pre>Set _componentChanged when decorating ATTENDEEs with X-APPLE-HOSTED-STATUS</pre>

<h3>Modified Paths</h3>
<ul>
<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="CalendarServertrunktxdavcaldavdatastoresqlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/sql.py (15013 => 15014)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/sql.py        2015-07-28 19:07:46 UTC (rev 15013)
+++ CalendarServer/trunk/txdav/caldav/datastore/sql.py        2015-07-28 23:22:22 UTC (rev 15014)
</span><span class="lines">@@ -3512,6 +3512,7 @@
</span><span class="cx">                 else:
</span><span class="cx">                     status = &quot;local&quot;
</span><span class="cx"> 
</span><ins>+                prevValue = attendee.parameterValue(config.HostedStatus.Parameter)
</ins><span class="cx">                 if config.HostedStatus.Values[status]:
</span><span class="cx">                     attendee.setParameter(
</span><span class="cx">                         config.HostedStatus.Parameter,
</span><span class="lines">@@ -3519,6 +3520,8 @@
</span><span class="cx">                     )
</span><span class="cx">                 else:
</span><span class="cx">                     attendee.removeParameter(config.HostedStatus.Parameter)
</span><ins>+                if attendee.parameterValue(config.HostedStatus.Parameter) != prevValue:
+                    self._componentChanged = True
</ins><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx">     @inlineCallbacks
</span><span class="lines">@@ -3798,17 +3801,17 @@
</span><span class="cx">             # implicit code below will set _componentChanged
</span><span class="cx">             yield self.replaceMissingToDoProperties(component, inserting, internal_state)
</span><span class="cx"> 
</span><del>-            # Handle sharing dropbox normalization
</del><ins>+            # Handle sharing dropbox normalization (and set _componentChanged)
</ins><span class="cx">             yield self.dropboxPathNormalization(component)
</span><span class="cx"> 
</span><span class="cx">             # Pre-process managed attachments
</span><span class="cx">             if internal_state == ComponentUpdateState.NORMAL:
</span><span class="cx">                 managed_copied, managed_removed = (yield self.resourceCheckAttachments(component, inserting))
</span><span class="cx"> 
</span><del>-            # Default/duplicate alarms
</del><ins>+            # Default/duplicate alarms (and set _componentChanged)
</ins><span class="cx">             self.processAlarms(component, inserting)
</span><span class="cx"> 
</span><del>-            # Process hosted status
</del><ins>+            # Process hosted status (and set _componentChanged)
</ins><span class="cx">             if config.HostedStatus.Enabled:
</span><span class="cx">                 yield self.decorateHostedStatus(component)
</span><span class="cx"> 
</span></span></pre></div>
<a id="CalendarServertrunktxdavcaldavdatastoretesttest_sqlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/test/test_sql.py (15013 => 15014)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/test/test_sql.py        2015-07-28 19:07:46 UTC (rev 15013)
+++ CalendarServer/trunk/txdav/caldav/datastore/test/test_sql.py        2015-07-28 23:22:22 UTC (rev 15014)
</span><span class="lines">@@ -3455,7 +3455,7 @@
</span><span class="cx">             calendar_name=&quot;calendar&quot;,
</span><span class="cx">             home=&quot;user01&quot;
</span><span class="cx">         )
</span><del>-        comp = yield cobj.component()
</del><ins>+        comp = yield cobj.componentForUser()
</ins><span class="cx">         components = list(comp.subcomponents())
</span><span class="cx"> 
</span><span class="cx">         # Check attendees...
</span><span class="lines">@@ -3470,7 +3470,23 @@
</span><span class="cx">             external.parameterValue(config.HostedStatus.Parameter),
</span><span class="cx">             config.HostedStatus.Values[&quot;external&quot;]
</span><span class="cx">         )
</span><ins>+        yield self.commit()
</ins><span class="cx"> 
</span><ins>+        cobj = yield self.calendarObjectUnderTest(
+            name=&quot;external.ics&quot;,
+            calendar_name=&quot;calendar&quot;,
+            home=&quot;user01&quot;
+        )
+        comp = yield cobj.componentForUser()
+        comp = comp.duplicate()
+        main = comp.mainComponent()
+        # Remove the parameter so it gets added back and then we can check
+        # _componentChanged
+        external = main.getAttendeeProperty([&quot;mailto:someone_external@example.com&quot;])
+        external.removeParameter(config.HostedStatus.Parameter)
+        yield cobj.setComponent(comp)
+        self.assertTrue(cobj._componentChanged)
+
</ins><span class="cx">         yield self.commit()
</span><span class="cx"> 
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>