bug fix 42

src/app/api/messaging/mentees/route.ts

@@ -1,7 +1,7 @@
 import { NextRequest, NextResponse } from "next/server";
 import { getCurrentUser } from "@/lib/auth";
 import { db } from "@/db";
-import { mentorMatches, users } from "@/db/schema";
+import { mentorMatches, mentors, users } from "@/db/schema";
 import { eq, and } from "drizzle-orm";
 
 export async function GET(request: NextRequest) {
@@ -11,6 +11,21 @@ export async function GET(request: NextRequest) {
             return NextResponse.json({ error: "Unauthorized" }, { status: 401 });
         }
 
+        // First find the mentor record for this user
+        const mentorRecord = await db
+            .select({ id: mentors.id })
+            .from(mentors)
+            .where(eq(mentors.userId, user.id))
+            .limit(1);
+
+        if (!mentorRecord[0]) {
+            console.log("[Get Mentees] No mentor record for user:", user.id);
+            return NextResponse.json({ mentees: [] });
+        }
+
+        const mentorId = mentorRecord[0].id;
+        console.log("[Get Mentees] Found mentor:", mentorId, "for user:", user.id);
+
         const mentees = await db
             .select({
                 id: mentorMatches.id,
@@ -24,11 +39,13 @@ export async function GET(request: NextRequest) {
             .leftJoin(users, eq(mentorMatches.menteeId, users.id))
             .where(
                 and(
-                    eq(mentorMatches.mentorId, user.id),
+                    eq(mentorMatches.mentorId, mentorId),
                     eq(mentorMatches.status, "active")
                 )
             );
 
+        console.log("[Get Mentees] Found", mentees.length, "active mentees");
+
         // Transform to match frontend expectations
         const formattedMentees = mentees.map(m => ({
             user_id: m.menteeId,

src/app/api/messaging/mentorship/accept/route.ts

@@ -1,7 +1,7 @@
 import { NextRequest, NextResponse } from "next/server";
 import { getCurrentUser } from "@/lib/auth";
 import { db } from "@/db";
-import { mentorshipRequests, mentors, messages } from "@/db/schema";
+import { mentorshipRequests, mentors, mentorMatches, messages, users } from "@/db/schema";
 import { eq, and } from "drizzle-orm";
 import { v4 as uuidv4 } from "uuid";
 
@@ -22,8 +22,9 @@ export async function POST(request: NextRequest) {
 
         // Find the mentor record for this user
         const mentorRecord = await db
-            .select({ id: mentors.id })
+            .select({ id: mentors.id, username: users.username })
             .from(mentors)
+            .leftJoin(users, eq(mentors.userId, users.id))
             .where(eq(mentors.userId, user.id))
             .limit(1);
 
@@ -58,13 +59,26 @@ export async function POST(request: NextRequest) {
             .set({ status: "accepted" })
             .where(eq(mentorshipRequests.id, requestId));
 
+        // Create mentor-mentee relationship in mentorMatches
+        await db.insert(mentorMatches).values({
+            id: uuidv4(),
+            mentorId: mentorId,
+            mentorUsername: mentorRecord[0].username || user.username || "",
+            menteeId: req.menteeId,
+            menteeUsername: req.menteeUsername || "",
+            compatibilityScore: 1.0,
+            matchReason: "Mentorship request accepted",
+            status: "active",
+            createdAt: new Date().toISOString(),
+        });
+
         // Send welcome message
         if (welcomeMessage) {
             await db.insert(messages).values({
                 id: uuidv4(),
                 senderId: user.id,
                 receiverId: req.menteeId,
-                content: `[Mentorship Welcome] ${welcomeMessage}`,
+                content: welcomeMessage,
                 read: false,
                 timestamp: new Date().toISOString(),
             });