diff --git a/app.db b/app.db index 1938231..9b26031 100644 Binary files a/app.db and b/app.db differ diff --git a/manage.py b/manage.py old mode 100644 new mode 100755 diff --git a/models/user_model.py b/models/user_model.py index 035a85c..0cf9ad1 100644 --- a/models/user_model.py +++ b/models/user_model.py @@ -38,7 +38,8 @@ class User(UserMixin, db.Model): lang = db.Column(db.String(16), index=False, unique=False) timezone = db.Column(db.String(32), index=False, unique=False) posts = db.relationship('Post', backref='author', lazy='dynamic') - example_data_item = db.relationship('ExampleDataItem', backref='owner', lazy='dynamic') + example_data_item = db.relationship('ExampleDataItem', backref='owner') + example_data_item_id = db.Column(db.ForeignKey(ExampleDataItem.id)) about_me = db.Column(db.String(140)) role = db.Column(db.String(64)) password = db.Column(db.String(255), nullable=True) @@ -58,6 +59,10 @@ class User(UserMixin, db.Model): backref=db.backref('followers', lazy='dynamic'), lazy='dynamic') + def __init__(self, email, password): + self.email = email + self.password = sha256_crypt.encrypt(password) + @staticmethod def get_by_identifier(identifier): """ @@ -297,6 +302,9 @@ class User(UserMixin, db.Model): return Post.query.join(followers, (followers.c.followed_id == Post.user_id)).filter( followers.c.follower_id == self.id).order_by(Post.timestamp.desc()) + def to_dict(self): + return dict(id=self.id, email=self.email) + def __repr__(self): return '' % self.nickname