fix: question score use first_api instead of first_extended and have it's own file

server/app/apis/__init__.py

@@ -100,6 +100,7 @@ from .components import api as component_ns
 from .media import api as media_ns
 from .misc import api as misc_ns
 from .questions import api as question_ns
+from .scores import api as score_ns
 from .slides import api as slide_ns
 from .teams import api as team_ns
 from .users import api as user_ns
@@ -114,8 +115,9 @@ flask_api.add_namespace(slide_ns, path="/api/competitions/<competition_id>/slide
 flask_api.add_namespace(
     alternative_ns, path="/api/competitions/<competition_id>/slides/<slide_id>/questions/<question_id>/alternatives"
 )
-flask_api.add_namespace(answer_ns, path="/api/competitions/<competition_id>/teams/<team_id>/answers")
 flask_api.add_namespace(team_ns, path="/api/competitions/<competition_id>/teams")
 flask_api.add_namespace(code_ns, path="/api/competitions/<competition_id>/codes")
 flask_api.add_namespace(question_ns, path="/api/competitions/<competition_id>")
 flask_api.add_namespace(component_ns, path="/api/competitions/<competition_id>/slides/<slide_id>/components")
+flask_api.add_namespace(answer_ns, path="/api/competitions/<competition_id>/teams/<team_id>/answers")
+flask_api.add_namespace(score_ns, path="/api/competitions/<competition_id>/teams/<team_id>/answers/question_scores")

server/app/apis/answers.py

@@ -23,23 +23,6 @@ answer_parser_add.add_argument("answer", type=str, required=True, location="json
 answer_parser_edit = reqparse.RequestParser()
 answer_parser_edit.add_argument("answer", type=str, default=sentinel, location="json")
 
-score_parser_add = reqparse.RequestParser()
-score_parser_add.add_argument("score", type=int, required=False, location="json")
-
-score_parser_edit = reqparse.RequestParser()
-score_parser_edit.add_argument("score", type=int, default=sentinel, location="json")
-
-
-@api.route("/question_scores")
-@api.param("competition_id, team_id")
-class QuestionScoreList(Resource):
-    @protect_route(allowed_roles=["*"], allowed_views=["*"])
-    def get(self, competition_id, team_id):
-        """ Gets all question answers that the specified team has given. """
-
-        items = dbc.get.question_score_list(competition_id, team_id)
-        return list_response(score_list_schema.dump(items))
-
 
 @api.route("/question_alternatives")
 @api.param("competition_id, team_id")
@@ -52,31 +35,6 @@ class QuestionAlternativeList(Resource):
         return list_response(list_schema.dump(items))
 
 
-@api.route("/question_scores/<question_id>")
-@api.param("competition_id, team_id, question_id")
-class QuestionScores(Resource):
-    @protect_route(allowed_roles=["*"], allowed_views=["*"])
-    def get(self, competition_id, team_id, question_id):
-        """ Gets the specified question answer. """
-
-        item = dbc.get.question_score(competition_id, team_id, question_id)
-        return item_response(score_schema.dump(item))
-
-    @protect_route(allowed_roles=["*"], allowed_views=["*"])
-    def put(self, competition_id, team_id, question_id):
-        """ Add or edit specified quesiton_answer. """
-
-        item = dbc.get.question_score(competition_id, team_id, question_id, required=False)
-        if item is None:
-            args = score_parser_add.parse_args(strict=True)
-            item = dbc.add.question_score(args.get("score"), question_id, team_id)
-        else:
-            args = score_parser_edit.parse_args(strict=True)
-            item = dbc.edit.default(item, **args)
-
-        return item_response(score_schema.dump(item))
-
-
 @api.route("/question_alternatives/<question_alternative_id>")
 @api.param("competition_id, team_id, question_alternative_id")
 class QuestionAlternativeAnswers(Resource):

server/app/apis/scores.py

+"""
+All API calls concerning question score.
+Default route: /api/competitions/<competition_id>/teams/<team_id>/answers/quesiton_scores
+"""
+
+import app.database.controller as dbc
+from app.apis import item_response, list_response, protect_route
+from app.core.dto import QuestionScoreDTO
+from app.core.parsers import sentinel
+from flask_restx import Resource, reqparse
+
+api = QuestionScoreDTO.api
+schema = QuestionScoreDTO.schema
+list_schema = QuestionScoreDTO.list_schema
+
+score_parser_add = reqparse.RequestParser()
+score_parser_add.add_argument("score", type=int, required=False, location="json")
+
+score_parser_edit = reqparse.RequestParser()
+score_parser_edit.add_argument("score", type=int, default=sentinel, location="json")
+
+
+@api.route("/")
+@api.param("competition_id, team_id")
+class QuestionScoreList(Resource):
+    @protect_route(allowed_roles=["*"], allowed_views=["*"])
+    def get(self, competition_id, team_id):
+        """ Gets all question answers that the specified team has given. """
+
+        items = dbc.get.question_score_list(competition_id, team_id)
+        return list_response(list_schema.dump(items))
+
+
+@api.route("/<question_id>")
+@api.param("competition_id, team_id, question_id")
+class QuestionScores(Resource):
+    @protect_route(allowed_roles=["*"], allowed_views=["*"])
+    def get(self, competition_id, team_id, question_id):
+        """ Gets the specified question answer. """
+
+        item = dbc.get.question_score(competition_id, team_id, question_id)
+        return item_response(schema.dump(item))
+
+    @protect_route(allowed_roles=["*"], allowed_views=["*"])
+    def put(self, competition_id, team_id, question_id):
+        """ Add or edit specified quesiton_answer. """
+
+        item = dbc.get.question_score(competition_id, team_id, question_id, required=False)
+        if item is None:
+            args = score_parser_add.parse_args(strict=True)
+            item = dbc.add.question_score(args.get("score"), question_id, team_id)
+        else:
+            args = score_parser_edit.parse_args(strict=True)
+            item = dbc.edit.default(item, **args)
+
+        return item_response(schema.dump(item))

server/app/database/controller/get.py

@@ -222,7 +222,7 @@ def question_score(competition_id, team_id, question_id, required=True):
         QuestionScore.query.join(Team, join_team)
         .join(Competition, join_competition)
         .filter(filters)
-        .first_extended(required)
+        .first_api(required)
     )