From 5ddbcaa41a4952720feb22733d57a2c7507aa95a Mon Sep 17 00:00:00 2001 From: ks129 <45097959+ks129@users.noreply.github.com> Date: Wed, 2 Dec 2020 12:09:12 +0200 Subject: Move from PyMongo to Motor driver for asynchronous support --- backend/routes/auth/authorize.py | 2 +- backend/routes/forms/discover.py | 5 ++--- backend/routes/forms/index.py | 3 ++- backend/routes/forms/submit.py | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) (limited to 'backend/routes') diff --git a/backend/routes/auth/authorize.py b/backend/routes/auth/authorize.py index 5de49f5..41c0a0b 100644 --- a/backend/routes/auth/authorize.py +++ b/backend/routes/auth/authorize.py @@ -25,7 +25,7 @@ class AuthorizeRoute(Route): bearer_token = await fetch_bearer_token(data["token"]) user_details = await fetch_user_details(bearer_token["access_token"]) - user_details["admin"] = request.state.db.admins.find_one( + user_details["admin"] = await request.state.db.admins.find_one( {"_id": user_details["id"]} ) is not None diff --git a/backend/routes/forms/discover.py b/backend/routes/forms/discover.py index ca36e93..f16faa4 100644 --- a/backend/routes/forms/discover.py +++ b/backend/routes/forms/discover.py @@ -17,10 +17,9 @@ class DiscoverableFormsList(Route): async def get(self, request: Request) -> JSONResponse: forms = [] + cursor = request.state.db.forms.find({"features": "DISCOVERABLE"}) - for form in request.state.db.forms.find({ - "features": "DISCOVERABLE" - }): + for form in await cursor.to_list(None): forms.append(form) return JSONResponse( diff --git a/backend/routes/forms/index.py b/backend/routes/forms/index.py index 183d5cc..41a3ccd 100644 --- a/backend/routes/forms/index.py +++ b/backend/routes/forms/index.py @@ -17,8 +17,9 @@ class FormsList(Route): async def get(self, request: Request) -> JSONResponse: forms = [] + cursor = request.state.db.forms.find() - for form in request.state.db.forms.find(): + for form in await cursor.to_list(None): forms.append(form) return JSONResponse( diff --git a/backend/routes/forms/submit.py b/backend/routes/forms/submit.py index f933367..a94a1c9 100644 --- a/backend/routes/forms/submit.py +++ b/backend/routes/forms/submit.py @@ -25,7 +25,7 @@ class SubmitForm(Route): async def post(self, request: Request) -> JSONResponse: data = await request.json() - if form := request.state.db.forms.find_one( + if form := await request.state.db.forms.find_one( {"_id": request.path_params["form_id"], "features": "OPEN"} ): response_obj = {} -- cgit v1.2.3 From baf067f5f2990d7bf954dfe410fbcd243c63152e Mon Sep 17 00:00:00 2001 From: ks129 <45097959+ks129@users.noreply.github.com> Date: Wed, 2 Dec 2020 12:11:57 +0200 Subject: Lock all forms showing to admins only --- backend/routes/forms/index.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'backend/routes') diff --git a/backend/routes/forms/index.py b/backend/routes/forms/index.py index 41a3ccd..605f184 100644 --- a/backend/routes/forms/index.py +++ b/backend/routes/forms/index.py @@ -1,6 +1,7 @@ """ Return a list of all forms to authenticated users. """ +from starlette.authentication import requires from starlette.requests import Request from starlette.responses import JSONResponse @@ -15,6 +16,7 @@ class FormsList(Route): name = "forms_list" path = "/" + @requires(["authenticated", "admin"]) async def get(self, request: Request) -> JSONResponse: forms = [] cursor = request.state.db.forms.find() -- cgit v1.2.3 From a494835ee5b121e25b35889d7bd24ea4614ee2be Mon Sep 17 00:00:00 2001 From: ks129 <45097959+ks129@users.noreply.github.com> Date: Wed, 2 Dec 2020 13:14:48 +0200 Subject: Move MongoDB output to Form model and after convert it to dictionary We need to convert '_id' key to 'id'. --- backend/routes/forms/index.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'backend/routes') diff --git a/backend/routes/forms/index.py b/backend/routes/forms/index.py index 605f184..f1df210 100644 --- a/backend/routes/forms/index.py +++ b/backend/routes/forms/index.py @@ -6,6 +6,7 @@ from starlette.requests import Request from starlette.responses import JSONResponse from backend.route import Route +from backend.models import Form class FormsList(Route): @@ -22,7 +23,10 @@ class FormsList(Route): cursor = request.state.db.forms.find() for form in await cursor.to_list(None): - forms.append(form) + forms.append(Form(**form)) # For converting _id to id + + # Covert them back to dictionaries + forms = [form.dict() for form in forms] return JSONResponse( forms -- cgit v1.2.3 From dbe8d21a826311a4ab9fa08f9d9b73def128c7fc Mon Sep 17 00:00:00 2001 From: ks129 <45097959+ks129@users.noreply.github.com> Date: Wed, 2 Dec 2020 15:24:15 +0200 Subject: Move data to Form and then back to dictionary for id converting --- backend/routes/forms/discover.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'backend/routes') diff --git a/backend/routes/forms/discover.py b/backend/routes/forms/discover.py index f16faa4..af6066e 100644 --- a/backend/routes/forms/discover.py +++ b/backend/routes/forms/discover.py @@ -4,6 +4,7 @@ Return a list of all publicly discoverable forms to unauthenticated users. from starlette.requests import Request from starlette.responses import JSONResponse +from backend.models import Form from backend.route import Route @@ -19,8 +20,12 @@ class DiscoverableFormsList(Route): forms = [] cursor = request.state.db.forms.find({"features": "DISCOVERABLE"}) + # Parse it to Form and then back to dictionary + # to replace _id with id for form in await cursor.to_list(None): - forms.append(form) + forms.append(Form(**form)) + + forms = [form.dict() for form in forms] return JSONResponse( forms -- cgit v1.2.3 From ac1000cb101e69a44e69e3e7a4fbdeb595aa0e83 Mon Sep 17 00:00:00 2001 From: ks129 <45097959+ks129@users.noreply.github.com> Date: Wed, 2 Dec 2020 15:24:43 +0200 Subject: Create route for creating new forms --- backend/routes/forms/new.py | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 backend/routes/forms/new.py (limited to 'backend/routes') diff --git a/backend/routes/forms/new.py b/backend/routes/forms/new.py new file mode 100644 index 0000000..ff39f12 --- /dev/null +++ b/backend/routes/forms/new.py @@ -0,0 +1,30 @@ +""" +Creates new form based on data provided. +""" +from pydantic import ValidationError +from starlette.authentication import requires +from starlette.requests import Request +from starlette.responses import JSONResponse + +from backend.models import Form +from backend.route import Route + + +class FormCreate(Route): + """ + Creates new form from JSON data. + """ + + name = "forms_create" + path = "/new" + + @requires(["authenticated", "admin"]) + async def post(self, request: Request) -> JSONResponse: + form_data = await request.json() + try: + form = Form(**form_data) + except ValidationError as e: + return JSONResponse(e.errors()) + + await request.state.db.forms.insert_one(form.dict(by_alias=True)) + return JSONResponse(form.dict()) -- cgit v1.2.3