From a57859aef0c8c3031d6232d0fdfd7bb7ff3eadf8 Mon Sep 17 00:00:00 2001
From: Bob Burningham <bob@all-tech.services>
Date: Sun, 12 Nov 2023 17:31:24 -0800
Subject: [PATCH] fixed type on prisma schema and others

---
 .../servers/[serverId]/conversations/[memberId]/page.tsx     | 4 ++--
 pages/api/socket/messages/[messageId].ts                     | 2 +-
 pages/api/socket/messages/index.ts                           | 2 +-
 prisma/schema.prisma                                         | 5 +++--
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/app/(main)/(routes)/servers/[serverId]/conversations/[memberId]/page.tsx b/app/(main)/(routes)/servers/[serverId]/conversations/[memberId]/page.tsx
index daaf8aa..8377153 100644
--- a/app/(main)/(routes)/servers/[serverId]/conversations/[memberId]/page.tsx
+++ b/app/(main)/(routes)/servers/[serverId]/conversations/[memberId]/page.tsx
@@ -41,9 +41,9 @@ const MemberIdPage = async ({
         return redirect(`/servers/${params.serverId}`);
     }
 
-    const { MemberOne, MemberTwo } = conversation;
+    const { memberOne, memberTwo } = conversation;
 
-    const otherMember = MemberOne.profileId === profile.id ? MemberTwo : MemberOne;
+    const otherMember = memberOne.profileId === profile.id ? memberTwo : memberOne;
 
     return (
         <div className="bg-white dark:bg-[#313338] flex flex-col h-full">
diff --git a/pages/api/socket/messages/[messageId].ts b/pages/api/socket/messages/[messageId].ts
index 0e0b4e7..714ee84 100644
--- a/pages/api/socket/messages/[messageId].ts
+++ b/pages/api/socket/messages/[messageId].ts
@@ -64,7 +64,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponseS
         let message = await db.message.findFirst({
             where: {
                 id: messageId as string,
-                channelId: channel.id,
+                channelId: channel.id as string,
             },
             include: {
                 member: {
diff --git a/pages/api/socket/messages/index.ts b/pages/api/socket/messages/index.ts
index b8e5073..1565dcc 100644
--- a/pages/api/socket/messages/index.ts
+++ b/pages/api/socket/messages/index.ts
@@ -61,7 +61,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponseS
         const member = server.members.find((member) => member.profileId === profile.id);
 
         if (!member) {
-            return res.status(401).json({ error: "Unauthorized" });
+            return res.status(401).json({ error: "Member not found" });
         }
 
         const message = await db.message.create({
diff --git a/prisma/schema.prisma b/prisma/schema.prisma
index 42c89d3..ce3f910 100644
--- a/prisma/schema.prisma
+++ b/prisma/schema.prisma
@@ -121,10 +121,10 @@ model Conversation{
   id String @id @default(uuid())
 
   memberOneId String
-  MemberOne Member @relation("MemberOne", fields: [memberOneId], references: [id], onDelete: Cascade)
+  memberOne Member @relation("MemberOne", fields: [memberOneId], references: [id], onDelete: Cascade)
 
   memberTwoId String
-  MemberTwo Member @relation("MemberTwo", fields: [memberTwoId], references: [id], onDelete: Cascade)
+  memberTwo Member @relation("MemberTwo", fields: [memberTwoId], references: [id], onDelete: Cascade)
 
   createdAt DateTime @default(now())
   updatedAt DateTime @updatedAt
@@ -148,6 +148,7 @@ model DirectMessage{
   conversation Conversation @relation(fields: [conversationId], references: [id], onDelete: Cascade)
 
   deleted Boolean @default(false)
+  
   createdAt DateTime @default(now())
   updatedAt DateTime @updatedAt