From 5d8d6d66ac36fe8d4d64fa9bfaab91ffb66512b2 Mon Sep 17 00:00:00 2001
From: robban64 <carl@schonfelder.se>
Date: Wed, 19 May 2021 17:59:27 +0200
Subject: [PATCH] fix: question score use first_api instead of first_extended
and have it's own file
---
server/app/apis/__init__.py | 4 +-
server/app/apis/answers.py | 42 --------------------
server/app/apis/scores.py | 56 +++++++++++++++++++++++++++
server/app/database/controller/get.py | 2 +-
4 files changed, 60 insertions(+), 44 deletions(-)
create mode 100644 server/app/apis/scores.py
diff --git a/server/app/apis/__init__.py b/server/app/apis/__init__.py
index 3cb92488..ad71728a 100644
--- a/server/app/apis/__init__.py
+++ b/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")
diff --git a/server/app/apis/answers.py b/server/app/apis/answers.py
index 853b97a0..190f7491 100644
--- a/server/app/apis/answers.py
+++ b/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):
diff --git a/server/app/apis/scores.py b/server/app/apis/scores.py
new file mode 100644
index 00000000..2d303e1c
--- /dev/null
+++ b/server/app/apis/scores.py
@@ -0,0 +1,56 @@
+"""
+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))
diff --git a/server/app/database/controller/get.py b/server/app/database/controller/get.py
index b6eb429d..5c075b34 100644
--- a/server/app/database/controller/get.py
+++ b/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)
)
--
GitLab