From 3d5c715b0908b037f184a6074b3e0afef4a91cd0 Mon Sep 17 00:00:00 2001
From: JefQuidousse2 <jef.quidousse@infosupport.com>
Date: Tue, 1 Oct 2024 10:42:34 +0200
Subject: [PATCH 1/3] init

---
 prisma/schema.prisma                    | 6 ++++++
 src/app/find-the-expert/[role]/page.tsx | 6 ++++--
 src/server/log.ts                       | 9 +++++++++
 3 files changed, 19 insertions(+), 2 deletions(-)
 create mode 100644 src/server/log.ts

diff --git a/prisma/schema.prisma b/prisma/schema.prisma
index 758b819..83d819a 100644
--- a/prisma/schema.prisma
+++ b/prisma/schema.prisma
@@ -110,3 +110,9 @@ model VerificationToken {
 
   @@unique([identifier, token])
 }
+
+model UsageMetrics {
+  id            String    @id @default(cuid())
+  action        String
+  createdAt     DateTime @default(now())
+}
\ No newline at end of file
diff --git a/src/app/find-the-expert/[role]/page.tsx b/src/app/find-the-expert/[role]/page.tsx
index 66ef65d..7ffad36 100644
--- a/src/app/find-the-expert/[role]/page.tsx
+++ b/src/app/find-the-expert/[role]/page.tsx
@@ -7,6 +7,7 @@ import ButtonSkeleton from "~/components/loading/button-loader";
 import { Login } from "~/components/login";
 import ShowDataTable from "~/components/show-data-table";
 import { getServerAuthSession } from "~/server/auth";
+import { logUsageMetric } from "~/server/log";
 import {
   extractUniqueIds,
   fetchUserAnswersForRole,
@@ -37,9 +38,10 @@ const ContentSection = () => (
   </>
 );
 
-const FindTheExpertPage = async () => {
+const FindTheExpertPage = async (context: { params: { role: any; }; }) => {
   const session = await getServerAuthSession();
-
+  await logUsageMetric("Find The Expert Page Accessed For Role: " + context.params.role);
+  
   return (
     <div className="container flex flex-col items-center justify-center gap-12 px-4 py-16">
       <h1 className="text-center text-5xl font-extrabold tracking-tight">
diff --git a/src/server/log.ts b/src/server/log.ts
new file mode 100644
index 0000000..6b583cd
--- /dev/null
+++ b/src/server/log.ts
@@ -0,0 +1,9 @@
+import { db } from "./db"
+
+export const logUsageMetric = async (action: string) => {
+    await db.usageMetrics.create({
+        data: {
+            action: action
+        }
+    });
+}
\ No newline at end of file

From eba55ca17219b967e21a53cffa873104cbd86d68 Mon Sep 17 00:00:00 2001
From: JefQuidousse2 <jef.quidousse@infosupport.com>
Date: Wed, 9 Oct 2024 16:28:23 +0200
Subject: [PATCH 2/3] refactor logging

---
 src/app/find-the-expert/[role]/page.tsx       |  4 ++--
 .../additional-buttons-homepage.tsx           | 13 ++++++++++--
 src/components/select-role.tsx                |  6 ++++++
 src/server/api/root.ts                        |  2 ++
 src/server/log.ts                             | 21 ++++++++++++-------
 5 files changed, 35 insertions(+), 11 deletions(-)

diff --git a/src/app/find-the-expert/[role]/page.tsx b/src/app/find-the-expert/[role]/page.tsx
index 7ffad36..680a921 100644
--- a/src/app/find-the-expert/[role]/page.tsx
+++ b/src/app/find-the-expert/[role]/page.tsx
@@ -7,7 +7,7 @@ import ButtonSkeleton from "~/components/loading/button-loader";
 import { Login } from "~/components/login";
 import ShowDataTable from "~/components/show-data-table";
 import { getServerAuthSession } from "~/server/auth";
-import { logUsageMetric } from "~/server/log";
+import { api } from "~/trpc/server";
 import {
   extractUniqueIds,
   fetchUserAnswersForRole,
@@ -40,7 +40,7 @@ const ContentSection = () => (
 
 const FindTheExpertPage = async (context: { params: { role: any; }; }) => {
   const session = await getServerAuthSession();
-  await logUsageMetric("Find The Expert Page Accessed For Role: " + context.params.role);
+  api.usageMetricLogger.logUsageMetric.mutate({logMessage: 'find-the-expert-page-filtered-on-role'});
   
   return (
     <div className="container flex flex-col items-center justify-center gap-12 px-4 py-16">
diff --git a/src/components/additional-buttons-homepage.tsx b/src/components/additional-buttons-homepage.tsx
index d131ea9..5ea0420 100644
--- a/src/components/additional-buttons-homepage.tsx
+++ b/src/components/additional-buttons-homepage.tsx
@@ -5,8 +5,15 @@ import { Login } from "./login";
 import { Button } from "./ui/button";
 import { ArrowRightDarkModeFriendly } from "./svg";
 import { signIn } from "next-auth/react";
+import { api } from "~/trpc/react";
 
 const Buttons = ({ session }: { session: Session | null }) => {
+  const {mutate: logUsageMetric} = api.usageMetricLogger.logUsageMetric.useMutation();
+
+  const handleLogging = () => {
+    logUsageMetric({logMessage:'find-the-expert-page-accessed'});
+  }
+
   return (
     <div className="mt-5 flex justify-center">
       <div className="mt-5 flex flex-col items-center gap-6 md:flex-row">
@@ -24,8 +31,10 @@ const Buttons = ({ session }: { session: Session | null }) => {
               <ArrowRightDarkModeFriendly />
             </Button>
             <Button
-              onClick={() =>
-                signIn("azure-ad", { callbackUrl: "/find-the-expert/general" })
+              onClick={() => {
+                  handleLogging();
+                  signIn("azure-ad", { callbackUrl: "/find-the-expert/general" });
+                }
               }
               variant="outline"
               className="border-2 border-[#bed62f]"
diff --git a/src/components/select-role.tsx b/src/components/select-role.tsx
index c5fa656..62f5618 100644
--- a/src/components/select-role.tsx
+++ b/src/components/select-role.tsx
@@ -30,6 +30,7 @@ export default function SelectRoles({
   } = api.survey.setRole.useMutation();
   const { mutate: setDefaultRoleMutate, isSuccess: setDefaultRoleIsSuccess } =
     api.survey.setDefaultRole.useMutation();
+  const {mutate: logUsageMetric} = api.usageMetricLogger.logUsageMetric.useMutation();
 
   // Show a toast notification on role mutation error
   useEffect(() => {
@@ -85,6 +86,10 @@ export default function SelectRoles({
       roleIds: selectedRoles,
     });
   };
+  
+  const handleLogging = () => {
+    logUsageMetric({logMessage:'find-the-expert-page-accessed'});
+  }
 
   const [communicationMethodIsLoading, setCommunicationMethodIsLoading] =
     useState(false);
@@ -168,6 +173,7 @@ export default function SelectRoles({
           </Link>
           <Link href="/find-the-expert/general">
             <SpinnerButton
+              onClick={handleLogging}
               state={communicationMethodIsLoading}
               variant="outline"
               className="border-2 border-[#bed62f]"
diff --git a/src/server/api/root.ts b/src/server/api/root.ts
index de7a1fc..a128464 100644
--- a/src/server/api/root.ts
+++ b/src/server/api/root.ts
@@ -1,5 +1,6 @@
 import { surveyRouter } from "~/server/api/routers/survey";
 import { createTRPCRouter } from "~/server/api/trpc";
+import { usageMetricLogger } from "../log";
 
 /**
  * This is the primary router for your server.
@@ -8,6 +9,7 @@ import { createTRPCRouter } from "~/server/api/trpc";
  */
 export const appRouter = createTRPCRouter({
   survey: surveyRouter,
+  usageMetricLogger: usageMetricLogger
 });
 
 // export type definition of API
diff --git a/src/server/log.ts b/src/server/log.ts
index 6b583cd..b6fffac 100644
--- a/src/server/log.ts
+++ b/src/server/log.ts
@@ -1,9 +1,16 @@
+import { createTRPCRouter, publicProcedure } from "./api/trpc";
+import { z } from "zod";
 import { db } from "./db"
 
-export const logUsageMetric = async (action: string) => {
-    await db.usageMetrics.create({
-        data: {
-            action: action
-        }
-    });
-}
\ No newline at end of file
+
+export const usageMetricLogger = createTRPCRouter({
+    logUsageMetric: publicProcedure
+        .input(z.object({logMessage: z.string()}))
+        .mutation(async ({input}) => {
+                await db.usageMetrics.create({
+                    data: {
+                        action: input.logMessage
+                    }
+                });
+        })
+})
\ No newline at end of file

From e5483296bd9352dcf56732416198714ee493a613 Mon Sep 17 00:00:00 2001
From: JefQuidousse2 <jef.quidousse@infosupport.com>
Date: Fri, 25 Oct 2024 13:07:30 +0200
Subject: [PATCH 3/3] fiw linting

---
 src/app/find-the-expert/[role]/page.tsx        | 4 ++--
 src/app/result/[role]/page.tsx                 | 1 -
 src/components/additional-buttons-homepage.tsx | 4 ++--
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/app/find-the-expert/[role]/page.tsx b/src/app/find-the-expert/[role]/page.tsx
index 680a921..683c789 100644
--- a/src/app/find-the-expert/[role]/page.tsx
+++ b/src/app/find-the-expert/[role]/page.tsx
@@ -38,9 +38,9 @@ const ContentSection = () => (
   </>
 );
 
-const FindTheExpertPage = async (context: { params: { role: any; }; }) => {
+const FindTheExpertPage = async () => {
   const session = await getServerAuthSession();
-  api.usageMetricLogger.logUsageMetric.mutate({logMessage: 'find-the-expert-page-filtered-on-role'});
+  await api.usageMetricLogger.logUsageMetric.mutate({logMessage: 'find-the-expert-page-filtered-on-role'});
   
   return (
     <div className="container flex flex-col items-center justify-center gap-12 px-4 py-16">
diff --git a/src/app/result/[role]/page.tsx b/src/app/result/[role]/page.tsx
index 80e5546..50d8613 100644
--- a/src/app/result/[role]/page.tsx
+++ b/src/app/result/[role]/page.tsx
@@ -1,7 +1,6 @@
 import React, { Suspense } from "react";
 import { db } from "~/server/db";
 import {
-  type Role,
   type QuestionResult,
   type TransformedData,
 } from "~/models/types";
diff --git a/src/components/additional-buttons-homepage.tsx b/src/components/additional-buttons-homepage.tsx
index 5ea0420..22f01d5 100644
--- a/src/components/additional-buttons-homepage.tsx
+++ b/src/components/additional-buttons-homepage.tsx
@@ -31,9 +31,9 @@ const Buttons = ({ session }: { session: Session | null }) => {
               <ArrowRightDarkModeFriendly />
             </Button>
             <Button
-              onClick={() => {
+              onClick={async () => {
                   handleLogging();
-                  signIn("azure-ad", { callbackUrl: "/find-the-expert/general" });
+                  await signIn("azure-ad", { callbackUrl: "/find-the-expert/general" });
                 }
               }
               variant="outline"