diff --git a/models/User/user.py b/models/User/user.py index d6f01a4..552796c 100644 --- a/models/User/user.py +++ b/models/User/user.py @@ -8,6 +8,7 @@ class User(db.Model): id = db.Column(db.Integer, primary_key=True) username = db.Column(db.String(80), unique=True, nullable=False) + email = db.Column(db.String(120), unique=True, nullable=False) # Add email field _password = db.Column("password", db.String(255), nullable=False) profile = db.relationship('UserProfile', back_populates='user', uselist=False, cascade="all, delete-orphan") @@ -29,11 +30,11 @@ class User(db.Model): @event.listens_for(User, 'after_insert') def create_user_profile(mapper, connection, target): connection.execute( - UserProfile.__table__.insert().values ( - user_id = target.id, - first_name = "", - last_name = "", - bio = "", - profile_picture = "" + UserProfile.__table__.insert().values( + user_id=target.id, + first_name="", + last_name="", + bio="", + profile_picture="" ) ) \ No newline at end of file diff --git a/models/UserProfile/user_profile.py b/models/UserProfile/user_profile.py index 2063b39..d3fa194 100644 --- a/models/UserProfile/user_profile.py +++ b/models/UserProfile/user_profile.py @@ -1,14 +1,13 @@ from models import db class UserProfile(db.Model): - __tablename__ = 'user_profile' + __tablename__ = 'user_profiles' - id = db.Column(db.Integer, primary_key = True) - user_id = db.Column(db.Integer, db.ForeignKey('users.id'), nullable = False) - first_name = db.Column(db.String(80), nullable = False) - last_name = db.Column(db.String(80), nullable = False) - bio = db.Column(db.Text, nullable = True) - profile_picture = db.Column(db.String(255), nullable = True) + id = db.Column(db.Integer, primary_key=True) + user_id = db.Column(db.Integer, db.ForeignKey('users.id'), nullable=False) + first_name = db.Column(db.String(50), nullable=False, default="") + last_name = db.Column(db.String(50), nullable=False, default="") + bio = db.Column(db.Text, default="") + profile_picture = db.Column(db.String(255), default="") - user = db.relationship('User', back_populates='profile') - \ No newline at end of file + user = db.relationship('User', back_populates='profile') \ No newline at end of file