diff --git a/server/app/apis/__init__.py b/server/app/apis/__init__.py
index 37d7a0198d9e349fd1cb59226d37d4780b2e27da..04449e4cbc9bde44d9efbaf5674ee16112433d03 100644
--- a/server/app/apis/__init__.py
+++ b/server/app/apis/__init__.py
@@ -75,9 +75,9 @@ flask_api.add_namespace(user_ns, path="/api/users")
flask_api.add_namespace(auth_ns, path="/api/auth")
flask_api.add_namespace(comp_ns, path="/api/competitions")
flask_api.add_namespace(slide_ns, path="/api/competitions/<competition_id>/slides")
-flask_api.add_namespace(alternative_ns, path="/api/competitions/<CID>/slides/<SOrder>/questions/<QID>/alternatives")
-flask_api.add_namespace(answer_ns, path="/api/competitions/<CID>/teams/<TID>/answers")
-flask_api.add_namespace(team_ns, path="/api/competitions/<CID>/teams")
-flask_api.add_namespace(code_ns, path="/api/competitions/<CID>/codes")
-flask_api.add_namespace(question_ns, path="/api/competitions/<CID>")
-flask_api.add_namespace(component_ns, path="/api/competitions/<CID>/slides/<SOrder>/components")
+flask_api.add_namespace(alternative_ns, path="/api/competitions/<competition_id>/slides/<SOrder>/questions/<QID>/alternatives")
+flask_api.add_namespace(answer_ns, path="/api/competitions/<competition_id>/teams/<TID>/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/<SOrder>/components")
diff --git a/server/app/apis/alternatives.py b/server/app/apis/alternatives.py
index 8c247b40da2e33bda5cead7d28ce778f73881c6a..265e196871d17e336d33565698b15baa3e42870f 100644
--- a/server/app/apis/alternatives.py
+++ b/server/app/apis/alternatives.py
@@ -16,32 +16,32 @@ list_schema = QuestionAlternativeDTO.list_schema
@api.route("/")
-@api.param("CID, SOrder, QID")
+@api.param("competition_id, SOrder, QID")
class QuestionAlternativeList(Resource):
@check_jwt(editor=True)
- def get(self, CID, SOrder, QID):
+ def get(self, competition_id, SOrder, QID):
items = dbc.get.question_alternatives(QID)
return list_response(list_schema.dump(items))
@check_jwt(editor=True)
- def post(self, CID, SOrder, QID):
+ def post(self, competition_id, SOrder, QID):
args = question_alternative_parser.parse_args(strict=True)
item = dbc.add.question_alternative(**args, question_id=QID)
return item_response(schema.dump(item))
@api.route("/<AID>")
-@api.param("CID, SOrder, QID, AID")
+@api.param("competition_id, SOrder, QID, AID")
class QuestionAlternatives(Resource):
@check_jwt(editor=True)
- def put(self, CID, SOrder, QID, AID):
+ def put(self, competition_id, SOrder, QID, AID):
args = question_alternative_parser.parse_args(strict=True)
item = dbc.get.one(QuestionAlternative, AID)
item = dbc.edit.question_alternative(item, **args)
return item_response(schema.dump(item))
@check_jwt(editor=True)
- def delete(self, CID, SOrder, QID, AID):
+ def delete(self, competition_id, SOrder, QID, AID):
item = dbc.get.one(QuestionAlternative, AID)
dbc.delete.default(item)
return {}, codes.NO_CONTENT
diff --git a/server/app/apis/answers.py b/server/app/apis/answers.py
index 40e9407fc5d1df9cac874f7d16d28283278adf24..95ce38dc6d618f297b6763a5d4fd15527df1361b 100644
--- a/server/app/apis/answers.py
+++ b/server/app/apis/answers.py
@@ -16,25 +16,25 @@ list_schema = QuestionAnswerDTO.list_schema
@api.route("/")
-@api.param("CID, TID")
+@api.param("competition_id, TID")
class QuestionAnswerList(Resource):
@check_jwt(editor=True)
- def get(self, CID, TID):
+ def get(self, competition_id, TID):
items = dbc.get.question_answers(TID)
return list_response(list_schema.dump(items))
@check_jwt(editor=True)
- def post(self, CID, TID):
+ def post(self, competition_id, TID):
args = question_answer_parser.parse_args(strict=True)
item = dbc.add.question_answer(**args, team_id=TID)
return item_response(schema.dump(item))
@api.route("/<AID>")
-@api.param("CID, TID, AID")
+@api.param("competition_id, TID, AID")
class QuestionAnswers(Resource):
@check_jwt(editor=True)
- def put(self, CID, TID, AID):
+ def put(self, competition_id, TID, AID):
args = question_answer_edit_parser.parse_args(strict=True)
item = dbc.get.one(QuestionAnswer, AID)
item = dbc.edit.question_answer(item, **args)
diff --git a/server/app/apis/codes.py b/server/app/apis/codes.py
index 332d5f3e612b8c0ecf886c95331114073d6c6030..c761420fabab70254973a7d352ce6f9b7833ba25 100644
--- a/server/app/apis/codes.py
+++ b/server/app/apis/codes.py
@@ -1,12 +1,11 @@
import app.database.controller as dbc
-from app.apis import item_response, list_response
+from app.apis import check_jwt, item_response, list_response
from app.core import http_codes as codes
from app.core.dto import CodeDTO
from app.core.parsers import code_parser
from app.database.models import Code, Competition
from flask_jwt_extended import jwt_required
from flask_restx import Resource
-from app.apis import check_jwt
api = CodeDTO.api
schema = CodeDTO.schema
@@ -14,19 +13,19 @@ list_schema = CodeDTO.list_schema
@api.route("/")
-@api.param("CID")
+@api.param("competition_id")
class CodesList(Resource):
@check_jwt(editor=True)
- def get(self, CID):
- items = dbc.get.code_list(CID)
+ def get(self, competition_id):
+ items = dbc.get.code_list(competition_id)
return list_response(list_schema.dump(items), len(items)), codes.OK
@api.route("/<code_id>")
-@api.param("CID, code_id")
+@api.param("competition_id, code_id")
class CodesById(Resource):
@check_jwt(editor=False)
- def put(self, CID, code_id):
+ def put(self, competition_id, code_id):
item = dbc.get.one(Code, code_id)
item.code = dbc.utils.generate_unique_code()
dbc.utils.commit_and_refresh(item)
diff --git a/server/app/apis/components.py b/server/app/apis/components.py
index c68ca92864a75b21c5ac03d8a519029a3e44fd0a..3e50785a0b72457bbcb8b1226c8c66dcc796e94d 100644
--- a/server/app/apis/components.py
+++ b/server/app/apis/components.py
@@ -14,38 +14,38 @@ list_schema = ComponentDTO.list_schema
@api.route("/<component_id>")
-@api.param("CID, SOrder, component_id")
+@api.param("competition_id, SOrder, component_id")
class ComponentByID(Resource):
@check_jwt(editor=True)
- def get(self, CID, SOrder, component_id):
+ def get(self, competition_id, SOrder, component_id):
item = dbc.get.one(Component, component_id)
return item_response(schema.dump(item))
@check_jwt(editor=True)
- def put(self, CID, SOrder, component_id):
+ def put(self, competition_id, SOrder, component_id):
args = component_parser.parse_args()
item = dbc.get.one(Component, component_id)
item = dbc.edit.component(item, **args)
return item_response(schema.dump(item))
@check_jwt(editor=True)
- def delete(self, CID, SOrder, component_id):
+ def delete(self, competition_id, SOrder, component_id):
item = dbc.get.one(Component, component_id)
dbc.delete.component(item)
return {}, codes.NO_CONTENT
@api.route("/")
-@api.param("CID, SOrder")
+@api.param("competition_id, SOrder")
class ComponentList(Resource):
@check_jwt(editor=True)
- def get(self, CID, SOrder):
- items = dbc.get.component_list(CID, SOrder)
+ def get(self, competition_id, SOrder):
+ items = dbc.get.component_list(competition_id, SOrder)
return list_response(list_schema.dump(items))
@check_jwt(editor=True)
- def post(self, CID, SOrder):
+ def post(self, competition_id, SOrder):
args = component_create_parser.parse_args()
- item_slide = dbc.get.slide(CID, SOrder)
+ item_slide = dbc.get.slide(competition_id, SOrder)
item = dbc.add.component(item_slide=item_slide, **args)
return item_response(schema.dump(item))
diff --git a/server/app/apis/questions.py b/server/app/apis/questions.py
index 7d16d3c89e660345c510d84dc645f111dbd7fbf4..31b0072880e4b403e9a2f6ba5a668ce373582805 100644
--- a/server/app/apis/questions.py
+++ b/server/app/apis/questions.py
@@ -13,47 +13,47 @@ list_schema = QuestionDTO.list_schema
@api.route("/questions")
-@api.param("CID")
+@api.param("competition_id")
class QuestionList(Resource):
@check_jwt(editor=True)
- def get(self, CID):
- items = dbc.get.question_list(CID)
+ def get(self, competition_id):
+ items = dbc.get.question_list(competition_id)
return list_response(list_schema.dump(items))
@api.route("/slides/<SID>/questions")
-@api.param("CID, SID")
+@api.param("competition_id, SID")
class QuestionListForSlide(Resource):
@check_jwt(editor=True)
- def post(self, SID, CID):
+ def post(self, SID, competition_id):
args = question_parser.parse_args(strict=True)
del args["slide_id"]
- item_slide = dbc.get.slide(CID, SID)
+ item_slide = dbc.get.slide(competition_id, SID)
item = dbc.add.question(item_slide=item_slide, **args)
return item_response(schema.dump(item))
@api.route("/slides/<SID>/questions/<QID>")
-@api.param("CID, SID, QID")
+@api.param("competition_id, SID, QID")
class QuestionById(Resource):
@check_jwt(editor=True)
- def get(self, CID, SID, QID):
- item_question = dbc.get.question(CID, SID, QID)
+ def get(self, competition_id, SID, QID):
+ item_question = dbc.get.question(competition_id, SID, QID)
return item_response(schema.dump(item_question))
@check_jwt(editor=True)
- def put(self, CID, SID, QID):
+ def put(self, competition_id, SID, QID):
args = question_parser.parse_args(strict=True)
- item_question = dbc.get.question(CID, SID, QID)
+ item_question = dbc.get.question(competition_id, SID, QID)
item_question = dbc.edit.question(item_question, **args)
return item_response(schema.dump(item_question))
@check_jwt(editor=True)
- def delete(self, CID, SID, QID):
- item_question = dbc.get.question(CID, SID, QID)
+ def delete(self, competition_id, SID, QID):
+ item_question = dbc.get.question(competition_id, SID, QID)
dbc.delete.question(item_question)
return {}, codes.NO_CONTENT
diff --git a/server/app/apis/teams.py b/server/app/apis/teams.py
index 2bb0a23570e5de4abb1668347a6fe287b56e7957..9a88ffb87348f7f483f019f31dde2bf3ffcbcc0a 100644
--- a/server/app/apis/teams.py
+++ b/server/app/apis/teams.py
@@ -13,45 +13,45 @@ list_schema = TeamDTO.list_schema
@api.route("/")
-@api.param("CID")
+@api.param("competition_id")
class TeamsList(Resource):
@check_jwt(editor=True)
- def get(self, CID):
- items = dbc.get.team_list(CID)
+ def get(self, competition_id):
+ items = dbc.get.team_list(competition_id)
return list_response(list_schema.dump(items))
@check_jwt(editor=True)
- def post(self, CID):
+ def post(self, competition_id):
args = team_parser.parse_args(strict=True)
- item_comp = dbc.get.one(Competition, CID)
+ item_comp = dbc.get.one(Competition, competition_id)
item_team = dbc.add.team(args["name"], item_comp)
return item_response(schema.dump(item_team))
@api.route("/<TID>")
-@api.param("CID,TID")
+@api.param("competition_id,TID")
class Teams(Resource):
@jwt_required
@check_jwt(editor=True)
- def get(self, CID, TID):
- item = dbc.get.team(CID, TID)
+ def get(self, competition_id, TID):
+ item = dbc.get.team(competition_id, TID)
return item_response(schema.dump(item))
@jwt_required
@check_jwt(editor=True)
- def delete(self, CID, TID):
- item_team = dbc.get.team(CID, TID)
+ def delete(self, competition_id, TID):
+ item_team = dbc.get.team(competition_id, TID)
dbc.delete.team(item_team)
return {}, codes.NO_CONTENT
@jwt_required
@check_jwt(editor=True)
- def put(self, CID, TID):
+ def put(self, competition_id, TID):
args = team_parser.parse_args(strict=True)
name = args.get("name")
- item_team = dbc.get.team(CID, TID)
+ item_team = dbc.get.team(competition_id, TID)
- item_team = dbc.edit.team(item_team, name=name, competition_id=CID)
+ item_team = dbc.edit.team(item_team, name=name, competition_id=competition_id)
return item_response(schema.dump(item_team))