From 6188f5556901c37b90dc7d1fbb13309b26d72544 Mon Sep 17 00:00:00 2001 From: David Corbitt Date: Tue, 8 Aug 2023 11:49:08 -0700 Subject: [PATCH] Fix dashboard stats --- .../server/api/routers/dashboard.router.ts | 20 +++++-------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/app/src/server/api/routers/dashboard.router.ts b/app/src/server/api/routers/dashboard.router.ts index f4de2a9..ba5d5b6 100644 --- a/app/src/server/api/routers/dashboard.router.ts +++ b/app/src/server/api/routers/dashboard.router.ts @@ -12,7 +12,6 @@ export const dashboardRouter = createTRPCRouter({ }), ) .query(async ({ input }) => { - console.log("made it 1"); // Return the stats group by hour const periods = await kysely .selectFrom("LoggedCall") @@ -25,30 +24,26 @@ export const dashboardRouter = createTRPCRouter({ .select(({ fn }) => [ sql`date_trunc('day', "LoggedCallModelResponse"."startTime")`.as("period"), sql`count("LoggedCall"."id")::int`.as("numQueries"), - fn.sum(fn.coalesce('LoggedCallModelResponse.totalCost', sql`0`)).as("totalCost"), + fn.sum(fn.coalesce("LoggedCallModelResponse.totalCost", sql`0`)).as("totalCost"), ]) .groupBy("period") .orderBy("period") .execute(); - console.log("made it 2"); - const totals = await kysely .selectFrom("LoggedCall") - .where("organizationId", "=", input.organizationId) .leftJoin( "LoggedCallModelResponse", "LoggedCall.id", "LoggedCallModelResponse.originalLoggedCallId", ) + .where("organizationId", "=", input.organizationId) .select(({ fn }) => [ - fn.sum(fn.coalesce('LoggedCallModelResponse.totalCost', sql`0`)).as("totalCost"), - fn.count("id").as("numQueries"), + fn.sum(fn.coalesce("LoggedCallModelResponse.totalCost", sql`0`)).as("totalCost"), + fn.count("LoggedCall.id").as("numQueries"), ]) .executeTakeFirst(); - console.log("made it 3"); - const errors = await kysely .selectFrom("LoggedCall") .where("organizationId", "=", input.organizationId) @@ -57,14 +52,12 @@ export const dashboardRouter = createTRPCRouter({ "LoggedCall.id", "LoggedCallModelResponse.originalLoggedCallId", ) - .select(({ fn }) => [fn.count("id").as("count"), "respStatus as code"]) + .select(({ fn }) => [fn.count("LoggedCall.id").as("count"), "respStatus as code"]) .where("respStatus", ">", 200) .groupBy("code") .orderBy("count", "desc") .execute(); - console.log("made it 4"); - const namedErrors = errors.map((e) => { if (e.code === 429) { return { ...e, name: "Rate limited" }; @@ -75,10 +68,7 @@ export const dashboardRouter = createTRPCRouter({ } }); - console.log("data is", { periods, totals, errors: namedErrors }); - return { periods, totals, errors: namedErrors }; - // const resp = await kysely.selectFrom("LoggedCall").selectAll().execute(); }), // TODO useInfiniteQuery