From f58e978ea1873a407a521a4253c0e0b3efb16673 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Victor=20L=C3=B6fgren?= <viclo211@student.liu.se>
Date: Sat, 22 May 2021 16:35:28 +0200
Subject: [PATCH] Fix some bugs
---
client/src/actions/cities.ts | 6 ++----
.../pages/admin/competitions/CompetitionManager.tsx | 5 ++---
client/src/pages/views/OperatorViewPage.tsx | 2 +-
client/src/utils/checkAuthenticationCompetition.ts | 10 +++++-----
server/app/apis/competitions.py | 4 ++--
server/app/database/controller/add.py | 3 +--
server/app/database/controller/utils.py | 8 ++++----
7 files changed, 17 insertions(+), 21 deletions(-)
diff --git a/client/src/actions/cities.ts b/client/src/actions/cities.ts
index 17fb9085..c06c94a0 100644
--- a/client/src/actions/cities.ts
+++ b/client/src/actions/cities.ts
@@ -15,15 +15,13 @@ export const getCities = () => async (dispatch: AppDispatch) => {
type: Types.SET_CITIES,
payload: res.data,
})
-
- const pagination = JSON.parse(res.headers.pagination)
dispatch({
type: Types.SET_CITIES_TOTAL,
- payload: pagination.total,
+ payload: res.data.length,
})
dispatch({
type: Types.SET_CITIES_COUNT,
- payload: pagination.total <= pagination.page_size ? pagination.total : pagination.page_size,
+ payload: res.data.length,
})
})
.catch((err) => console.log(err))
diff --git a/client/src/pages/admin/competitions/CompetitionManager.tsx b/client/src/pages/admin/competitions/CompetitionManager.tsx
index 7d4266cd..7c2c969e 100644
--- a/client/src/pages/admin/competitions/CompetitionManager.tsx
+++ b/client/src/pages/admin/competitions/CompetitionManager.tsx
@@ -161,7 +161,7 @@ const CompetitionManager: React.FC = (props: any) => {
await axios
.get(`/api/competitions/${id}/codes`)
.then((response) => {
- setCodes(response.data.items)
+ setCodes(response.data)
})
.catch(console.log)
}
@@ -171,8 +171,7 @@ const CompetitionManager: React.FC = (props: any) => {
await axios
.get(`/api/competitions/${id}/teams`)
.then((response) => {
- // console.log(response.data.items)
- setTeams(response.data.items)
+ setTeams(response.data)
})
.catch((err) => {
console.log(err)
diff --git a/client/src/pages/views/OperatorViewPage.tsx b/client/src/pages/views/OperatorViewPage.tsx
index 130240c2..55946eec 100644
--- a/client/src/pages/views/OperatorViewPage.tsx
+++ b/client/src/pages/views/OperatorViewPage.tsx
@@ -152,7 +152,7 @@ const OperatorViewPage: React.FC = () => {
await axios
.get(`/api/competitions/${activeId}/codes`)
.then((response) => {
- setCodes(response.data.items)
+ setCodes(response.data)
})
.catch(console.log)
}
diff --git a/client/src/utils/checkAuthenticationCompetition.ts b/client/src/utils/checkAuthenticationCompetition.ts
index f6dfd8fe..5da2eb3d 100644
--- a/client/src/utils/checkAuthenticationCompetition.ts
+++ b/client/src/utils/checkAuthenticationCompetition.ts
@@ -21,13 +21,13 @@ export const CheckAuthenticationCompetition = async (role: 'Judge' | 'Operator'
store.dispatch({
type: Types.SET_COMPETITION_LOGIN_DATA,
payload: {
- competition_id: decodedToken.user_claims.competition_id,
- team_id: decodedToken.user_claims.team_id,
- view: decodedToken.user_claims.view,
+ competition_id: decodedToken.competition_id,
+ team_id: decodedToken.team_id,
+ view: decodedToken.view,
},
})
- getPresentationCompetition(decodedToken.user_claims.competition_id)(store.dispatch, store.getState)
- setPresentationCode(decodedToken.user_claims.code)(store.dispatch)
+ getPresentationCompetition(decodedToken.competition_id)(store.dispatch, store.getState)
+ setPresentationCode(decodedToken.code)(store.dispatch)
})
.catch((error) => {
console.log(error)
diff --git a/server/app/apis/competitions.py b/server/app/apis/competitions.py
index e28c000b..10399bd8 100644
--- a/server/app/apis/competitions.py
+++ b/server/app/apis/competitions.py
@@ -46,7 +46,7 @@ class CompetitionSearchArgsSchema(BaseSchema):
@blp.route("")
-class CompetitionsList(MethodView):
+class Competitions(MethodView):
@protect_route(allowed_roles=["*"])
@blp.arguments(CompetitionAddArgsSchema)
@blp.response(http_codes.OK, CompetitionSchema)
@@ -57,7 +57,7 @@ class CompetitionsList(MethodView):
@blp.route("/<competition_id>")
-class Competitions(MethodView):
+class CompetitionById(MethodView):
@protect_route(allowed_roles=["*"], allowed_views=["*"])
@blp.response(http_codes.OK, CompetitionSchemaRich)
@blp.alt_response(http_codes.NOT_FOUND, None, description="Competition not found")
diff --git a/server/app/database/controller/add.py b/server/app/database/controller/add.py
index fb3d3487..9031eded 100644
--- a/server/app/database/controller/add.py
+++ b/server/app/database/controller/add.py
@@ -102,8 +102,7 @@ def component(type_id, slide_id, view_type_id, x=0, y=0, w=0, h=0, copy=False, *
)
item.question_id = data.get("question_id")
else:
- pass
- # abort(codes.BAD_REQUEST, f"Invalid type_id{type_id}")
+ abort(http_codes.BAD_REQUEST, f"Ogiltigt typ_id '{type_id}'")
item = dbc.utils.commit_and_refresh(item)
return item
diff --git a/server/app/database/controller/utils.py b/server/app/database/controller/utils.py
index b4add70e..acfddc13 100644
--- a/server/app/database/controller/utils.py
+++ b/server/app/database/controller/utils.py
@@ -2,9 +2,11 @@
This file contains some miscellaneous functionality.
"""
+from app.apis import http_codes
from app.core import db
from app.core.codes import generate_code_string
from app.database.models import Code
+from flask_smorest import abort
# from flask_restx import abort
@@ -106,8 +108,7 @@ def refresh(item):
try:
db.session.refresh(item)
except Exception as e:
- pass
- # abort(codes.INTERNAL_SERVER_ERROR, f"Refresh failed!\n{str(e)}")
+ abort(http_codes.INTERNAL_SERVER_ERROR, f"Refresh failed!\n{str(e)}")
return item
@@ -119,8 +120,7 @@ def commit():
db.session.commit()
except Exception as e:
db.session.rollback()
- pass
- # abort(codes.INTERNAL_SERVER_ERROR, f"Commit failed!\n{str(e)}")
+ abort(http_codes.INTERNAL_SERVER_ERROR, f"Commit failed!\n{str(e)}")
def commit_and_refresh(item):
--
GitLab