Merge lp:~michael.nelson/launchpad/522517-multiple-subscriptions-displayed into lp:launchpad

[Michael Nelson]

Only unique PersonArchiveSubscriptions are displayed.

[Michael Nelson (michael.nelson)]

This branch fixes bug 522517.

It just adds a test to reproduce the issue and then ensures that only unique personal archive subscriptions are displayed on a page.

To test:
bin/test -vvt xx-private-ppa-subscriptions.txt

Lint:

There are three lint items in browser/archivesubscriptions.py but I've fixed those in a separate branch already (which I can't set as a pre-req. for this one).

[Muharem Hrnjadovic (al-maisan)]

review: Approve

=== modified file 'lib/lp/soyuz/browser/archivesubscription.py'
--- lib/lp/soyuz/browser/archivesubscription.py	2009-09-29 07:21:40 +0000
+++ lib/lp/soyuz/browser/archivesubscription.py	2010-03-08 08:50:44 +0000
@@ -298,12 +298,26 @@
             self.context)
 
         # Turn the result set into a list of dicts so it can be easily
-        # accessed in TAL:
-        return [
-            dict(subscription=PersonalArchiveSubscription(self.context,
-                                                          subscr.archive),
-                 token=token)
-            for subscr, token in subs_with_tokens]
+        # accessed in TAL. Note that we need to ensure that only one
+        # PersonalArchiveSubscription is included for each archive,
+        # as the person might have participation in multiple
+        # subscriptions (via different teams).
+        unique_archives = set()
+        personal_subscription_tokens = []
+        for subscription, token in subs_with_tokens:
+            if subscription.archive in unique_archives:
+                continue
+
+            unique_archives.add(subscription.archive)
+
+            personal_subscription = PersonalArchiveSubscription(
+                self.context, subscription.archive)
+            personal_subscription_tokens.append({
+                'subscription': personal_subscription,
+                'token': token
+                })
+
+        return personal_subscription_tokens
 
 
 class PersonArchiveSubscriptionView(LaunchpadView):

=== modified file 'lib/lp/soyuz/stories/ppa/xx-private-ppa-subscriptions.txt'
--- lib/lp/soyuz/stories/ppa/xx-private-ppa-subscriptions.txt	2010-02-24 15:52:53 +0000
+++ lib/lp/soyuz/stories/ppa/xx-private-ppa-subscriptions.txt	2010-03-08 08:50:44 +0000
@@ -70,21 +70,23 @@
     ...     'no-subscribers'))
     No one has access to install software from this PPA.
 
-Create two new users that can be subscribed to archives:
+Create two new users that can be subscribed to archives, and a team:
 
     >>> login('[e-mail]')
     >>> joesmith = factory.makePerson(name="joesmith", displayname="Joe Smith",
     ...     password="test", email="[e-mail]")
+    >>> teamjoe = factory.makeTeam(
+    ...     owner=joesmith, displayname="Team Joe", name='teamjoe')
     >>> bradsmith = factory.makePerson(name="bradsmith", displayname="Brad Smith",
     ...     password="test", email="[e-mail]")
     >>> logout()
 
-People can be subscribed by entering their details into the displayed
-form:
+People and teams can be subscribed by entering their details into the
+displayed form:
 
-    >>> cprov_browser.getControl(name='field.subscriber').value = 'joesmith'
+    >>> cprov_browser.getControl(name='field.subscriber').value = 'teamjoe'
     >>> cprov_browser.getControl(
-    ...     name='field.description').value = "Joe is my friend"
+    ...     name='field.description').value = "Joes friends are my friends"
     >>> cprov_browser.getControl(name="field.actions.add").click()
     >>> cprov_browser.getControl(name='field.subscriber').value = 'bradsmith'
     >>> cprov_browser.getControl(
@@ -100,7 +102,7 @@
     ...     print extract_text(row)
     Name                Expires     Comment
     Brad Smith          2200-08-01  Brad can access for a while.  Edit/Cancel
-    Joe Smith                       Joe is my friend              Edit/Cancel
+    Team Joe                        Joes friends are my friends   Edit/Cancel
 
 
 == Managing a persons' Archive subscriptions ==
@@ -120,8 +122,8 @@
     >>> print extract_text(explanation)
     You do not have any current subscriptions to private archives...
 
-First, create a subscription for Joe Smith to mark's archive also, so that
-Joe has multiple subscriptions:
+First, create a subscription for Joe Smith's team to mark's archive
+so that Joe has multiple subscriptions:
 
     >>> mark_browser = setupBrowser(
     ...     auth="Basic [e-mail]:test")
@@ -144,6 +146,7 @@
     PPA named... (ppa:mark/p3a)      Mark Shuttleworth       View
     PPA named... (ppa:cprov/p3a)     Celso Providelo         View
 
+
 == Confirming a subscription ==
 
 When a person clicks on the view button, the subscription is confirmed
@@ -187,3 +190,23 @@
         to PPA named p3a for Mark Shuttleworth
     This repository is signed ...
 
+Once a person has activated a subscription, being subscribed again via
+another team does not lead to duplicate entries on the person's
+subscriptions page.
+
+    >>> mark_browser.open("http://launchpad.dev/~mark/+archive/p3a")
+    >>> mark_browser.getLink("Manage access").click()
+    >>> mark_browser.getControl(name='field.subscriber').value = 'teamjoe'
+    >>> mark_browser.getControl(
+    ...     name='field.description').value = "Joe's friends are my friends."
+    >>> mark_browser.getControl(name="field.actions.add").click()
+    >>> joe_browser.open(
+    ...     "http://launchpad.dev/~joesmith/+archivesubscriptions")
+    >>> rows = find_tags_by_class(
+    ...     joe_browser.contents, 'archive-subscription-row')
+    >>> for row in rows:
+    ...     print extract_text(row)
+    Archive                                            Owner
+    PPA named p3a for Mark Shuttleworth (ppa:mark/p3a) Mark Shuttleworth View
+    PPA named p3a for Celso Providelo (ppa:cprov/p3a)  Celso Providelo   View
+