Be explicit about which models we are returning

Author: Iain-S

rctab/routers/accounting/allocations.py

@@ -108,6 +108,7 @@ async def post_subscription_allocation(
 @router.get("/allocations", response_model=List[AllocationListItem])
 async def get_subscription_allocations(
     subscription: SubscriptionItem, _: UserRBAC = Depends(token_admin_verified)
-) -> Any:
+) -> List[AllocationListItem]:
     """Return a list of allocations for a subscription."""
-    return await get_allocations(subscription.sub_id)
+    rows = await get_allocations(subscription.sub_id)
+    return [AllocationListItem(**dict(x)) for x in rows]

rctab/routers/accounting/approvals.py

@@ -2,7 +2,7 @@
 
 import datetime
 from datetime import timedelta
-from typing import Any, List, Optional
+from typing import Any, List
 
 from fastapi import Depends, HTTPException
 from sqlalchemy import insert
@@ -143,9 +143,10 @@ async def check_approval(approval: Approval) -> None:
 @router.get("/approvals", response_model=List[ApprovalListItem])
 async def get_subscription_approvals(
     subscription: SubscriptionItem, _: UserRBAC = Depends(token_admin_verified)
-) -> Optional[List[ApprovalListItem]]:
+) -> List[ApprovalListItem]:
     """Returns a list approvals for a subscription."""
-    return await get_approvals(subscription.sub_id)
+    rows = await get_approvals(subscription.sub_id)
+    return [ApprovalListItem(**dict(x)) for x in rows]
 
 
 @router.post("/approve", status_code=200)

rctab/routers/accounting/cost_recovery.py

@@ -214,21 +214,22 @@ async def calc_cost_recovery_app(
 @router.post("/cli-cost-recovery", response_model=List[CostRecovery])
 async def post_calc_cost_recovery_cli(
     recovery_month: CostRecoveryMonth, user: UserRBAC = Depends(token_admin_verified)
-) -> Any:
+) -> List[CostRecovery]:
     """Route for the CLI to trigger cost recovery calculation."""
-    resp = await calc_cost_recovery(
+    rows = await calc_cost_recovery(
         recovery_month, commit_transaction=True, admin=user.oid
     )
 
-    return resp
+    return [CostRecovery(**dict(x)) for x in rows]
 
 
 @router.get("/cli-cost-recovery", response_model=List[CostRecovery])
 async def get_calc_cost_recovery_cli(
     recovery_month: CostRecoveryMonth, user: UserRBAC = Depends(token_admin_verified)
-) -> Any:
+) -> List[CostRecovery]:
     """Route for the CLI to do a dry-run of the cost recovery calculation."""
-    result = await calc_cost_recovery(
+    rows = await calc_cost_recovery(
         recovery_month, commit_transaction=False, admin=user.oid
     )
-    return result
+
+    return [CostRecovery(**dict(x)) for x in rows]

rctab/routers/accounting/usage.py

@@ -280,7 +280,9 @@ async def post_cm_usage(
 
 
 @router.get("/all-cm-usage", response_model=List[CMUsage])
-async def get_cm_usage(_: UserRBAC = Depends(token_admin_verified)) -> Any:
+async def get_cm_usage(_: UserRBAC = Depends(token_admin_verified)) -> List[CMUsage]:
     """Get all cost-management data."""
     cm_query = select([accounting_models.costmanagement])
-    return await database.fetch_all(cm_query)
+    rows = [dict(x) for x in await database.fetch_all(cm_query)]
+    result = [CMUsage(**x) for x in rows]
+    return result