From 6c0d86ff754c0e7de413cdfcf9321ee8f9a1a931 Mon Sep 17 00:00:00 2001
From: Francesco Siddi <francesco.siddi@gmail.com>
Date: Thu, 16 Apr 2015 15:28:28 +0200
Subject: [PATCH] User naming cleanup

---
 attract/application/__init__.py |  6 +++---
 attract/settings.py             |  4 ++--
 attract/test_attract.py         | 10 +++++-----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/attract/application/__init__.py b/attract/application/__init__.py
index 3b50f21f..39d607c0 100644
--- a/attract/application/__init__.py
+++ b/attract/application/__init__.py
@@ -68,8 +68,8 @@ class TokensAuth(TokenAuth):
                 tmpname = email.split('@')[0]
                 if not dbuser:
                     user_data = {
-                        'firstname': tmpname,
-                        'lastname': tmpname,
+                        'first_name': 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)
diff --git a/attract/settings.py b/attract/settings.py
index 57dbaafd..ec37a03a 100644
--- a/attract/settings.py
+++ b/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,
diff --git a/attract/test_attract.py b/attract/test_attract.py
index 02c87a03..4455de47 100644
--- a/attract/test_attract.py
+++ b/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,
-            lastname=lastname,
+            first_name=first_name,
+            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",
-            "lastname": "TestLastname",
+            "firs_tname": "TestFirstname",
+            "last_name": "TestLastname",
             "role": "author",
             "_created": datetime.now(),
             "_etag": "302236e27f51d2e26041ae9de49505d77332b260"