From 4d56dbb938703f6a84bb372486760f5340fb3c9d Mon Sep 17 00:00:00 2001
From: robban64 <carl@schonfelder.se>
Date: Fri, 23 Apr 2021 12:54:49 +0200
Subject: [PATCH] fix: url(/) for swagger and code_list
---
server/app/__init__.py | 2 +-
server/app/apis/alternatives.py | 2 +-
server/app/apis/answers.py | 2 +-
server/app/apis/codes.py | 2 +-
server/app/apis/competitions.py | 2 +-
server/app/apis/components.py | 2 +-
server/app/apis/slides.py | 2 +-
server/app/apis/teams.py | 2 +-
server/app/apis/users.py | 2 +-
server/app/database/controller/get.py | 11 ++++-------
10 files changed, 13 insertions(+), 16 deletions(-)
diff --git a/server/app/__init__.py b/server/app/__init__.py
index 9215563a..2add6544 100644
--- a/server/app/__init__.py
+++ b/server/app/__init__.py
@@ -34,7 +34,7 @@ def create_app(config_name="configmodule.DevelopmentConfig"):
return redirect(rp[:-1])
@app.after_request
- def set_core(response):
+ def set_corse(response):
header = response.headers
header["Access-Control-Allow-Origin"] = "*"
return response
diff --git a/server/app/apis/alternatives.py b/server/app/apis/alternatives.py
index d56a2f8b..ce7b4e7d 100644
--- a/server/app/apis/alternatives.py
+++ b/server/app/apis/alternatives.py
@@ -13,7 +13,7 @@ schema = QuestionAlternativeDTO.schema
list_schema = QuestionAlternativeDTO.list_schema
-@api.route("/")
+@api.route("")
@api.param("competition_id, slide_id, question_id")
class QuestionAlternativeList(Resource):
@check_jwt(editor=True)
diff --git a/server/app/apis/answers.py b/server/app/apis/answers.py
index 308b1001..0ef30039 100644
--- a/server/app/apis/answers.py
+++ b/server/app/apis/answers.py
@@ -13,7 +13,7 @@ schema = QuestionAnswerDTO.schema
list_schema = QuestionAnswerDTO.list_schema
-@api.route("/")
+@api.route("")
@api.param("competition_id, team_id")
class QuestionAnswerList(Resource):
@check_jwt(editor=True)
diff --git a/server/app/apis/codes.py b/server/app/apis/codes.py
index c761420f..2a2eea5c 100644
--- a/server/app/apis/codes.py
+++ b/server/app/apis/codes.py
@@ -12,7 +12,7 @@ schema = CodeDTO.schema
list_schema = CodeDTO.list_schema
-@api.route("/")
+@api.route("")
@api.param("competition_id")
class CodesList(Resource):
@check_jwt(editor=True)
diff --git a/server/app/apis/competitions.py b/server/app/apis/competitions.py
index 386d4051..4a6bf79d 100644
--- a/server/app/apis/competitions.py
+++ b/server/app/apis/competitions.py
@@ -15,7 +15,7 @@ rich_schema = CompetitionDTO.rich_schema
list_schema = CompetitionDTO.list_schema
-@api.route("/")
+@api.route("")
class CompetitionsList(Resource):
@check_jwt(editor=True)
def post(self):
diff --git a/server/app/apis/components.py b/server/app/apis/components.py
index c895f023..23d25025 100644
--- a/server/app/apis/components.py
+++ b/server/app/apis/components.py
@@ -35,7 +35,7 @@ class ComponentByID(Resource):
return {}, codes.NO_CONTENT
-@api.route("/")
+@api.route("")
@api.param("competition_id, slide_id")
class ComponentList(Resource):
@check_jwt(editor=True)
diff --git a/server/app/apis/slides.py b/server/app/apis/slides.py
index ef8cf89c..9ca4a5f2 100644
--- a/server/app/apis/slides.py
+++ b/server/app/apis/slides.py
@@ -12,7 +12,7 @@ schema = SlideDTO.schema
list_schema = SlideDTO.list_schema
-@api.route("/")
+@api.route("")
@api.param("competition_id")
class SlidesList(Resource):
@check_jwt(editor=True)
diff --git a/server/app/apis/teams.py b/server/app/apis/teams.py
index 6596244c..514748ae 100644
--- a/server/app/apis/teams.py
+++ b/server/app/apis/teams.py
@@ -12,7 +12,7 @@ schema = TeamDTO.schema
list_schema = TeamDTO.list_schema
-@api.route("/")
+@api.route("")
@api.param("competition_id")
class TeamsList(Resource):
@check_jwt(editor=True)
diff --git a/server/app/apis/users.py b/server/app/apis/users.py
index 767f01cb..1bae000b 100644
--- a/server/app/apis/users.py
+++ b/server/app/apis/users.py
@@ -27,7 +27,7 @@ def edit_user(item_user, args):
return dbc.edit.default(item_user, **args)
-@api.route("/")
+@api.route("")
class UsersList(Resource):
@check_jwt(editor=True)
def get(self):
diff --git a/server/app/database/controller/get.py b/server/app/database/controller/get.py
index 15e908ef..96405b5a 100644
--- a/server/app/database/controller/get.py
+++ b/server/app/database/controller/get.py
@@ -39,13 +39,10 @@ def code_by_code(code):
def code_list(competition_id):
""" Gets a list of all code objects associated with a the provided competition. """
-
- team_view_id = 1
- join_filters = (Code.view_type_id == team_view_id) & (Team.id == Code.pointer)
- filters = ((Code.view_type_id != team_view_id) & (Code.pointer == competition_id))(
- (Code.view_type_id == team_view_id) & (competition_id == Team.competition_id)
- )
- return Code.query.join(Team, join_filters, isouter=True).filter(filters).all()
+ # team_view_id = 1
+ join_competition = Competition.id == Code.pointer
+ filters = Competition.id == competition_id
+ return Code.query.join(Competition, join_competition).filter(filters).all()
### Users ###
--
GitLab