From 9e27ef964abaaa4784bf1e5096a5d5b2aa73a2c3 Mon Sep 17 00:00:00 2001 From: Rebecca Law Date: Thu, 26 Nov 2015 11:53:49 +0000 Subject: [PATCH] Make users.name unique. --- app/models.py | 2 +- migrations/versions/{create_users.py => 10_create_users.py} | 2 +- tests/app/main/dao/test_get_all_users.py | 2 +- tests/app/main/dao/test_users_dao.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) rename migrations/versions/{create_users.py => 10_create_users.py} (94%) diff --git a/app/models.py b/app/models.py index 0a153a9a3..56c65e7f9 100644 --- a/app/models.py +++ b/app/models.py @@ -16,7 +16,7 @@ class Users(db.Model): __tablename__ = 'users' id = db.Column(db.Integer, primary_key=True) - name = db.Column(db.String, nullable=False, index=True) + name = db.Column(db.String, nullable=False, index=True, unique=True) email_address = db.Column(db.String(255), nullable=False, index=True) password = db.Column(db.String, index=False, unique=False, nullable=False) mobile_number = db.Column(db.String, index=False, unique=False, nullable=False) diff --git a/migrations/versions/create_users.py b/migrations/versions/10_create_users.py similarity index 94% rename from migrations/versions/create_users.py rename to migrations/versions/10_create_users.py index f06a91bd0..d68622781 100644 --- a/migrations/versions/create_users.py +++ b/migrations/versions/10_create_users.py @@ -21,7 +21,7 @@ def upgrade(): op.create_table('users', sa.Column('id', sa.Integer, primary_key=True), - sa.Column('name', sa.String, nullable=False), + sa.Column('name', sa.String, nullable=False, unique=True), sa.Column('email_address', sa.String(length=255), nullable=False), sa.Column('password', sa.String, nullable=False), sa.Column('mobile_number', sa.String, nullable=False), diff --git a/tests/app/main/dao/test_get_all_users.py b/tests/app/main/dao/test_get_all_users.py index 3cc846ca4..96229db72 100644 --- a/tests/app/main/dao/test_get_all_users.py +++ b/tests/app/main/dao/test_get_all_users.py @@ -17,7 +17,7 @@ def test_get_all_users_returns_all_users(notifications_admin, notifications_admi mobile_number='+441234123412', created_at=datetime.now(), role_id=1) - user3 = Users(name='test two', + user3 = Users(name='test three', password='some2ndpassword', email_address='test2@get_all.gov.uk', mobile_number='+441234123412', diff --git a/tests/app/main/dao/test_users_dao.py b/tests/app/main/dao/test_users_dao.py index 58796922e..a4b8a910c 100644 --- a/tests/app/main/dao/test_users_dao.py +++ b/tests/app/main/dao/test_users_dao.py @@ -21,7 +21,7 @@ def test_insert_user_should_add_user(notifications_admin, notifications_admin_db def test_insert_user_with_role_that_does_not_exist_fails(notifications_admin, notifications_admin_db): - user = Users(name='test insert', + user = Users(name='role does not exist', password='somepassword', email_address='test@insert.gov.uk', mobile_number='+441234123412',