update to match the tutorial

Author: fantix

examples/prod_fastapi_demo/migrations/env.py

@@ -27,9 +27,7 @@
 # This line sets up loggers basically.
 fileConfig(config.config_file_name)
 
-config.set_main_option(
-    "sqlalchemy.url", str(DB_DSN),
-)
+config.set_main_option("sqlalchemy.url", str(DB_DSN))
 
 
 def run_migrations_offline():

examples/prod_fastapi_demo/src/gino_fastapi_demo/main.py

@@ -1,6 +1,6 @@
 import logging
-import click
 
+import click
 from fastapi import FastAPI
 
 from .models import db
@@ -14,8 +14,13 @@
 
 
 def get_app():
-    app = FastAPI()
+    app = FastAPI(title="GINO FastAPI Demo")
     db.init_app(app)
+    load_modules(app)
+    return app
+
+
+def load_modules(app=None):
     for ep in entry_points()["gino_fastapi_demo.modules"]:
         logger.info(
             "Loading module: %s",
@@ -26,7 +31,7 @@ def get_app():
             },
         )
         mod = ep.load()
-        init_app = getattr(mod, "init_app", None)
-        if init_app:
-            init_app(app)
-    return app
+        if app:
+            init_app = getattr(mod, "init_app", None)
+            if init_app:
+                init_app(app)

examples/prod_fastapi_demo/src/gino_fastapi_demo/models/__init__.py

@@ -1,4 +1,4 @@
-from gino_starlette import Gino
+from gino.ext.starlette import Gino
 
 from .. import config
 

examples/prod_fastapi_demo/src/gino_fastapi_demo/views/users.py

@@ -12,14 +12,21 @@ class UserModel(BaseModel):
 
 @router.get("/users/{uid}")
 async def get_user(uid: int):
-    q = User.query.where(User.id == uid)
-    return (await q.gino.first_or_404()).to_dict()
+    user = await User.get_or_404(uid)
+    return user.to_dict()
 
 
 @router.post("/users")
 async def add_user(user: UserModel):
-    u = await User.create(nickname=user.name)
-    return u.to_dict()
+    rv = await User.create(nickname=user.name)
+    return rv.to_dict()
+
+
+@router.delete("/users/{uid}")
+async def delete_user(uid: int):
+    user = await User.get_or_404(uid)
+    await user.delete()
+    return dict(id=uid)
 
 
 def init_app(app):

examples/prod_fastapi_demo/tests/test_users.py

@@ -2,11 +2,15 @@
 
 
 def test_crud(client):
-    assert client.get("/users/1").status_code == 404
+    # create
     nickname = str(uuid.uuid4())
     r = client.post("/users", json=dict(name=nickname))
     r.raise_for_status()
-    r = r.json()
-    assert (
-        client.get("/users/{}".format(r["id"])).json()["nickname"] == nickname
-    )
+
+    # retrieve
+    url = "/users/{}".format(r.json()['id'])
+    assert client.get(url).json()["nickname"] == nickname
+
+    # delete
+    client.delete(url).raise_for_status()
+    assert client.get(url).status_code == 404