#35-course-code #36
@@ -71,15 +71,16 @@ class User(UserMixin, db.Model):
|
|||||||
class Course(db.Model):
|
class Course(db.Model):
|
||||||
id = sa.Column(sa.Integer, primary_key=True)
|
id = sa.Column(sa.Integer, primary_key=True)
|
||||||
name = sa.Column(sa.String(128), index=True)
|
name = sa.Column(sa.String(128), index=True)
|
||||||
|
course_code = sa.Column(sa.String(32), index=True)
|
||||||
description = sa.Column(sa.Text, index=True)
|
description = sa.Column(sa.Text, index=True)
|
||||||
instructor = sa.Column(sa.ForeignKey(User.id), index=True)
|
instructor = sa.Column(sa.ForeignKey(User.id), index=True)
|
||||||
created_at = sa.Column(sa.DateTime)
|
created_at = sa.Column(sa.DateTime)
|
||||||
|
|
||||||
def __repr__(self) -> str:
|
def __repr__(self) -> str:
|
||||||
return f"<Course {self.name}>"
|
return f"<Course {self.course_code}>"
|
||||||
|
|
||||||
def from_dict(self, data) -> None:
|
def from_dict(self, data) -> None:
|
||||||
for field in ["name", "description", "instructor"]:
|
for field in ["name", "course_code", "description", "instructor"]:
|
||||||
if field in data:
|
if field in data:
|
||||||
setattr(self, field, data[field])
|
setattr(self, field, data[field])
|
||||||
|
|
||||||
@@ -88,7 +89,7 @@ class Course(db.Model):
|
|||||||
|
|
||||||
def to_dict(self) -> dict:
|
def to_dict(self) -> dict:
|
||||||
d = {}
|
d = {}
|
||||||
for f in ["id", "name", "description", "created_at"]:
|
for f in ["id", "name", "course_code", "description", "created_at"]:
|
||||||
d[f] = getattr(self, f)
|
d[f] = getattr(self, f)
|
||||||
|
|
||||||
d["instructor"] = User.query.get(self.instructor).username
|
d["instructor"] = User.query.get(self.instructor).username
|
||||||
|
|||||||
@@ -77,7 +77,7 @@ def register():
|
|||||||
def create_course():
|
def create_course():
|
||||||
data = request.get_json()
|
data = request.get_json()
|
||||||
|
|
||||||
required_fields = ["name", "description", "instructor"]
|
required_fields = ["name", "course_code", "description", "instructor"]
|
||||||
|
|
||||||
if f := check_data(data, required_fields):
|
if f := check_data(data, required_fields):
|
||||||
return error_response(400, f"Must supply {f}")
|
return error_response(400, f"Must supply {f}")
|
||||||
@@ -86,6 +86,10 @@ def create_course():
|
|||||||
if not u:
|
if not u:
|
||||||
return error_response(400, f"User with id {data['instructor']} does not exist")
|
return error_response(400, f"User with id {data['instructor']} does not exist")
|
||||||
|
|
||||||
|
c = Course.query.filter_by(course_code=data["course_code"]).first()
|
||||||
|
if c:
|
||||||
|
return error_response(400, f"Course with course code {data['course_code']} already exists")
|
||||||
|
|
||||||
if u.role != "instructor":
|
if u.role != "instructor":
|
||||||
return error_response(400, "User is not instructor")
|
return error_response(400, "User is not instructor")
|
||||||
|
|
||||||
|
|||||||
34
backend/migrations/versions/862905f5e34a_add_course_code.py
Normal file
34
backend/migrations/versions/862905f5e34a_add_course_code.py
Normal file
@@ -0,0 +1,34 @@
|
|||||||
|
"""Add course code
|
||||||
|
|
||||||
|
Revision ID: 862905f5e34a
|
||||||
|
Revises: 093a66f0b581
|
||||||
|
Create Date: 2023-04-06 21:55:54.838647
|
||||||
|
|
||||||
|
"""
|
||||||
|
from alembic import op
|
||||||
|
import sqlalchemy as sa
|
||||||
|
|
||||||
|
|
||||||
|
# revision identifiers, used by Alembic.
|
||||||
|
revision = '862905f5e34a'
|
||||||
|
down_revision = '093a66f0b581'
|
||||||
|
branch_labels = None
|
||||||
|
depends_on = None
|
||||||
|
|
||||||
|
|
||||||
|
def upgrade():
|
||||||
|
# ### commands auto generated by Alembic - please adjust! ###
|
||||||
|
with op.batch_alter_table('course', schema=None) as batch_op:
|
||||||
|
batch_op.add_column(sa.Column('course_code', sa.String(length=32), nullable=True))
|
||||||
|
batch_op.create_index(batch_op.f('ix_course_course_code'), ['course_code'], unique=False)
|
||||||
|
|
||||||
|
# ### end Alembic commands ###
|
||||||
|
|
||||||
|
|
||||||
|
def downgrade():
|
||||||
|
# ### commands auto generated by Alembic - please adjust! ###
|
||||||
|
with op.batch_alter_table('course', schema=None) as batch_op:
|
||||||
|
batch_op.drop_index(batch_op.f('ix_course_course_code'))
|
||||||
|
batch_op.drop_column('course_code')
|
||||||
|
|
||||||
|
# ### end Alembic commands ###
|
||||||
Reference in New Issue
Block a user