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/forms/index.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'backend/routes/forms/index.py') 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( -- 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/forms/index.py') 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/forms/index.py') 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