adding

prisma/schema.prisma

@@ -54,6 +54,8 @@ model ExchangeThread {
   receiverWorkspaceId String
   stage               String    @default("NEW")   // NEW | CHAT | PLACED
   status              String    @default("PENDING") // PENDING | ACCEPTED | REJECTED
+  giverAccepted       Boolean   @default(false)
+  receiverAccepted    Boolean   @default(false)
   createdAt           DateTime  @default(now())
   updatedAt           DateTime  @updatedAt
 

src/controllers/threads.js

@@ -141,36 +141,71 @@ const updateThreadStatus = async (req, res) => {
     const thread = await prisma.exchangeThread.findUnique({ where: { id: req.params.id } });
     if (!thread) return res.status(404).json({ error: 'Thread not found' });
 
-    // Only receiver can approve/reject
-    if (thread.receiverWorkspaceId !== member.workspaceId) {
-      return res.status(403).json({ error: 'Only the receiver can approve or reject' });
+    const isGiver = thread.giverWorkspaceId === member.workspaceId;
+    const isReceiver = thread.receiverWorkspaceId === member.workspaceId;
+
+    if (!isGiver && !isReceiver) {
+      return res.status(403).json({ error: 'Access denied' });
+    }
+
+    let updateData = {};
+    let newStatus = thread.status;
+    let newStage = thread.stage;
+    
+    let giverAccepted = thread.giverAccepted;
+    let receiverAccepted = thread.receiverAccepted;
+
+    if (status === 'REJECTED') {
+      newStatus = 'REJECTED';
+      newStage = 'NEW';
+      updateData = { status: newStatus, stage: newStage };
+    } else if (status === 'ACCEPTED') {
+      if (isGiver) giverAccepted = true;
+      if (isReceiver) receiverAccepted = true;
+      
+      updateData = { giverAccepted, receiverAccepted };
+      
+      if (giverAccepted && receiverAccepted) {
+        newStatus = 'ACCEPTED';
+        newStage = 'CHAT';
+        updateData.status = newStatus;
+        updateData.stage = newStage;
+      }
     }
 
     const updated = await prisma.exchangeThread.update({
       where: { id: req.params.id },
-      data: {
-        status,
-        stage: status === 'ACCEPTED' ? 'CHAT' : 'NEW',
-      },
+      data: updateData,
       include: {
         giverWorkspace: true,
         receiverWorkspace: true,
       },
     });
 
-    if (status === 'ACCEPTED') {
-      wsManager.sendNotification(updated.giverWorkspaceId, {
+    // Determine who to notify
+    const otherId = isGiver ? thread.receiverWorkspaceId : thread.giverWorkspaceId;
+    const selfWorkspace = isGiver ? updated.giverWorkspace : updated.receiverWorkspace;
+
+    if (newStatus === 'ACCEPTED' && newStage === 'CHAT') {
+      wsManager.sendNotification(otherId, {
+        type: 'connection_accepted',
+        threadId: updated.id,
+        receiverWorkspaceName: selfWorkspace.websiteName,
+        receiverWorkspaceDomain: selfWorkspace.domain,
+      });
+      // also notify self just in case
+      wsManager.sendNotification(member.workspaceId, {
         type: 'connection_accepted',
         threadId: updated.id,
-        receiverWorkspaceName: updated.receiverWorkspace.websiteName,
-        receiverWorkspaceDomain: updated.receiverWorkspace.domain,
+        receiverWorkspaceName: selfWorkspace.websiteName,
+        receiverWorkspaceDomain: selfWorkspace.domain,
       });
-    } else if (status === 'REJECTED') {
-      wsManager.sendNotification(updated.giverWorkspaceId, {
+    } else if (newStatus === 'REJECTED') {
+      wsManager.sendNotification(otherId, {
         type: 'connection_rejected',
         threadId: updated.id,
-        receiverWorkspaceName: updated.receiverWorkspace.websiteName,
-        receiverWorkspaceDomain: updated.receiverWorkspace.domain,
+        receiverWorkspaceName: selfWorkspace.websiteName,
+        receiverWorkspaceDomain: selfWorkspace.domain,
       });
     }
 

src/jobs/matcher.js

@@ -3,7 +3,7 @@ const cron = require('node-cron');
 const wsManager = require('../lib/ws');
 
 const runWeeklyMatching = async () => {
-  console.log('Running automated connection matching algorithm...');
+  console.log(`[${new Date().toISOString()}] Running automated connection matching algorithm...`);
   try {
     // Fetch workspaces that belong ONLY to non-admin users
     // A workspace has teamMembers, we check if they are owned by an ADMIN
@@ -19,7 +19,7 @@ const runWeeklyMatching = async () => {
       }
     });
     if (workspaces.length < 2) {
-      console.log('Not enough workspaces for matching.');
+      console.log(`[${new Date().toISOString()}] Not enough workspaces for matching.`);
       return { success: false, message: 'Not enough workspaces to perform matching.' };
     }
 
@@ -137,10 +137,10 @@ const runWeeklyMatching = async () => {
       }
     }
     
-    console.log(`Matching completed successfully. Created ${createdCount} new connections.`);
+    console.log(`[${new Date().toISOString()}] Matching completed successfully. Created ${createdCount} new connections.`);
     return { success: true, count: createdCount };
   } catch (error) {
-    console.error('Error in matching algorithm:', error);
+    console.error(`[${new Date().toISOString()}] Error in matching algorithm:`, error);
     return { success: false, error: error.message };
   }
 };
@@ -158,9 +158,9 @@ const initCron = async () => {
     activeJob = cron.schedule(expr, () => {
       runWeeklyMatching();
     });
-    console.log(`Initialized matchmaking cron job with expression: ${expr}`);
+    console.log(`[${new Date().toISOString()}] Initialized matchmaking cron job with expression: ${expr}`);
   } catch (err) {
-    console.error('Failed to init cron:', err);
+    console.error(`[${new Date().toISOString()}] Failed to init cron:`, err);
   }
 };