Tests added for dao.

app/models.py

@@ -1,3 +1,4 @@
+import datetime
 from app import db
 from flask import current_app
 
@@ -33,12 +34,21 @@ class User(db.Model):
     email_address = db.Column(db.String(255), nullable=False, index=True, unique=True)
     password = db.Column(db.String, index=False, unique=False, nullable=False)
     mobile_number = db.Column(db.String, index=False, unique=False, nullable=False)
-    created_at = db.Column(db.DateTime, index=False, unique=False, nullable=False)
-    updated_at = db.Column(db.DateTime, index=False, unique=False, nullable=True)
+    created_at = db.Column(db.DateTime,
+                           index=False,
+                           unique=False,
+                           nullable=False,
+                           default=datetime.datetime.now)
+    updated_at = db.Column(db.DateTime,
+                           index=False,
+                           unique=False,
+                           nullable=True,
+                           onupdate=datetime.datetime.now)
     password_changed_at = db.Column(db.DateTime, index=False, unique=False, nullable=True)
     role_id = db.Column(db.Integer, db.ForeignKey('roles.id'), index=True, unique=False, nullable=False)
     logged_in_at = db.Column(db.DateTime, nullable=True)
     failed_login_count = db.Column(db.Integer, nullable=False, default=0)
+    # TODO should this be an enum?
     state = db.Column(db.String, nullable=False, default='pending')
 
     def serialize(self):
@@ -78,37 +88,37 @@ class User(db.Model):
                 return True
 
 
-user_to_service = db.Table(
-    'user_to_service',
-    db.Model.metadata,
-    db.Column('user_id', db.Integer, db.ForeignKey('users.id')),
-    db.Column('service_id', db.Integer, db.ForeignKey('services.id'))
-)
+# user_to_service = db.Table(
+#     'user_to_service',
+#     db.Model.metadata,
+#     db.Column('user_id', db.Integer, db.ForeignKey('users.id')),
+#     db.Column('service_id', db.Integer, db.ForeignKey('services.id'))
+# )
 
 
-class Service(db.Model):
-    __tablename__ = 'services'
+# class Service(db.Model):
+#     __tablename__ = 'services'
 
-    id = db.Column(db.Integer, primary_key=True)
-    name = db.Column(db.String(255), nullable=False, unique=True)
-    created_at = db.Column(db.DateTime, index=False, unique=False, nullable=False)
-    active = db.Column(db.Boolean, index=False, unique=False, nullable=False)
-    limit = db.Column(db.BigInteger, index=False, unique=False, nullable=False)
-    users = db.relationship('User', secondary=user_to_service, backref=db.backref('user_to_service', lazy='dynamic'))
-    restricted = db.Column(db.Boolean, index=False, unique=False, nullable=False)
+#     id = db.Column(db.Integer, primary_key=True)
+#     name = db.Column(db.String(255), nullable=False, unique=True)
+#     created_at = db.Column(db.DateTime, index=False, unique=False, nullable=False)
+#     active = db.Column(db.Boolean, index=False, unique=False, nullable=False)
+#     limit = db.Column(db.BigInteger, index=False, unique=False, nullable=False)
+#     users = db.relationship('User', secondary=user_to_service, backref=db.backref('user_to_service', lazy='dynamic'))
+#     restricted = db.Column(db.Boolean, index=False, unique=False, nullable=False)
 
-    def serialize(self):
-        serialized = {
-            'id': self.id,
-            'name': self.name,
-            'createdAt': self.created_at.strftime(DATETIME_FORMAT),
-            'active': self.active,
-            'restricted': self.restricted,
-            'limit': self.limit,
-            'user': self.users.serialize()
-        }
+#     def serialize(self):
+#         serialized = {
+#             'id': self.id,
+#             'name': self.name,
+#             'createdAt': self.created_at.strftime(DATETIME_FORMAT),
+#             'active': self.active,
+#             'restricted': self.restricted,
+#             'limit': self.limit,
+#             'user': self.users.serialize()
+#         }
 
-        return filter_null_value_fields(serialized)
+#         return filter_null_value_fields(serialized)
 
 
 def filter_null_value_fields(obj):