110 preferred ways of communication (#112)

* users can now select communication preferences

* added icons

* Added icons to homepage

* added icons in the aggregated table

* prevent user from continuing too fast

* Added privacy page

* Added explination text to the home apge

package.json

@@ -22,6 +22,7 @@
     "@auth/prisma-adapter": "^1.4.0",
     "@hookform/resolvers": "^3.3.4",
     "@prisma/client": "^5.10.2",
+    "@radix-ui/react-accordion": "^1.1.2",
     "@radix-ui/react-avatar": "^1.0.4",
     "@radix-ui/react-dialog": "^1.0.5",
     "@radix-ui/react-dropdown-menu": "^2.0.6",

prisma/schema.prisma

@@ -8,6 +8,15 @@ datasource db {
   url      = env("DATABASE_URL")
 }
 
+enum CommunicationMethod {
+  SLACK
+  EMAIL
+  WHATSAPP
+  SIGNAL
+  PHONE
+  TEAMS
+}
+
 model Survey {
   id         String     @id @default(cuid())
   surveyName String     @unique
@@ -47,16 +56,24 @@ model QuestionResult {
   user       User         @relation(fields: [userId], references: [id], onDelete: Cascade)
 }
 
+model CommunicationPreference {
+  id      String                @id @default(cuid())
+  userId  String
+  methods CommunicationMethod[] @default([])
+  user    User                  @relation(fields: [userId], references: [id], onDelete: Cascade)
+}
+
 model User {
-  id              String           @id @default(cuid())
-  name            String?
-  email           String?          @unique
-  emailVerified   DateTime?
-  image           String?
-  roles           Role[]           @relation("UserRole")
-  accounts        Account[]
-  questionResults QuestionResult[]
-  sessions        Session[]
+  id                       String                    @id @default(cuid())
+  name                     String?
+  email                    String?                   @unique
+  emailVerified            DateTime?
+  image                    String?
+  roles                    Role[]                    @relation("UserRole")
+  accounts                 Account[]
+  questionResults          QuestionResult[]
+  communicationPreferences CommunicationPreference[]
+  sessions                 Session[]
 }
 
 model Account {

src/app/find-the-expert/[role]/page.tsx

@@ -69,7 +69,12 @@ const ShowTableWrapper = async () => {
   const [users, answerOptions] = await Promise.all([
     db.user.findMany({
       where: { id: { in: userIds } },
-      select: { id: true, name: true, email: true },
+      select: {
+        id: true,
+        name: true,
+        email: true,
+        communicationPreferences: true,
+      },
     }),
     db.answerOption.findMany({
       where: { id: { in: answerIds } },
@@ -78,11 +83,21 @@ const ShowTableWrapper = async () => {
   ]);
 
   // Create a map of user IDs to user objects for easy lookup
-  const userMap: Record<string, { name: string; email: string }> = {};
+  const userMap: Record<
+    string,
+    {
+      name: string;
+      email: string;
+      communicationPreferences: string[];
+    }
+  > = {};
   for (const user of users) {
     userMap[user.id] = {
       name: user.name ?? "Unknown User",
       email: user.email ?? "Unknown Email",
+      communicationPreferences: user.communicationPreferences.map((method) =>
+        method.methods.toString(),
+      ),
     };
   }
 
@@ -111,6 +126,10 @@ const ShowTableWrapper = async () => {
       dataByRoleAndQuestion[roleName]?.[questionText]?.push({
         name: userMap[entry.userId]?.name ?? "Unknown User",
         email: userMap[entry.userId]?.email ?? "Unknown Email",
+        communicationPreferences:
+          userMap[entry.userId]!.communicationPreferences?.length > 0
+            ? userMap[entry.userId]?.communicationPreferences
+            : ["Do not contact"],
         answer: answerOptionMap[entry.answerId] ?? "Unknown Answer",
       });
 
@@ -132,7 +151,14 @@ const ShowTableWrapper = async () => {
 
   const aggregatedDataByRole: Record<
     string,
-    Record<string, { name: string; counts: number[] }>
+    Record<
+      string,
+      {
+        name: string;
+        communicationPreferences: string[];
+        counts: number[];
+      }
+    >
   > = {};
 
   for (const entry of userAnswersForRole) {
@@ -147,10 +173,18 @@ const ShowTableWrapper = async () => {
         const answerValue = parseInt(answerOptionMap[entry.answerId] ?? "", 10);
         const userName = userMap[entry.userId]?.name ?? "Unknown User";
         const userEmail = userMap[entry.userId]?.email ?? "Unknown Email";
+        let userCommunicationPreferences =
+          userMap[entry.userId]?.communicationPreferences;
+        // Check if communicationPreferences is empty
+        userCommunicationPreferences =
+          userCommunicationPreferences?.length ?? 0 > 0
+            ? userCommunicationPreferences
+            : ["Do not contact"] ?? [];
         if (!isNaN(answerValue)) {
           if (!aggregatedDataByRole[roleName]?.[userEmail]) {
             aggregatedDataByRole[roleName]![userEmail] = {
               name: userName,
+              communicationPreferences: userCommunicationPreferences ?? [],
               counts: [0, 0, 0, 0],
             };
           }

src/app/layout.tsx

@@ -80,6 +80,16 @@ export default async function RootLayout({
                 <ModeToggle />
               </div>
               {children}
+              <div className="text-center">
+                <p className="text-md mb-8">
+                  Your privacy is important to us. We invite you to read our{" "}
+                  <Link className="underline" href={"/privacy"}>
+                    Privacy Statement
+                  </Link>{" "}
+                  to understand how we protect and handle your personal
+                  information.
+                </p>
+              </div>
             </main>
           </TRPCReactProvider>
           <Toaster />

src/app/page.tsx

@@ -6,6 +6,7 @@ import { type Session } from "next-auth";
 import { db } from "~/server/db";
 import RoleSelectionSkeleton from "~/components/loading/role-selection-loader";
 import Buttons from "~/components/additional-buttons-homepage";
+import Link from "next/link";
 
 const Home: React.FC = async () => {
   const session = await getServerAuthSession();
@@ -101,8 +102,10 @@ const Home: React.FC = async () => {
                 </ol>
               </div>
               <p className="mb-8 text-lg ">
-                Join us in leveraging the collective expertise of Info Support
-                to drive innovation and excellence in technology solutions.
+                We appreciate your willingness to share your expertise with us.
+                Please be aware that the information you provide regarding your
+                technical skills will be <strong>visible to colleagues</strong>{" "}
+                for the three goals described above.
               </p>
             </div>
             {/* If the user is logged in, show the SelectRole component */}
@@ -115,18 +118,18 @@ const Home: React.FC = async () => {
             )}
 
             <Buttons session={session} />
+
           </div>
         </div>
       </div>
     </div>
   );
 };
 
-// Define a separate component to encapsulate the SelectRole component and database calls
 const SelectRoleWrapper: React.FC<{ session: Session }> = async ({
   session,
 }) => {
-  const [roles, userRoles] = await Promise.all([
+  const [roles, userRoles, userCommunicationMethods] = await Promise.all([
     db.role.findMany(),
     db.user.findUnique({
       where: {
@@ -136,15 +139,28 @@ const SelectRoleWrapper: React.FC<{ session: Session }> = async ({
         roles: true,
       },
     }),
+    db.user.findUnique({
+      where: {
+        id: session.user.id,
+      },
+      include: {
+        communicationPreferences: true,
+      },
+    }),
   ]);
 
   const userSelectedRoles = userRoles?.roles ?? [];
+  const communicationPreferences =
+    userCommunicationMethods?.communicationPreferences ?? [];
+  const methods = communicationPreferences.map((method) => method.methods);
+  const methodStrings = methods.map((method) => method.toString());
 
   return (
     <SelectRole
       session={session}
       roles={roles}
       userSelectedRoles={userSelectedRoles}
+      methods={methodStrings}
     />
   );
 };