User naming cleanup

attract/application/__init__.py

@@ -68,8 +68,8 @@ class TokensAuth(TokenAuth):
                 tmpname = email.split('@')[0]
                 if not dbuser:
                     user_data = {
-                        'firstname': tmpname,
+                        'first_name': tmpname,
-                        'lastname': tmpname,
+                        'last_name': tmpname,
                         'email': email,
                         'role': ['admin'],
                     }
@@ -89,7 +89,7 @@ class TokensAuth(TokenAuth):
         return validation['valid']
         """
         users = app.data.driver.db['users']
-        lookup = {'firstname': token['username']}
+        lookup = {'first_name': token['username']}
         if allowed_roles:
             lookup['role'] = {'$in': allowed_roles}
         user = users.find_one(lookup)

attract/settings.py

@@ -12,12 +12,12 @@ ITEM_METHODS = ['GET', 'PUT', 'DELETE', 'PATCH']
 PAGINATION_LIMIT = 100
 
 users_schema = {
-    'firstname': {
+    'first_name': {
         'type': 'string',
         'minlength': 1,
         'maxlength': 60,
     },
-    'lastname': {
+    'last_name': {
         'type': 'string',
         'minlength': 1,
         'maxlength': 60,

attract/test_attract.py

@@ -15,10 +15,10 @@ class AttractTestCase(unittest.TestCase):
         b64Val = base64.b64encode(usrPass)
         return b64Val
 
-    def addUser(self, firstname, lastname, role):
+    def addUser(self, first_name, last_name, role):
         return self.app.post('/users', data=dict(
-            firstname=firstname,
+            first_name=first_name,
-            lastname=lastname,
+            last_name=last_name,
             role=role,
         ), follow_redirects=True)
 
@@ -118,8 +118,8 @@ class AttractTestCase(unittest.TestCase):
         test_user = {
             "_id": ObjectId("550171c8135d3248e477f288"),
             "_updated": datetime.now(),
-            "firstname": "TestFirstname",
+            "firs_tname": "TestFirstname",
-            "lastname": "TestLastname",
+            "last_name": "TestLastname",
             "role": "author",
             "_created": datetime.now(),
             "_etag": "302236e27f51d2e26041ae9de49505d77332b260"