#35 Added course code field to Course model. Updated class functions to reflect change. Also added duplicate checking for create course endpoint
This commit was merged in pull request #36.
This commit is contained in:
@@ -71,15 +71,16 @@ class User(UserMixin, db.Model):
|
||||
class Course(db.Model):
|
||||
id = sa.Column(sa.Integer, primary_key=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)
|
||||
instructor = sa.Column(sa.ForeignKey(User.id), index=True)
|
||||
created_at = sa.Column(sa.DateTime)
|
||||
|
||||
def __repr__(self) -> str:
|
||||
return f"<Course {self.name}>"
|
||||
return f"<Course {self.course_code}>"
|
||||
|
||||
def from_dict(self, data) -> None:
|
||||
for field in ["name", "description", "instructor"]:
|
||||
for field in ["name", "course_code", "description", "instructor"]:
|
||||
if field in data:
|
||||
setattr(self, field, data[field])
|
||||
|
||||
@@ -88,7 +89,7 @@ class Course(db.Model):
|
||||
|
||||
def to_dict(self) -> dict:
|
||||
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["instructor"] = User.query.get(self.instructor).username
|
||||
|
||||
@@ -77,7 +77,7 @@ def register():
|
||||
def create_course():
|
||||
data = request.get_json()
|
||||
|
||||
required_fields = ["name", "description", "instructor"]
|
||||
required_fields = ["name", "course_code", "description", "instructor"]
|
||||
|
||||
if f := check_data(data, required_fields):
|
||||
return error_response(400, f"Must supply {f}")
|
||||
@@ -86,6 +86,10 @@ def create_course():
|
||||
if not u:
|
||||
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":
|
||||
return error_response(400, "User is not instructor")
|
||||
|
||||
|
||||
Reference in New Issue
Block a user