Merge branch 'master' into chunk-queries

Author: jamstooks

membersuite_api_client/models.py

@@ -16,7 +16,7 @@ def __init__(self, membersuite_object_data):
         self.fields = convert_ms_object(
             membersuite_object_data["Fields"]["KeyValueOfstringanyType"])
 
-        self.id = self.fields["ID"]
+        self.membersuite_id = self.fields["ID"]
         self.extra_data = membersuite_object_data
 
     def __str__(self):

membersuite_api_client/security/models.py

@@ -30,18 +30,38 @@ def __str__(self):
         return ("<PortalUser: ID: {id}, email_address: {email_address}, "
                 "first_name: {first_name}, last_name: {last_name}, "
                 "owner: {owner}, session_id: {session_id}>".format(
-                    id=self.id,
+                    id=self.membersuite_id,
                     email_address=self.email_address,
                     first_name=self.first_name,
                     last_name=self.last_name,
                     owner=self.owner,
                     session_id=self.session_id))
 
-    def get_username(self):
+    def generate_username(self):
         """Return a username suitable for storing in auth.User.username.
 
+        Has to be <= 30 characters long.  (Until we drop support for
+        Django 1.4, after which we can define a custom User model with
+        a larger username field.)
+
+        We want to incorporate the membersuite_id in the username.
+        Those look like this:
+
+            00000000-0032-c842-a28a-0b3c8b856f80
+
+        That's 36 characters, too long for username.  Making the
+        assumption that those leading zeroes will always be there in
+        every ID.  Since they're not needed to generate a unique
+        value, they can go.
+
+        After chomping the zeroes, we're at 27 characters, so we
+        insert "ms-" in the front.
+
         """
-        return "_membersuite_id_{}".format(self.id)
+        assert self.membersuite_id.startswith("00000000-")
+        username = self.membersuite_id.replace("00000000-", '')
+        username = "ms-" + username
+        return username
 
     def get_individual(self, client):
         """Return the Individual that owns this PortalUser.
@@ -90,7 +110,7 @@ def __init__(self, membersuite_object_data, portal_user=None):
     def __str__(self):
         return ("<Individual: ID: {id}, email_address: {email_address}, "
                 "first_name: {first_name}, last_name: {last_name}>".format(
-                    id=self.id,
+                    id=self.membersuite_id,
                     email_address=self.email_address,
                     first_name=self.first_name,
                     last_name=self.last_name))

membersuite_api_client/tests/test_security.py

@@ -81,13 +81,13 @@ def setUpClass(cls):
     def setUp(self):
         self.portal_user = get_portal_user(client=self.client)
 
-    def test_get_username(self):
-        """Does get_username() work?
+    def test_generate_username(self):
+        """Does generate_username() work?
 
         """
-        self.portal_user.id = "fake-membersuite-id"
-        self.assertEqual("_membersuite_id_fake-membersuite-id",
-                         self.portal_user.get_username())
+        self.portal_user.membersuite_id = "00000000-fake-membersuite-id"
+        self.assertEqual("ms-fake-membersuite-id",
+                         self.portal_user.generate_username())
 
     def test_get_individual(self):
         """Does get_individual() work?
@@ -96,7 +96,7 @@ def test_get_individual(self):
         individual = self.portal_user.get_individual(client=self.client)
         self.assertEqual(self.portal_user.first_name, individual.first_name)
         self.assertEqual(self.portal_user.last_name, individual.last_name)
-        self.assertEqual(self.portal_user.owner, individual.id)
+        self.assertEqual(self.portal_user.owner, individual.membersuite_id)
 
 
 class IndividualTestCase(unittest.TestCase):