diff --git a/server/app/apis/users.py b/server/app/apis/users.py index fc6e7007fc2ea91a93ae22100b602f87d7f7d853..07e2484d6cbf67efd23ba2132af6a17f963babce 100644 --- a/server/app/apis/users.py +++ b/server/app/apis/users.py @@ -57,8 +57,6 @@ class Users(Resource): class UserSearch(Resource): @jwt_required def get(self): - # print(f"{request.url=}, {request.args=}") args = user_search_parser.parse_args(strict=True) - # print(f"{args}") - items, total = dbc.get.search_user(**request.args.to_dict()) + items, total = dbc.get.search_user(**args) return list_response(list_schema.dump(items), total) diff --git a/server/app/core/parsers.py b/server/app/core/parsers.py index f6a9ccf9a2c26ecc2dd5fdac6f21f4cc9df20954..f05adc10831d72a1fb97389166660a6eb1bfb7b0 100644 --- a/server/app/core/parsers.py +++ b/server/app/core/parsers.py @@ -32,14 +32,14 @@ user_search_parser.add_argument("city_id", type=int, default=None, location="arg user_search_parser.add_argument("role_id", type=int, default=None, location="args") -###COMPETIION#### +###COMPETITION#### competition_parser = reqparse.RequestParser() competition_parser.add_argument("name", type=str, location="json") competition_parser.add_argument("year", type=int, location="json") competition_parser.add_argument("city_id", type=int, location="json") -###SEARCH_COMPETITOIN#### +###SEARCH_COMPETITION#### competition_search_parser = search_parser.copy() competition_search_parser.add_argument("name", type=str, default=None, location="args") competition_search_parser.add_argument("year", type=int, default=None, location="args") diff --git a/server/tests/test_app.py b/server/tests/test_app.py index 19f2b4ef362632ad8cc23aa1573f87c4ba37abc8..38a103b9e0bfcfcaf13ce62740965f05ff88af70 100644 --- a/server/tests/test_app.py +++ b/server/tests/test_app.py @@ -2,8 +2,7 @@ import app.core.http_codes as codes from app.core.models import Slide from tests import app, client, db -from tests.test_helpers import (add_default_values, change_order_test, delete, - get, post, put) +from tests.test_helpers import add_default_values, change_order_test, delete, get, post, put def test_misc_api(client): @@ -156,14 +155,12 @@ def test_auth_and_user_api(client): assert body["role"]["id"] == 1 # Find other user - # print("\n\n\n\n\n searching for olle...") response, body = get( client, "/api/users/search", query_string={"name": "Olle Olsson", "email": "test@test.se", "role_id": 1, "city_id": 1}, headers=headers, ) - print(f"{body=}") assert response.status_code == codes.OK assert body["count"] == 1 @@ -334,7 +331,6 @@ def test_question_api(client): response, body = get(client, f"/api/competitions/{CID}/questions", headers=headers) assert response.status_code == codes.OK assert body["count"] == num_questions - # print(f"338: {body['items']}") # # Get specific question # name = "Q2" @@ -343,16 +339,10 @@ def test_question_api(client): # slide_id = 5 # response, body = get( # client, - # f"/api/competitions/{CID}/questions/search", - # data={ - # "name": name, - # # "total_score": total_score, - # "type_id": type_id, - # "slide_id": slide_id, - # }, + # f"/api/competitions/{CID}/questions/", # headers=headers, # ) - # print(f"357: {body['items']}") + # # print(f"357: {body['items']}") # assert response.status_code == codes.OK # assert body["count"] == 1 # item_question = body["items"][0] @@ -381,7 +371,6 @@ def test_question_api(client): assert item_question["slide"]["id"] == slide_id # Checks number of questions response, body = get(client, f"/api/competitions/{CID}/questions", headers=headers) - # print(f"387: {body['items']}") assert response.status_code == codes.OK assert body["count"] == num_questions diff --git a/server/tests/test_helpers.py b/server/tests/test_helpers.py index 386c20c371f2442c5b9d4cee007b1b8fc337aae3..fbb58ac1725bdc36923c0ec0c9d2fe09a202a28b 100644 --- a/server/tests/test_helpers.py +++ b/server/tests/test_helpers.py @@ -64,12 +64,15 @@ def post(client, url, data=None, headers=None): if headers is None: headers = {} headers["Content-Type"] = "application/json" - response = client.post(url, data=json.dumps(data), headers=headers) + response = client.post(url, json=data, headers=headers) body = get_body(response) return response, body def get(client, url, query_string=None, headers=None): + if headers is None: + headers = {} + headers["Content-Type"] = "" response = client.get(url, query_string=query_string, headers=headers) body = get_body(response) return response, body @@ -79,14 +82,16 @@ def put(client, url, data=None, headers=None): if headers is None: headers = {} headers["Content-Type"] = "application/json" - - response = client.put(url, data=json.dumps(data), headers=headers) + response = client.put(url, json=data, headers=headers) body = get_body(response) return response, body def delete(client, url, data=None, headers=None): - response = client.delete(url, data=json.dumps(data), headers=headers) + if headers is None: + headers = {} + headers["Content-Type"] = "" + response = client.delete(url, json=data, headers=headers) body = get_body(response) return response, body