Update routes in end2end test

Author: tomaisthorpe

end2end/fastapi_postgres_uvicorn_test.py

@@ -86,28 +86,22 @@ def test_routes_discovered_in_heartbeat():
     heartbeat_events = filter_on_event_type(events, "heartbeat")
     assert len(heartbeat_events) >= 1
 
-    validate_heartbeat(
-        heartbeat_events[0],
-        routes=[{
-            "apispec": {
-                "body": {
-                    "type": "form-urlencoded",
-                    "schema": {
-                        "type": "object",
-                        "properties": {
-                            "dog_name": {
-                                "items": {"type": "string"},
-                                "type": "array",
-                            }
-                        },
-                    },
-                },
-                "query": None,
-                "auth": None,
+    routes = heartbeat_events[0]["routes"]
+    route_map = {(r["method"], r["path"]): r for r in routes}
+
+    assert ("POST", "/create") in route_map
+    create_route = route_map[("POST", "/create")]
+    assert create_route["apispec"] == {
+        "auth": None,
+        "body": {
+            "schema": {
+                "properties": {"dog_name": {"type": "string"}},
+                "type": "object",
             },
-            "hits": 1,
-            "hits_delta_since_sync": 0,
-            "method": "POST",
-            "path": "/create",
-        }],
-    )
+            "type": "form-urlencoded",
+        },
+        "query": None,
+    }
+    assert create_route["hits"] == 1
+
+    assert ("GET", "/sync_route") in route_map

sample-apps/fastapi-postgres-uvicorn/app.py

@@ -21,6 +21,11 @@
     allow_methods=["*"],
     allow_headers=["*"],
 )
+@app.middleware("http")
+async def set_user_middleware(request: Request, call_next):
+    aikido_zen.set_user({"id": "user123", "name": "John Doe"})
+    return await call_next(request)
+
 app.add_middleware(AikidoFastAPIMiddleware)
 
 async def get_db_connection():
@@ -61,7 +66,7 @@ async def create_dog(request: Request):
 
     conn = await get_db_connection()
     try:
-        await conn.execute("INSERT INTO dogs (dog_name, isAdmin) VALUES ($1, FALSE)", dog_name)
+        await conn.execute(f"INSERT INTO dogs (dog_name, isAdmin) VALUES ('%s', FALSE)" % (dog_name))
     finally:
         await conn.close()