Merge lp:~jtv/launchpad/bug-567035 into lp:launchpad

[Jeroen T. Vermeulen]

Fix duplicate translation groups on Language page.

= Bug 567035 =

Tiny fix: where the Language page lists experts and the translation groups they participate in, the groups lists contained duplicates, caused by redundant indirect memberships (and possibly multi-language translation teams). This fixes that.

No lint. To test:
{{{
./bin/test -vv -t getByPerson_distinct
}}}

For Q/A, go https://translations.edge.launchpad.net/+languages/es (or equivalent for staging) and verify that under Translation Teams, Rocrail and Jisko Translators do not have their names repeated more than once between parentheses.

Jeroen

[Gavin Panella (allenap)]

review: Approve

=== modified file 'lib/lp/translations/model/translationgroup.py'
--- lib/lp/translations/model/translationgroup.py	2010-02-22 09:06:38 +0000
+++ lib/lp/translations/model/translationgroup.py	2010-04-20 05:32:17 +0000
@@ -180,8 +180,7 @@
             owner=owner)
 
     def getByPerson(self, person):
-        """See ITranslationGroupSet."""
-
+        """See `ITranslationGroupSet`."""
         store = Store.of(person)
         origin = [
             TranslationGroup,
@@ -193,7 +192,7 @@
         result = store.using(*origin).find(
             TranslationGroup, TeamParticipation.person == person)
 
-        return result.order_by(TranslationGroup.title)
+        return result.config(distinct=True).order_by(TranslationGroup.title)
 
     def getGroupsCount(self):
         """See ITranslationGroupSet."""

=== added file 'lib/lp/translations/tests/test_translationgroup.py'
--- lib/lp/translations/tests/test_translationgroup.py	1970-01-01 00:00:00 +0000
+++ lib/lp/translations/tests/test_translationgroup.py	2010-04-20 05:32:17 +0000
@@ -0,0 +1,65 @@
+# Copyright 2010 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+"""Unit tests for `TranslationGroup` and related classes."""
+
+__metaclass__ = type
+
+from unittest import TestLoader
+
+from zope.component import getUtility
+
+from canonical.testing import ZopelessDatabaseLayer
+from lp.registry.interfaces.teammembership import (
+    ITeamMembershipSet, TeamMembershipStatus)
+from lp.testing import TestCaseWithFactory
+from lp.translations.interfaces.translationgroup import ITranslationGroupSet
+
+
+class TestTranslationGroupSet(TestCaseWithFactory):
+    layer = ZopelessDatabaseLayer
+
+    def _enrollInTeam(self, team, member):
+        """Make `member` a member of `team`."""
+        getUtility(ITeamMembershipSet).new(
+            member, team, TeamMembershipStatus.APPROVED, team.teamowner)
+
+    def _makeTranslationTeam(self, group, member, language_code):
+        """Create translation team and enroll `member` in it."""
+        team = self.factory.makeTeam()
+        self.factory.makeTranslator(language_code, group=group, person=team)
+        self._enrollInTeam(team, member)
+        return team
+
+    def test_getByPerson_distinct_membership(self):
+        # A person can be in a translation team multiple times through
+        # indirect membership, but a group using that team will show up
+        # only once in getByPerson.
+        group = self.factory.makeTranslationGroup()
+        person = self.factory.makePerson()
+        translation_team = self._makeTranslationTeam(group, person, 'nl')
+
+        nested_team = self.factory.makeTeam()
+        self._enrollInTeam(translation_team, nested_team)
+        self._enrollInTeam(nested_team, person)
+
+        self.assertEqual(
+            [group],
+            list(getUtility(ITranslationGroupSet).getByPerson(person)))
+
+    def test_getByPerson_distinct_translationteam(self):
+        # getByPerson returns a group only once even if the person is a
+        # member of multiple translation teams in the group.
+        group = self.factory.makeTranslationGroup()
+        person = self.factory.makePerson()
+
+        self._makeTranslationTeam(group, person, 'es')
+        self._makeTranslationTeam(group, person, 'ca')
+
+        self.assertEqual(
+            [group],
+            list(getUtility(ITranslationGroupSet).getByPerson(person)))
+
+
+def test_suite():
+    return TestLoader().loadTestsFromName(__name__)