<!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>[11899] CalendarServer/branches/users/sagen/groupcacher</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/11899">11899</a></dd>
<dt>Author</dt> <dd>sagen@apple.com</dd>
<dt>Date</dt> <dd>2013-11-06 15:41:28 -0800 (Wed, 06 Nov 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Adds "allGroupDelegates()"</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServerbranchesuserssagengroupcachertwextwhodelegatespy">CalendarServer/branches/users/sagen/groupcacher/twext/who/delegates.py</a></li>
<li><a href="#CalendarServerbranchesuserssagengroupcachertwextwhotesttest_delegatespy">CalendarServer/branches/users/sagen/groupcacher/twext/who/test/test_delegates.py</a></li>
<li><a href="#CalendarServerbranchesuserssagengroupcachertxdavcommondatastoresqlpy">CalendarServer/branches/users/sagen/groupcacher/txdav/common/datastore/sql.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServerbranchesuserssagengroupcachertwextwhodelegatespy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/groupcacher/twext/who/delegates.py (11898 => 11899)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/groupcacher/twext/who/delegates.py 2013-11-06 23:36:01 UTC (rev 11898)
+++ CalendarServer/branches/users/sagen/groupcacher/twext/who/delegates.py 2013-11-06 23:41:28 UTC (rev 11899)
</span><span class="lines">@@ -33,15 +33,7 @@
</span><span class="cx"> """
</span><span class="cx"> if delegate.recordType == RecordType.group:
</span><span class="cx"> # find the groupID
</span><del>- results = (yield txn.groupByGUID(delegate.guid))
- while not results:
- # need to add the group to the groups table so we have a groupID
-
- # TODO: is there a better pattern for this?
- yield txn.addGroup(delegate.guid, delegate.fullNames[0], "")
- results = (yield txn.groupByGUID(delegate.guid))
-
- groupID = results[0][0]
</del><ins>+ groupID, name, membershipHash = (yield txn.groupByGUID(delegate.guid))
</ins><span class="cx"> yield txn.addDelegate(delegator.guid, groupID,
</span><span class="cx"> 1 if readWrite else 0, True)
</span><span class="cx"> else:
</span><span class="lines">@@ -87,3 +79,9 @@
</span><span class="cx"> if record is not None:
</span><span class="cx"> records.append(record)
</span><span class="cx"> returnValue(records)
</span><ins>+
+
+@inlineCallbacks
+def allGroupDelegates(txn):
+ results = (yield txn.allGroupDelegates())
+ returnValue([r[0] for r in results])
</ins></span></pre></div>
<a id="CalendarServerbranchesuserssagengroupcachertwextwhotesttest_delegatespy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/groupcacher/twext/who/test/test_delegates.py (11898 => 11899)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/groupcacher/twext/who/test/test_delegates.py 2013-11-06 23:36:01 UTC (rev 11898)
+++ CalendarServer/branches/users/sagen/groupcacher/twext/who/test/test_delegates.py 2013-11-06 23:41:28 UTC (rev 11899)
</span><span class="lines">@@ -19,7 +19,7 @@
</span><span class="cx"> """
</span><span class="cx">
</span><span class="cx"> from twext.who.delegates import (
</span><del>- addDelegate, removeDelegate, delegatesOf, delegateFor
</del><ins>+ addDelegate, removeDelegate, delegatesOf, delegateFor, allGroupDelegates
</ins><span class="cx"> )
</span><span class="cx"> from twext.who.groups import GroupCacher
</span><span class="cx"> from twext.who.test.test_xml import xmlService
</span><span class="lines">@@ -104,6 +104,15 @@
</span><span class="cx"> delegators = (yield delegateFor(txn, delegate1, True))
</span><span class="cx"> self.assertEquals(["wsanchez"], [d.shortNames[0] for d in delegators])
</span><span class="cx">
</span><ins>+ # Verify we can ask for all delegated-to groups
+ group2 = yield self.xmlService.recordWithUID("__sub_group_1__")
+ yield addDelegate(txn, delegator, group2, True)
+ groups = (yield allGroupDelegates(txn))
+ self.assertEquals(
+ set([
+ "49b350c69611477b94d95516b13856ab",
+ "86144f73345a409782f1b782672087c7"
+ ]), set(groups))
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServerbranchesuserssagengroupcachertxdavcommondatastoresqlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/groupcacher/txdav/common/datastore/sql.py (11898 => 11899)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/groupcacher/txdav/common/datastore/sql.py 2013-11-06 23:36:01 UTC (rev 11898)
+++ CalendarServer/branches/users/sagen/groupcacher/txdav/common/datastore/sql.py 2013-11-06 23:41:28 UTC (rev 11899)
</span><span class="lines">@@ -936,7 +936,7 @@
</span><span class="cx"> savepoint = SavepointAction("groupByGUID")
</span><span class="cx"> yield savepoint.acquire(self)
</span><span class="cx"> try:
</span><del>- groupID = (yield self.addGroup(groupGUID, "", ""))[0][0]
</del><ins>+ yield self.addGroup(groupGUID, "", "")
</ins><span class="cx"> except Exception:
</span><span class="cx"> yield savepoint.rollback(self)
</span><span class="cx"> results = (yield self._groupByGUID.on(self,
</span><span class="lines">@@ -1137,6 +1137,7 @@
</span><span class="cx"> return self._removeDelegateQuery.on(self, delegator=delegator,
</span><span class="cx"> delegate=delegate, readWrite=readWrite)
</span><span class="cx">
</span><ins>+ """
</ins><span class="cx"> def directDelegates(self, delegator, readWrite):
</span><span class="cx"> return self._selectDelegatesQuery.on(self, delegator=delegator,
</span><span class="cx"> readWrite=readWrite)
</span><span class="lines">@@ -1144,6 +1145,7 @@
</span><span class="cx"> def groupDelegates(self, delegator, readWrite):
</span><span class="cx"> return self._selectDelegateGroupssQuery.on(self, delegator=delegator,
</span><span class="cx"> readWrite=readWrite)
</span><ins>+ """
</ins><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><span class="cx"> def delegates(self, delegator, readWrite):
</span><span class="lines">@@ -1172,6 +1174,17 @@
</span><span class="cx"> delegate=delegate, readWrite=readWrite)))
</span><span class="cx"> returnValue(results)
</span><span class="cx">
</span><ins>+
+ def allGroupDelegates(self):
+ gr = schema.GROUPS
+ dg = schema.DELEGATE_GROUPS
+
+ return Select(
+ [gr.GROUP_GUID],
+ From=gr,
+ Where=(gr.GROUP_ID.In(Select([dg.GROUP_ID], From=dg, Where=None)))
+ ).on(self)
+
</ins><span class="cx"> # End of Delegates
</span><span class="cx">
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>