1 files changed, 8 insertions, 4 deletions
diff --git a/backend/routes/forms/discover.py b/backend/routes/forms/discover.py
index ca36e93..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
 
 
@@ -17,11 +18,14 @@ 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"
-        }):
-            forms.append(form)
+        # 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(**form))
+
+        forms = [form.dict() for form in forms]
 
         return JSONResponse(
             forms