Merge lp:~brian-murray/bileto/get-irc-nick into lp:bileto

[Brian Murray]

[Robert Bruce Park (robru)]

awesome, thanks!

review: Approve

=== modified file 'bileto/lplib.py'
--- bileto/lplib.py	2016-01-20 20:09:11 +0000
+++ bileto/lplib.py	2016-02-02 19:46:27 +0000
@@ -31,3 +31,16 @@
 def get_series():
     """Identify currently supported Ubuntu serieses."""
     return [s.name for s in lp.distributions['ubuntu'].series if s.active]
+
+
+@memoize
+def get_irc_nick(user):
+    """Find the freenode irc nick for an LP user."""
+    try:
+        person = lp.people[user]
+    except KeyError:
+        return user
+    for irc_id in person.irc_nicknames:
+        if irc_id.network == 'irc.freenode.net':
+            return irc_id.nickname
+    return user

=== modified file 'bileto/models.py'
--- bileto/models.py	2016-01-29 20:58:14 +0000
+++ bileto/models.py	2016-02-02 19:46:27 +0000
@@ -16,6 +16,7 @@
 from sqlalchemy.inspection import inspect
 
 from bileto.app import db
+from bileto.lplib import get_irc_nick
 
 
 # SQLite can't handle the BigInts, so we overload that for unit tests.
@@ -197,11 +198,12 @@
     @classmethod
     def new(cls):
         """Create a new Request with some values filled in."""
+        user = session.get('nickname', '')
         return cls(
             distribution='ubuntu',
             series='xenial+vivid',
             qa_signoff='QA Required',
-            landers=session.get('nickname', ''))
+            landers=get_irc_nick(user))
 
     def publishable(self):
         """Identify if this request is appropriate to publish or not."""

=== modified file 'tests/test_app.py'
--- tests/test_app.py	2016-01-20 20:32:06 +0000
+++ tests/test_app.py	2016-02-02 19:46:27 +0000
@@ -6,7 +6,7 @@
 from mock import Mock, patch
 
 from bileto.settings import read_from_file
-from bileto.lplib import get_series
+from bileto.lplib import get_series, get_irc_nick
 
 from tests.tests import BiletoTestCase
 
@@ -33,6 +33,45 @@
         lp_mock.distributions = dict(ubuntu=ubu)
         self.assertEqual(get_series(), ['alpha'])
 
+    @patch('bileto.lplib.lp')
+    def test_get_irc_nick(self, lp_mock):
+        """Ensure that we get the freenode irc nick from lplib."""
+        freenode = Mock()
+        freenode.network = 'irc.freenode.net'
+        freenode.nickname = 'freenode-nick'
+        quakenet = Mock()
+        quakenet.network = 'se.quakenet.org'
+        quakenet.nickname = 'quakenet-nick'
+        user = Mock()
+        user.irc_nicknames = [freenode, quakenet]
+        lp_mock.people = dict(fred=user)
+        self.assertEqual(get_irc_nick('fred'), 'freenode-nick')
+
+    @patch('bileto.lplib.lp')
+    def test_no_freenode_nick(self, lp_mock):
+        """Ensure that we have the lp user when there is no irc nick in lp."""
+        quakenet = Mock()
+        quakenet.network = 'se.quakenet.org'
+        quakenet.nickname = 'quakenet-nick'
+        user = Mock()
+        user.irc_nicknames = [quakenet]
+        lp_mock.people = dict(fred=user)
+        self.assertNotEqual(get_irc_nick('fred'), 'quakenet-nick')
+
+    @patch('bileto.lplib.lp')
+    def test_no_irc(self, lp_mock):
+        """Ensure that we have the lp user when there is no irc info in lp."""
+        user = Mock()
+        user.irc_nicknames = []
+        lp_mock.people = dict(gary=user)
+        self.assertEqual(get_irc_nick('gary'), 'gary')
+
+    @patch('bileto.lplib.lp')
+    def test_not_lp_user(self, lp_mock):
+        """If the lp user can not be found ensure the username is returned."""
+        lp_mock.people = dict()
+        self.assertEqual(get_irc_nick('bob'), 'bob')
+
     def test_read_from_file(self):
         """Ensure that we can read files from disk correctly."""
         self.assertIn('standard', read_from_file('/etc/python3/debian_config'))