fix nested dicts, add more real life fastapi tests

tests/test_foreign_keys.py

@@ -36,7 +36,7 @@ class Cover(ormar.Model):
     __database__ = database
 
     id = ormar.Integer(primary_key=True)
-    album = ormar.ForeignKey(Album, related_name='cover_pictures')
+    album = ormar.ForeignKey(Album, related_name="cover_pictures")
     title = ormar.String(length=100)
 
 
@@ -171,8 +171,8 @@ async def test_fk_filter():
 
         tracks = (
             await Track.objects.select_related("album")
-                .filter(album__name="Fantasies")
-                .all()
+            .filter(album__name="Fantasies")
+            .all()
         )
         assert len(tracks) == 3
         for track in tracks:
@@ -180,8 +180,8 @@ async def test_fk_filter():
 
         tracks = (
             await Track.objects.select_related("album")
-                .filter(album__name__icontains="fan")
-                .all()
+            .filter(album__name__icontains="fan")
+            .all()
         )
         assert len(tracks) == 3
         for track in tracks:
@@ -223,8 +223,8 @@ async def test_multiple_fk():
 
         members = (
             await Member.objects.select_related("team__org")
-                .filter(team__org__ident="ACME Ltd")
-                .all()
+            .filter(team__org__ident="ACME Ltd")
+            .all()
         )
         assert len(members) == 4
         for member in members:
@@ -243,8 +243,8 @@ async def test_pk_filter():
 
         tracks = (
             await Track.objects.select_related("album")
-                .filter(position=2, album__name="Test")
-                .all()
+            .filter(position=2, album__name="Test")
+            .all()
         )
         assert len(tracks) == 1
 

tests/test_model_definition.py

@@ -95,13 +95,16 @@ def test_sqlalchemy_table_is_created(example):
 
 def test_no_pk_in_model_definition():
     with pytest.raises(ModelDefinitionError):
+
         class ExampleModel2(Model):
             __tablename__ = "example3"
             __metadata__ = metadata
             test_string = fields.String(length=250)
 
+
 def test_two_pks_in_model_definition():
     with pytest.raises(ModelDefinitionError):
+
         class ExampleModel2(Model):
             __tablename__ = "example3"
             __metadata__ = metadata
@@ -111,6 +114,7 @@ def test_two_pks_in_model_definition():
 
 def test_setting_pk_column_as_pydantic_only_in_model_definition():
     with pytest.raises(ModelDefinitionError):
+
         class ExampleModel2(Model):
             __tablename__ = "example4"
             __metadata__ = metadata
@@ -119,6 +123,7 @@ def test_setting_pk_column_as_pydantic_only_in_model_definition():
 
 def test_decimal_error_in_model_definition():
     with pytest.raises(ModelDefinitionError):
+
         class ExampleModel2(Model):
             __tablename__ = "example4"
             __metadata__ = metadata
@@ -127,6 +132,7 @@ def test_decimal_error_in_model_definition():
 
 def test_string_error_in_model_definition():
     with pytest.raises(ModelDefinitionError):
+
         class ExampleModel2(Model):
             __tablename__ = "example4"
             __metadata__ = metadata

tests/test_more_reallife_fastapi.py

@@ -0,0 +1,116 @@
+from typing import List
+
+import databases
+import pytest
+import sqlalchemy
+from fastapi import FastAPI
+from starlette.testclient import TestClient
+
+import ormar
+from tests.settings import DATABASE_URL
+
+app = FastAPI()
+metadata = sqlalchemy.MetaData()
+database = databases.Database(DATABASE_URL, force_rollback=True)
+app.state.database = database
+
+
+@app.on_event("startup")
+async def startup() -> None:
+    database_ = app.state.database
+    if not database_.is_connected:
+        await database_.connect()
+
+
+@app.on_event("shutdown")
+async def shutdown() -> None:
+    database_ = app.state.database
+    if database_.is_connected:
+        await database_.disconnect()
+
+
+class Category(ormar.Model):
+    __tablename__ = "categories"
+    __metadata__ = metadata
+    __database__ = database
+
+    id = ormar.Integer(primary_key=True)
+    name = ormar.String(length=100)
+
+
+class Item(ormar.Model):
+    __tablename__ = "items"
+    __metadata__ = metadata
+    __database__ = database
+
+    id = ormar.Integer(primary_key=True)
+    name = ormar.String(length=100)
+    category = ormar.ForeignKey(Category, nullable=True)
+
+
+@pytest.fixture(autouse=True, scope="module")
+def create_test_database():
+    engine = sqlalchemy.create_engine(DATABASE_URL)
+    metadata.create_all(engine)
+    yield
+    metadata.drop_all(engine)
+
+
+@app.get("/items/", response_model=List[Item])
+async def get_items():
+    items = await Item.objects.select_related("category").all()
+    return [item.dict() for item in items]
+
+
+@app.post("/items/", response_model=Item)
+async def create_item(item: Item):
+    item = await Item.objects.create(**item.dict())
+    return item.dict()
+
+
+@app.post("/categories/", response_model=Category)
+async def create_category(category: Category):
+    category = await Category.objects.create(**category.dict())
+    return category.dict()
+
+
+@app.put("/items/{item_id}")
+async def get_item(item_id: int, item: Item):
+    item_db = await Item.objects.get(pk=item_id)
+    return {"updated_rows": await item_db.update(**item.dict())}
+
+
+@app.delete("/items/{item_id}")
+async def delete_item(item_id: int, item: Item):
+    item_db = await Item.objects.get(pk=item_id)
+    return {"deleted_rows": await item_db.delete()}
+
+
+def test_all_endpoints():
+    client = TestClient(app)
+    with client as client:
+        response = client.post("/categories/", json={"name": "test cat"})
+        category = response.json()
+        response = client.post(
+            "/items/", json={"name": "test", "id": 1, "category": category}
+        )
+        item = Item(**response.json())
+        assert item.pk is not None
+
+        response = client.get("/items/")
+        items = [Item(**item) for item in response.json()]
+        assert items[0] == item
+
+        item.name = "New name"
+        response = client.put(f"/items/{item.pk}", json=item.dict())
+        assert response.json().get("updated_rows") == 1
+
+        response = client.get("/items/")
+        items = [Item(**item) for item in response.json()]
+        assert items[0].name == "New name"
+
+        response = client.delete(f"/items/{item.pk}", json=item.dict())
+        assert response.json().get("deleted_rows") == 1
+        response = client.get("/items/")
+        items = response.json()
+        assert len(items) == 0

tests/test_same_table_joins.py

@@ -61,7 +61,7 @@ class Teacher(ormar.Model):
     category = ormar.ForeignKey(Category, nullable=True)
 
 
-@pytest.fixture(scope='module')
+@pytest.fixture(scope="module")
 def event_loop():
     loop = asyncio.get_event_loop()
     yield loop
@@ -92,6 +92,8 @@ async def test_model_multiple_instances_of_same_table_in_schema():
         assert classes[0].name == "Math"
         assert classes[0].students[0].name == "Jane"
 
+        assert len(classes[0].dict().get("students")) == 2
+
         # related fields of main model are only populated by pk
         # unless there is a required foreign key somewhere along the way
         # since department is required for schoolclass it was pre loaded (again)