fix: removed order from many models

server/app/apis/competitions.py

@@ -29,7 +29,7 @@ class CompetitionsList(Resource):
         item = dbc.add.default(Competition(name, year, city_id))
 
         # Add default slide
-        item_slide = dbc.add.slide(item)
+        dbc.add.slide(item)
 
         dbc.refresh(item)
         return item_response(schema.dump(item))

server/app/apis/slides.py

 import app.core.controller as dbc
 import app.core.http_codes as codes
 from app.apis import admin_required, item_response, list_response
-from app.core import schemas
 from app.core.dto import SlideDTO
 from app.core.models import Competition, Slide
 from app.core.parsers import slide_parser
-from flask_jwt_extended import get_jwt_identity, jwt_required
-from flask_restx import Namespace, Resource, reqparse
+from flask_jwt_extended import jwt_required
+from flask_restx import Resource
 
 api = SlideDTO.api
 schema = SlideDTO.schema

server/app/core/models.py

@@ -130,34 +130,29 @@ class Slide(db.Model):
 
 
 class Question(db.Model):
-    __table_args__ = (db.UniqueConstraint("slide_id", "name"), db.UniqueConstraint("slide_id", "order"))
+    __table_args__ = (db.UniqueConstraint("slide_id", "name"),)
     id = db.Column(db.Integer, primary_key=True)
     name = db.Column(db.String(STRING_SIZE), nullable=False)
-    order = db.Column(db.Integer, nullable=False)
     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, order, type_id, slide_id):
+    def __init__(self, name, type_id, slide_id):
         self.name = name
-        self.order = order
         self.type_id = type_id
         self.slide_id = slide_id
 
 
 class QuestionAlternative(db.Model):
-    __table_args__ = (db.UniqueConstraint("question_id", "order"),)
     id = db.Column(db.Integer, primary_key=True)
     text = db.Column(db.String(STRING_SIZE), nullable=False)
     value = db.Column(db.Boolean, nullable=False)
-    order = db.Column(db.Integer, nullable=False)
     question_id = db.Column(db.Integer, db.ForeignKey("question.id"), nullable=False)
 
-    def __init__(self, text, value, order, question_id):
+    def __init__(self, text, value, question_id):
         self.text = text
         self.value = value
-        self.order = order
         self.question_id = question_id
 
 

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", 0, question_type_bool.id, item_slide2.id))
-    db.session.add(Question("Fråga2", 1, question_type_multiple.id, item_slide3.id))
+    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.commit()
 
     assert question_type_bool is not None