feat(stats): add stats aggregation tables

apps/admin/src/app/organizations/[orgId]/org-metrics.tsx

@@ -7,7 +7,7 @@ import {
 	Loader2,
 	Server,
 } from "lucide-react";
-import { useCallback, useState } from "react";
+import { useCallback, useEffect, useState } from "react";
 
 import { Button } from "@/components/ui/button";
 import {
@@ -90,7 +90,7 @@ function MetricCard({
 
 export function OrgMetricsSection({ orgId }: { orgId: string }) {
 	const [metrics, setMetrics] = useState<OrganizationMetrics | null>(null);
-	const [loading, setLoading] = useState(false);
+	const [loading, setLoading] = useState(true);
 	const [window, setWindow] = useState<TokenWindow>("1d");
 
 	const loadMetrics = useCallback(
@@ -103,35 +103,14 @@ export function OrgMetricsSection({ orgId }: { orgId: string }) {
 		[orgId],
 	);
 
-	const handleWindowChange = useCallback(
-		(w: TokenWindow) => {
-			setWindow(w);
-			loadMetrics(w);
-		},
-		[loadMetrics],
-	);
+	// Load metrics automatically on mount
+	useEffect(() => {
+		loadMetrics(window);
+	}, [loadMetrics, window]);
 
-	if (!metrics && !loading) {
-		return (
-			<section className="space-y-4">
-				<div className="flex items-center justify-between">
-					<h2 className="text-lg font-semibold">Usage Metrics</h2>
-					<Button
-						variant="outline"
-						size="sm"
-						onClick={() => loadMetrics(window)}
-					>
-						<Activity className="mr-2 h-4 w-4" />
-						Load Usage Data
-					</Button>
-				</div>
-				<div className="rounded-lg border border-dashed border-border/60 p-8 text-center text-sm text-muted-foreground">
-					Click &quot;Load Usage Data&quot; to fetch usage metrics. This queries
-					the logs table which may be slow for orgs with lots of data.
-				</div>
-			</section>
-		);
-	}
+	const handleWindowChange = useCallback((w: TokenWindow) => {
+		setWindow(w);
+	}, []);
 
 	if (loading) {
 		return (
@@ -146,7 +125,14 @@ export function OrgMetricsSection({ orgId }: { orgId: string }) {
 	}
 
 	if (!metrics) {
-		return null;
+		return (
+			<section className="space-y-4">
+				<h2 className="text-lg font-semibold">Usage Metrics</h2>
+				<div className="rounded-lg border border-dashed border-border/60 p-8 text-center text-sm text-muted-foreground">
+					No usage data available.
+				</div>
+			</section>
+		);
 	}
 
 	const windowLabel = window === "7d" ? "Last 7 days" : "Last 24 hours";

apps/admin/src/lib/api/v1.d.ts

@@ -981,6 +981,14 @@ export interface paths {
                                 cacheCount: number;
                                 cacheRate: number;
                                 discountSavings: number;
+                                creditsRequestCount: number;
+                                apiKeysRequestCount: number;
+                                creditsCost: number;
+                                apiKeysCost: number;
+                                creditsServiceFee: number;
+                                apiKeysServiceFee: number;
+                                creditsDataStorageCost: number;
+                                apiKeysDataStorageCost: number;
                                 modelBreakdown: {
                                     id: string;
                                     provider: string;

apps/api/src/routes/activity.spec.ts

@@ -1,7 +1,11 @@
 import { afterEach, beforeEach, describe, expect, test } from "vitest";
 
 import { app } from "@/index.js";
-import { createTestUser, deleteAll } from "@/testing.js";
+import {
+	createTestUser,
+	deleteAll,
+	aggregateLogsForTesting,
+} from "@/testing.js";
 
 import { db, tables } from "@llmgateway/db";
 
@@ -173,6 +177,9 @@ describe("activity endpoint", () => {
 				usedMode: "api-keys",
 			},
 		]);
+
+		// Aggregate logs into the hourly stats tables for the activity endpoint
+		await aggregateLogsForTesting();
 	});
 
 	afterEach(async () => {
@@ -335,6 +342,8 @@ describe("activity endpoint", () => {
 			},
 		]);
 
+		await aggregateLogsForTesting();
+
 		const res = await app.request("/activity?days=7", {
 			headers: {
 				Cookie: token,
@@ -513,6 +522,8 @@ describe("activity endpoint", () => {
 			},
 		]);
 
+		await aggregateLogsForTesting();
+
 		const res = await app.request("/activity?days=7", {
 			headers: {
 				Cookie: token,
@@ -628,6 +639,8 @@ describe("activity endpoint", () => {
 			},
 		]);
 
+		await aggregateLogsForTesting();
+
 		const res = await app.request("/activity?days=7", {
 			headers: {
 				Cookie: token,
@@ -727,6 +740,8 @@ describe("activity endpoint", () => {
 			},
 		]);
 
+		await aggregateLogsForTesting();
+
 		const res = await app.request("/activity?days=7", {
 			headers: {
 				Cookie: token,
@@ -830,6 +845,8 @@ describe("activity endpoint", () => {
 			},
 		]);
 
+		await aggregateLogsForTesting();
+
 		const res = await app.request("/activity?days=7", {
 			headers: {
 				Cookie: token,
@@ -855,6 +872,7 @@ describe("activity endpoint", () => {
 
 	test("GET /activity should return zero error rate and cache rate when no requests", async () => {
 		await db.delete(tables.log);
+		await aggregateLogsForTesting();
 
 		const res = await app.request("/activity?days=7", {
 			headers: {
@@ -944,6 +962,8 @@ describe("activity endpoint", () => {
 			},
 		]);
 
+		await aggregateLogsForTesting();
+
 		const res = await app.request("/activity?days=7", {
 			headers: {
 				Cookie: token,
@@ -1037,6 +1057,8 @@ describe("activity endpoint", () => {
 			},
 		]);
 
+		await aggregateLogsForTesting();
+
 		const res = await app.request("/activity?days=7", {
 			headers: {
 				Cookie: token,
@@ -1129,6 +1151,8 @@ describe("activity endpoint", () => {
 			},
 		]);
 
+		await aggregateLogsForTesting();
+
 		const res = await app.request("/activity?days=7", {
 			headers: {
 				Cookie: token,
@@ -1202,6 +1226,8 @@ describe("activity endpoint", () => {
 			},
 		]);
 
+		await aggregateLogsForTesting();
+
 		const res = await app.request("/activity?days=7", {
 			headers: {
 				Cookie: token,
@@ -1275,6 +1301,8 @@ describe("activity endpoint", () => {
 			},
 		]);
 
+		await aggregateLogsForTesting();
+
 		const res = await app.request("/activity?days=7", {
 			headers: {
 				Cookie: token,
@@ -1453,6 +1481,8 @@ describe("activity endpoint", () => {
 			},
 		]);
 
+		await aggregateLogsForTesting();
+
 		const res = await app.request("/activity?days=7", {
 			headers: {
 				Cookie: token,