diff --git a/server/app/core/models.py b/server/app/core/models.py index eca076e960778c4271e041d643fb29e251241833..c7f37e74654aa59a0eb0038ed157542c03c7628d 100644 --- a/server/app/core/models.py +++ b/server/app/core/models.py @@ -119,7 +119,7 @@ class Slide(db.Model): title = db.Column(db.String(STRING_SIZE), nullable=False, default="") body = db.Column(db.Text, nullable=False, default="") timer = db.Column(db.Integer, nullable=False, default=0) - settings = db.Column(db.Text, nullable=False, default="{}") # Json object + settings = db.Column(db.Text, nullable=False, default="{}") competition_id = db.Column(db.Integer, db.ForeignKey("competition.id"), nullable=False) questions = db.relationship("Question", backref="slide") @@ -133,13 +133,15 @@ class Question(db.Model): __table_args__ = (db.UniqueConstraint("slide_id", "name"),) id = db.Column(db.Integer, primary_key=True) name = db.Column(db.String(STRING_SIZE), nullable=False) + total_score = db.Column(db.Integer, nullable=False, default=1) type_id = db.Column(db.Integer, db.ForeignKey("question_type.id"), nullable=False) slide_id = db.Column(db.Integer, db.ForeignKey("slide.id"), nullable=False) question_answers = db.relationship("QuestionAnswer", backref="question") alternatives = db.relationship("QuestionAlternative", backref="question") - def __init__(self, name, type_id, slide_id): + def __init__(self, name, total_score, type_id, slide_id): self.name = name + self.total_score = total_score self.type_id = type_id self.slide_id = slide_id @@ -160,7 +162,7 @@ class QuestionAnswer(db.Model): __table_args__ = (db.UniqueConstraint("question_id", "team_id"),) id = db.Column(db.Integer, primary_key=True) data = db.Column(db.Text, nullable=False) - score = db.Column(db.Integer, nullable=False, default=0) # 0: False, 1: True + score = db.Column(db.Integer, nullable=False, default=0) question_id = db.Column(db.Integer, db.ForeignKey("question.id"), nullable=False) team_id = db.Column(db.Integer, db.ForeignKey("team.id"), nullable=False) diff --git a/server/tests/test_db.py b/server/tests/test_db.py index 6af7d77a9e37b522e68b84153b061c7d2abcd4d6..46303211dca998a3a25097d42428e732539b10b8 100644 --- a/server/tests/test_db.py +++ b/server/tests/test_db.py @@ -102,8 +102,8 @@ def test_question(client): question_type_bool = QuestionType.query.filter_by(name="Boolean").first() question_type_multiple = QuestionType.query.filter_by(name="Multiple").first() - db.session.add(Question("Fråga1", question_type_bool.id, item_slide2.id)) - db.session.add(Question("Fråga2", question_type_multiple.id, item_slide3.id)) + db.session.add(Question("Fråga1", 10, question_type_bool.id, item_slide2.id)) + db.session.add(Question("Fråga2", 10, question_type_multiple.id, item_slide3.id)) db.session.commit() assert question_type_bool is not None