Spaces:
Running
Running
Commit ·
bd591aa
1
Parent(s): b1df455
feat: refactor User model and add relationships for Note, Subject, and NoteType
Browse files- app/models.py +37 -1
app/models.py
CHANGED
|
@@ -5,9 +5,9 @@ from .extensions import db
|
|
| 5 |
|
| 6 |
|
| 7 |
class User(UserMixin, db.Model):
|
|
|
|
| 8 |
email = db.Column(db.String(120), unique=True, nullable=False)
|
| 9 |
name = db.Column(db.String(100), nullable=False)
|
| 10 |
-
id = db.Column(db.Integer, primary_key=True)
|
| 11 |
|
| 12 |
|
| 13 |
class OAuth(OAuthConsumerMixin, db.Model):
|
|
@@ -24,3 +24,39 @@ class OAuth(OAuthConsumerMixin, db.Model):
|
|
| 24 |
User,
|
| 25 |
backref=db.backref("oauth_accounts", cascade="all, delete-orphan"),
|
| 26 |
)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 5 |
|
| 6 |
|
| 7 |
class User(UserMixin, db.Model):
|
| 8 |
+
id = db.Column(db.Integer, primary_key=True)
|
| 9 |
email = db.Column(db.String(120), unique=True, nullable=False)
|
| 10 |
name = db.Column(db.String(100), nullable=False)
|
|
|
|
| 11 |
|
| 12 |
|
| 13 |
class OAuth(OAuthConsumerMixin, db.Model):
|
|
|
|
| 24 |
User,
|
| 25 |
backref=db.backref("oauth_accounts", cascade="all, delete-orphan"),
|
| 26 |
)
|
| 27 |
+
|
| 28 |
+
|
| 29 |
+
class Subject(db.Model):
|
| 30 |
+
id = db.Column(db.Integer, primary_key=True)
|
| 31 |
+
name = db.Column(db.String(100), nullable=False, unique=True)
|
| 32 |
+
|
| 33 |
+
notes = db.relationship("Note", back_populates="subject", lazy=True)
|
| 34 |
+
|
| 35 |
+
|
| 36 |
+
class NoteType(db.Model):
|
| 37 |
+
id = db.Column(db.Integer, primary_key=True)
|
| 38 |
+
name = db.Column(db.String(50), unique=True, nullable=False)
|
| 39 |
+
|
| 40 |
+
notes = db.relationship("Note", back_populates="note_type", lazy=True)
|
| 41 |
+
|
| 42 |
+
|
| 43 |
+
class Note(db.Model):
|
| 44 |
+
id = db.Column(db.Integer, primary_key=True)
|
| 45 |
+
|
| 46 |
+
title = db.Column(db.String(200), nullable=False)
|
| 47 |
+
description = db.Column(db.Text, nullable=True)
|
| 48 |
+
|
| 49 |
+
link = db.Column(db.String(500), nullable=True)
|
| 50 |
+
original_link = db.Column(db.String(500), nullable=True)
|
| 51 |
+
|
| 52 |
+
note_type_id = db.Column(db.Integer, db.ForeignKey("note_type.id"), nullable=False)
|
| 53 |
+
subject_id = db.Column(db.Integer, db.ForeignKey("subject.id"), nullable=False)
|
| 54 |
+
user_id = db.Column(db.Integer, db.ForeignKey("user.id"), nullable=False)
|
| 55 |
+
|
| 56 |
+
created_at = db.Column(
|
| 57 |
+
db.DateTime, nullable=False, default=db.func.current_timestamp()
|
| 58 |
+
)
|
| 59 |
+
|
| 60 |
+
user = db.relationship("User", backref=db.backref("notes", lazy=True))
|
| 61 |
+
subject = db.relationship("Subject", back_populates="notes")
|
| 62 |
+
note_type = db.relationship("NoteType", back_populates="notes")
|