From 730030f6f11307789f1165a9141f6d1a55af7056 Mon Sep 17 00:00:00 2001
From: m5r <mokht@rmi.al>
Date: Thu, 21 Oct 2021 00:24:29 +0200
Subject: [PATCH] add some metrics

---
 app/public-area/pages/open.tsx         | 6 +++++-
 app/public-area/queries/get-metrics.ts | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/app/public-area/pages/open.tsx b/app/public-area/pages/open.tsx
index 26f55e5..d3d44be 100644
--- a/app/public-area/pages/open.tsx
+++ b/app/public-area/pages/open.tsx
@@ -6,20 +6,24 @@ import getMetrics from "../queries/get-metrics";
 import Layout from "../components/layout";
 
 const initialData = {
+	users: 0,
 	phoneNumbers: 0,
 	smsExchanged: 0,
 	minutesCalled: 0,
+	averageMinutesCalled: 0,
 };
 
 const OpenMetrics: BlitzPage = () => {
 	const [metrics] = useQuery(getMetrics, {}, { suspense: false, initialData });
-	const { phoneNumbers, smsExchanged, minutesCalled } = metrics ?? initialData;
+	const { users, phoneNumbers, smsExchanged, minutesCalled, averageMinutesCalled } = metrics ?? initialData;
 
 	return (
 		<dl className="mt-5 grid grid-cols-1 gap-5 sm:grid-cols-3">
+			<Card title="Users" value={users} />
 			<Card title="Phone Numbers Registered" value={phoneNumbers} />
 			<Card title="SMS Exchanged" value={smsExchanged} />
 			<Card title="Minutes on Call" value={minutesCalled} />
+			<Card title="Avg Call Length in Minutes" value={averageMinutesCalled} />
 		</dl>
 	);
 };
diff --git a/app/public-area/queries/get-metrics.ts b/app/public-area/queries/get-metrics.ts
index 30ab57f..ca858e0 100644
--- a/app/public-area/queries/get-metrics.ts
+++ b/app/public-area/queries/get-metrics.ts
@@ -3,7 +3,8 @@ import { resolver } from "blitz";
 import db from "../../../db";
 
 export default resolver.pipe(async () => {
-	const [phoneNumbers, smsExchanged, allPhoneCalls] = await Promise.all([
+	const [users, phoneNumbers, smsExchanged, allPhoneCalls] = await Promise.all([
+		db.user.count(),
 		db.phoneNumber.count(),
 		db.message.count(),
 		db.phoneCall.findMany(),
@@ -16,10 +17,13 @@ export default resolver.pipe(async () => {
 		return seconds + Number.parseInt(phoneCall.duration);
 	}, 0);
 	const minutesCalled = Math.round(secondsCalled / 60);
+	const averageMinutesCalled = (minutesCalled / allPhoneCalls.length).toFixed(2);
 
 	return {
+		users,
 		phoneNumbers,
 		smsExchanged,
 		minutesCalled,
+		averageMinutesCalled,
 	};
 });