Skip to content
Snippets Groups Projects
Commit 45d26406 authored by Victor Löfgren's avatar Victor Löfgren
Browse files

Change CID to competition_id

parent a3eca98f
No related branches found
No related tags found
2 merge requests!92Resolve "Refactor/minimize editor code",!88Resolve "Restructure api routes"
This commit is part of merge request !92. Comments created here will be created in the context of that merge request.
Hide whitespace changes
Inline Side-by-side
server/app/apis/__init__.py
+ 6
− 6
View file @ 45d26406
......@@ -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")
server/app/apis/alternatives.py
+ 6
− 6
View file @ 45d26406
......@@ -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
server/app/apis/answers.py
+ 5
− 5
View file @ 45d26406
......@@ -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)
......
server/app/apis/codes.py
+ 6
− 7
View file @ 45d26406
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)
......
server/app/apis/components.py
+ 9
− 9
View file @ 45d26406
......@@ -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))
server/app/apis/questions.py
+ 13
− 13
View file @ 45d26406
......@@ -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
server/app/apis/teams.py
+ 13
− 13
View file @ 45d26406
......@@ -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))
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment