finalising

src/app/api/health/route.ts

@@ -0,0 +1,35 @@
+/**
+ * Health Check Route
+ * 
+ * GET /api/health
+ * Check if the backend is running and database is accessible
+ */
+
+import { NextRequest, NextResponse } from "next/server";
+import { db } from "@/db";
+import { users } from "@/db/schema";
+
+export async function GET(request: NextRequest) {
+    try {
+        // Test database connection
+        const testQuery = await db.select().from(users).limit(1);
+        
+        return NextResponse.json({
+            status: "healthy",
+            database: "connected",
+            timestamp: new Date().toISOString(),
+            env: {
+                jwt_secret_set: !!process.env.JWT_SECRET,
+                database_url_set: !!process.env.DATABASE_URL,
+            }
+        });
+    } catch (error) {
+        console.error("Health check failed:", error);
+        return NextResponse.json({
+            status: "unhealthy",
+            database: "disconnected",
+            error: error instanceof Error ? error.message : "Unknown error",
+            timestamp: new Date().toISOString(),
+        }, { status: 500 });
+    }
+}

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

@@ -25,7 +25,7 @@ export async function GET(request: NextRequest) {
                 username: c.partnerUsername,
                 avatar_url: c.partnerAvatar,
                 last_message: c.lastMessage?.content?.substring(0, 50) || "",
-                last_timestamp: c.lastMessage?.timestamp || null,
+                last_message_timestamp: c.lastMessage?.timestamp || null,
                 unread_count: c.unreadCount
             }))
         });

src/app/api/messaging/poll/[userId]/route.ts

@@ -28,6 +28,13 @@ export async function GET(
         return NextResponse.json(newMessages);
     } catch (error) {
         console.error("Poll messages error:", error);
-        return NextResponse.json({ error: "Internal server error" }, { status: 500 });
+        console.error("Error details:", {
+            message: error instanceof Error ? error.message : "Unknown error",
+            stack: error instanceof Error ? error.stack : undefined
+        });
+        return NextResponse.json({ 
+            error: "Internal server error",
+            detail: error instanceof Error ? error.message : "Unknown error"
+        }, { status: 500 });
     }
 }

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

@@ -35,6 +35,13 @@ export async function POST(request: NextRequest) {
         return NextResponse.json(message);
     } catch (error) {
         console.error("Send message error:", error);
-        return NextResponse.json({ error: "Internal server error" }, { status: 500 });
+        console.error("Error details:", {
+            message: error instanceof Error ? error.message : "Unknown error",
+            stack: error instanceof Error ? error.stack : undefined
+        });
+        return NextResponse.json({ 
+            error: "Internal server error",
+            detail: error instanceof Error ? error.message : "Unknown error"
+        }, { status: 500 });
     }
 }

src/lib/db/queries/messages.ts

@@ -135,19 +135,12 @@ export async function getChatHistory(currentUserId: string, otherUserId: string,
         content: msg.content,
         read: msg.read,
         timestamp: msg.timestamp,
+        edited_at: msg.editedAt || null,
     }));
 }
 
 export async function pollNewMessages(currentUserId: string, otherUserId: string, lastMessageId?: string) {
-    let query = db.select()
-        .from(messages)
-        .where(
-            and(
-                eq(messages.senderId, otherUserId),
-                eq(messages.receiverId, currentUserId)
-            )
-        )
-        .orderBy(asc(messages.timestamp));
+    let results;
 
     // If we have a last message ID, only get newer messages
     if (lastMessageId) {
@@ -157,7 +150,7 @@ export async function pollNewMessages(currentUserId: string, otherUserId: string
             .limit(1);
 
         if (lastMessage[0]) {
-            query = db.select()
+            results = await db.select()
                 .from(messages)
                 .where(
                     and(
@@ -167,10 +160,31 @@ export async function pollNewMessages(currentUserId: string, otherUserId: string
                     )
                 )
                 .orderBy(asc(messages.timestamp));
+        } else {
+            results = [];
         }
+    } else {
+        results = await db.select()
+            .from(messages)
+            .where(
+                and(
+                    eq(messages.senderId, otherUserId),
+                    eq(messages.receiverId, currentUserId)
+                )
+            )
+            .orderBy(asc(messages.timestamp));
     }
 
-    return query;
+    // Transform to snake_case for frontend compatibility
+    return results.map(msg => ({
+        id: msg.id,
+        sender_id: msg.senderId,
+        receiver_id: msg.receiverId,
+        content: msg.content,
+        read: msg.read,
+        timestamp: msg.timestamp,
+        edited_at: msg.editedAt || null,
+    }));
 }
 
 // =============================================================================