Merge lp:~wallyworld/launchpad/create-aag-privacy-transitions-followup2 into lp:launchpad

[Ian Booth]

Fix an issue with the query used for ISharingService.getPeopleWithoutAccess() and enhance the unit test.

== Implementation ==

Query the people who do have access and subtract these from the set of people passed in.

== Tests ==

Enhance the existing unit test.

== Lint ==

Linting changed files:
  lib/lp/registry/services/sharingservice.py
  lib/lp/registry/services/tests/test_sharingservice.py

[William Grant (wgrant)]

review: Approve (code)

=== modified file 'lib/lp/registry/services/sharingservice.py'
--- lib/lp/registry/services/sharingservice.py	2012-06-18 11:53:11 +0000
+++ lib/lp/registry/services/sharingservice.py	2012-06-19 03:31:20 +0000
@@ -18,7 +18,7 @@
     And,
     In,
     Join,
-    Not,
+    Or,
     Select,
     )
 from zope.component import getUtility
@@ -167,6 +167,7 @@
                     AccessArtifactGrant.abstract_artifact_id ==
                         access_artifact.id)))
 
+        # Find the people who can see the artifacts.
         person_ids = [person.id for person in people]
         store = IStore(AccessArtifactGrant)
         tables = [
@@ -174,12 +175,12 @@
             Join(TeamParticipation, TeamParticipation.personID == Person.id)]
         result_set = store.using(*tables).find(
             Person,
-            And(
-                Not(In(TeamParticipation.teamID, policy_grantees)),
-                Not(In(TeamParticipation.teamID, artifact_grantees))),
+            Or(
+                In(TeamParticipation.teamID, policy_grantees),
+                In(TeamParticipation.teamID, artifact_grantees)),
             In(Person.id, person_ids))
 
-        return result_set
+        return set(people).difference(set(result_set))
 
     def getInformationTypes(self, pillar):
         """See `ISharingService`."""

=== modified file 'lib/lp/registry/services/tests/test_sharingservice.py'
--- lib/lp/registry/services/tests/test_sharingservice.py	2012-06-19 02:14:21 +0000
+++ lib/lp/registry/services/tests/test_sharingservice.py	2012-06-19 03:31:20 +0000
@@ -1057,11 +1057,22 @@
         product = self.factory.makeProduct(owner=owner)
         login_person(owner)
 
-        # Make some people to check.
+        # Make some people to check. people[:5] will not have access.
         people = []
+        # Make a team with access.
+        member_with_access = self.factory.makePerson()
+        team_with_access = self.factory.makeTeam(members=[member_with_access])
+        # Make a team without access.
+        team_without_access = (
+            self.factory.makeTeam(members=[member_with_access]))
+        people.append(team_without_access)
         for x in range(0, 10):
             person = self.factory.makePerson()
             people.append(person)
+        people.append(team_with_access)
+        people.append(member_with_access)
+
+        # Make the bug to use.
         bug = self.factory.makeBug(
             product=product, owner=owner,
             information_type=InformationType.USERDATA)
@@ -1071,17 +1082,17 @@
         # Some access policy grants.
         [policy] = getUtility(IAccessPolicySource).find(
             [(product, InformationType.USERDATA)])
-        for person in people[:2]:
+        for person in people[5:7]:
             self.factory.makeAccessPolicyGrant(
                 policy=policy, grantee=person, grantor=owner)
         # Some access artifact grants.
-        for person in people[2:5]:
+        for person in people[7:]:
             self.factory.makeAccessArtifactGrant(
                 artifact=access_artifact, grantee=person, grantor=owner)
 
         # Check the results.
         without_access = self.service.getPeopleWithoutAccess(bug, people)
-        self.assertContentEqual(people[5:], without_access)
+        self.assertContentEqual(people[:5], without_access)
 
     def test_getVisibleArtifacts(self):
         # Test the getVisibleArtifacts method.