Fix error with schemas_collection

Deleted id in SchemaDefinition

Changed MONGO_URI to str

Author: JosePizarro3

jsoned/api/v1/endpoints/schemas.py

@@ -1,22 +1,15 @@
-from fastapi import APIRouter
+from fastapi import APIRouter, Request
 
-from jsoned.database import schemas_collection
 from jsoned.models.schema_definition import SchemaDefinition
 
 router = APIRouter()
 
 
 @router.get("/all", response_model=list[SchemaDefinition])
-async def get_all_schemas():
-    """
-    Gets all the schemas present in the database and returns them in a list of `SchemaDefinition` models.
-    """
-    response = []
-    documents = schemas_collection.find({})
-    async for doc in documents:
-        response.append(SchemaDefinition(**doc))
-
-    return response
+async def get_all_schemas(request: Request):
+    schemas_collection = request.app.state.schemas_collection
+    docs = schemas_collection.find({})
+    return [SchemaDefinition(**doc) async for doc in docs]
 
 
 # @router.post("/add", response_model=SchemaDefinition)

jsoned/database.py

@@ -1,23 +1,27 @@
-from motor.motor_asyncio import AsyncIOMotorClient
+from fastapi import HTTPException
+from motor.motor_asyncio import AsyncIOMotorClient, AsyncIOMotorCollection
 
 from jsoned.settings import settings
 
 client: AsyncIOMotorClient | None = None
 database = None
-schemas_collection = None
+_schemas_collection: AsyncIOMotorCollection | None = None
 
 
 async def connect_to_mongo():
-    global client, database, schemas_collection
-
+    global client, database, _schemas_collection
     client = AsyncIOMotorClient(settings.MONGO_URI)
     database = client.jsoned_db
-    schemas_collection = database.schemas
-
-    # create index once on startup
-    await schemas_collection.create_index("title", unique=True)
+    _schemas_collection = database.schemas
+    await _schemas_collection.create_index("title", unique=True)
 
 
 async def close_mongo():
     if client is not None:
         client.close()
+
+
+def get_schemas_collection() -> AsyncIOMotorCollection:
+    if _schemas_collection is None:
+        raise HTTPException(503, "Database not available")
+    return _schemas_collection

jsoned/main.py

@@ -3,18 +3,18 @@
 from fastapi import FastAPI
 from starlette.middleware.cors import CORSMiddleware
 
-from jsoned.api.api_v1.api import api_router
-from jsoned.database import close_mongo, connect_to_mongo
+from jsoned.api.v1.api import api_router
+from jsoned.database import close_mongo, connect_to_mongo, get_schemas_collection
 from jsoned.settings import settings
 
 
 @asynccontextmanager
 async def app_init(app: FastAPI):
     await connect_to_mongo()
+    app.state.schemas_collection = get_schemas_collection()
 
     app.include_router(api_router, prefix=settings.API_V1_STR)
     yield
-
     await close_mongo()
 
 

jsoned/models/schema_definition.py

@@ -5,11 +5,6 @@
 
 
 class SchemaDefinition(BaseModel):
-    id: UUID = Field(
-        ...,
-        description="Automatically generated unique identifier for the schema entry based on `content`.",
-    )
-
     title: str | None = Field(
         None,
         description="A human-readable title given to the schema entry.",

jsoned/settings.py

@@ -9,7 +9,7 @@ class Settings(BaseSettings):
         "http://localhost",
         "http://localhost:3000",
     ]
-    MONGO_URI: AnyHttpUrl = "mongodb://localhost:27017"
+    MONGO_URI: str = "mongodb://localhost:27017"
 
 
 settings = Settings()