@peopl-health/nexus 2.5.11 → 2.6.0

package/lib/controllers/conversationController.js

@@ -13,7 +13,7 @@ const Message = mongoose.models.Message;
 
 const getConversationController = async (req, res) => {
   const startTime = Date.now();
-  logger.info('Starting getConversationController at', new Date().toISOString());
+  logger.info('Starting getConversationController at', { time: new Date().toISOString() });
 
   try {
     // Parse pagination parameters
@@ -34,7 +34,7 @@ const getConversationController = async (req, res) => {
     }
     
     const messageCount = await Message.countDocuments({});
-    logger.info('Total message count:', messageCount);
+    logger.info('Total message count:', { messageCount });
     
     if (messageCount === 0) {
       logger.info('No messages found in database, returning empty conversations list');
@@ -63,7 +63,7 @@ const getConversationController = async (req, res) => {
     const totalPages = Math.ceil(total / limit);
     const totalTime = Date.now() - startTime;
     
-    logger.info('Number of conversations found:', conversations?.length || 0);
+    logger.info('Number of conversations found:', { conversationsCount: conversations?.length || 0 });
     logger.info(`Total controller execution time: ${totalTime}ms`);
     logger.info(`Filter: ${filter}, Pagination: ${conversations.length} of ${total} conversations (page ${page}/${totalPages})`);
 
@@ -83,8 +83,8 @@ const getConversationController = async (req, res) => {
     logger.info('Response sent successfully!');
 
   } catch (error) {
-    logger.error('Error fetching conversations:', error);
-    logger.error('Error stack:', error.stack);
+    logger.error('Error fetching conversations:', { error });
+    logger.error('Error stack:', { error: error.stack });
     res.status(500).json({
       success: false,
       error: error.message || 'Failed to fetch conversations'
@@ -93,10 +93,10 @@ const getConversationController = async (req, res) => {
 };
 
 const getConversationMessagesController = async (req, res) => {
-  logger.info('Starting getConversationMessagesController at', new Date().toISOString());
+  logger.info('Starting getConversationMessagesController at', { time: new Date().toISOString() });
   try {
     const { phoneNumber } = req.params;
-    logger.info('Requested conversation for phone number:', phoneNumber);
+    logger.info('Requested conversation for phone number:', { phoneNumber });
     
     if (!phoneNumber) {
       return res.status(400).json({
@@ -113,7 +113,7 @@ const getConversationMessagesController = async (req, res) => {
       try {
         query.createdAt = { $lt: new Date(before) };
       } catch (parseError) {
-        logger.warn('Invalid date format for before parameter:', before, parseError);
+        logger.warn('Invalid date format for before parameter:', { before, parseError });
         query.createdAt = { $lt: before };
       }
     }
@@ -142,12 +142,12 @@ const getConversationMessagesController = async (req, res) => {
           
           if (msg.media) {
             if (!msg.media || typeof msg.media !== 'object') {
-              logger.warn('Found media message with invalid media data:', msg._id);
+              logger.warn('Found media message with invalid media data:', { msgId: msg._id });
               return true;
             }
             
             if (msg.media && (typeof msg.media.data === 'function' || msg.media.data instanceof Buffer)) {
-              logger.warn('Found media message with Buffer data that might cause serialization issues:', msg._id);
+              logger.warn('Found media message with Buffer data that might cause serialization issues:', { msgId: msg._id });
               return true;
             }
           }
@@ -163,7 +163,7 @@ const getConversationMessagesController = async (req, res) => {
         logger.info('No messages found for this query');
       }
     } catch (err) {
-      logger.error('Database query error in message retrieval:', err);
+      logger.error('Database query error in message retrieval:', { err });
       messages = [];
     }
     
@@ -174,7 +174,7 @@ const getConversationMessagesController = async (req, res) => {
         JSON.stringify(msg);
         return msg;
       } catch (serializationError) {
-        logger.error(`Found non-serializable message with ID ${msg._id}:`, serializationError);
+        logger.error(`Found non-serializable message with ID ${msg._id}:`, { serializationError });
         return {
           _id: msg._id?.toString() || 'unknown',
           numero: msg.numero || phoneNumber,
@@ -197,7 +197,7 @@ const getConversationMessagesController = async (req, res) => {
     });
     logger.info('Successfully sent conversation messages response');
   } catch (error) {
-    logger.error(`Error fetching conversation for ${req.params?.phoneNumber || 'unknown'}:`, error);
+    logger.error(`Error fetching conversation for ${req.params?.phoneNumber || 'unknown'}:`, { error });
     res.status(500).json({
       success: false,
       error: error.message || 'Failed to fetch conversation'
@@ -206,7 +206,7 @@ const getConversationMessagesController = async (req, res) => {
 };
 
 const getConversationReplyController = async (req, res) => {
-  logger.info('Starting getConversationReplyController at', new Date().toISOString());
+  logger.info('Starting getConversationReplyController at', { time: new Date().toISOString() });
   try {
     const { phoneNumber, message, mediaData, contentSid, variables } = req.body;
     logger.info('Reply request params:', { 
@@ -225,7 +225,7 @@ const getConversationReplyController = async (req, res) => {
     }
         
     const formattedPhoneNumber = ensureWhatsAppFormat(phoneNumber);
-    logger.info('Formatted phone number:', formattedPhoneNumber);
+    logger.info('Formatted phone number:', { formattedPhoneNumber });
     
     const messageData = {
       code: formattedPhoneNumber,
@@ -235,7 +235,7 @@ const getConversationReplyController = async (req, res) => {
     
     // Handle template message (contentSid provided)
     if (contentSid) {
-      logger.info('Processing template message with contentSid:', contentSid);
+      logger.info('Processing template message with contentSid:', { contentSid });
       messageData.contentSid = contentSid;
       
       if (variables && Object.keys(variables).length > 0) {
@@ -281,10 +281,10 @@ const getConversationReplyController = async (req, res) => {
       message: 'Reply sent successfully'
     });
   } catch (error) {
-    logger.error('Error sending reply:', error);
+    logger.error('Error sending reply:', { error });
     logger.info('Request body', { body: req.body || {} });
     const errorMsg = error.message || 'Failed to send reply';
-    logger.error('Responding with error:', errorMsg);
+    logger.error('Responding with error:', { errorMsg });
     res.status(500).json({
       success: false,
       error: errorMsg
@@ -361,7 +361,7 @@ const searchConversationsController = async (req, res) => {
             batch.map(p => `{whatsapp_id} = "${p}"`).join(', ') +
             ')';
           return getRecordByFilter(Historial_Clinico_ID, 'estado_general', formula).catch(error => {
-            logger.error('Error fetching Airtable batch for search:', error);
+            logger.error('Error fetching Airtable batch for search:', { error });
             return [];
           });
         });
@@ -380,7 +380,7 @@ const searchConversationsController = async (req, res) => {
         });
         logger.info(`Found ${Object.keys(airtableNameMap).length} names in Airtable for search results (${batches.length} batches)`);
       } catch (error) {
-        logger.error('Error fetching names from Airtable for search, falling back to nombre_whatsapp:', error);
+        logger.error('Error fetching names from Airtable for search, falling back to nombre_whatsapp:', { error });
       }
     }
 
@@ -445,7 +445,7 @@ const searchConversationsController = async (req, res) => {
     });
 
   } catch (error) {
-    logger.error('Error searching conversations:', error);
+    logger.error('Error searching conversations:', { error });
     res.status(500).json({
       success: false,
       error: error.message || 'Failed to search conversations'
@@ -478,7 +478,7 @@ const getConversationsByNameController = async (req, res) => {
       }))
     });
   } catch (error) {
-    logger.error('Error fetching conversations by name:', error);
+    logger.error('Error fetching conversations by name:', { error });
     res.status(500).json({
       success: false,
       error: error.message || 'Failed to fetch conversations by name'
@@ -524,7 +524,7 @@ const getNewMessagesController = async (req, res) => {
       messages: messages
     });
   } catch (error) {
-    logger.error(`Error fetching new messages for ${req.params.phoneNumber}:`, error);
+    logger.error(`Error fetching new messages for ${req.params.phoneNumber}:`, { error });
     res.status(500).json({
       success: false,
       error: error.message || 'Failed to fetch new messages'
@@ -533,7 +533,7 @@ const getNewMessagesController = async (req, res) => {
 };
 
 const markMessagesAsReadController = async (req, res) => {
-  logger.info('Starting markMessagesAsReadController at', new Date().toISOString());
+  logger.info('Starting markMessagesAsReadController at', { time: new Date().toISOString() });
   try {
     const { phoneNumber } = req.params;
         
@@ -544,7 +544,7 @@ const markMessagesAsReadController = async (req, res) => {
       });
     }
         
-    logger.info('Marking messages as read for phone number:', phoneNumber);
+    logger.info('Marking messages as read for phone number:', { phoneNumber });
     const result = await Message.updateMany(
       { 
         numero: phoneNumber, 
@@ -563,8 +563,8 @@ const markMessagesAsReadController = async (req, res) => {
       modifiedCount: result.nModified || result.modifiedCount
     });
   } catch (error) {
-    logger.error(`Error marking messages as read for ${req.params?.phoneNumber || 'unknown'}:`, error);
-    logger.error('Error stack:', error.stack);
+    logger.error(`Error marking messages as read for ${req.params?.phoneNumber || 'unknown'}:`, { error });
+    logger.error('Error stack:', { error: error.stack });
     res.status(500).json({
       success: false,
       error: error.message || 'Failed to mark messages as read'
@@ -573,7 +573,7 @@ const markMessagesAsReadController = async (req, res) => {
 };
 
 const sendTemplateToNewNumberController = async (req, res) => {
-  logger.info('Starting sendTemplateToNewNumberController at', new Date().toISOString());
+  logger.info('Starting sendTemplateToNewNumberController at', { time: new Date().toISOString() });
   try {
     const { phoneNumber, templateId, variables } = req.body;
     
@@ -618,7 +618,7 @@ const sendTemplateToNewNumberController = async (req, res) => {
       messageId: message.sid
     });
   } catch (error) {
-    logger.error('Error sending template to new number:', error);
+    logger.error('Error sending template to new number:', { error });
     res.status(500).json({
       success: false,
       error: error.message || 'Failed to send template to new number'
@@ -627,14 +627,14 @@ const sendTemplateToNewNumberController = async (req, res) => {
 };
 
 const getOpenAIThreadMessagesController = async (req, res) => {
-  logger.info('Starting getOpenAIThreadMessagesController at', new Date().toISOString());
+  logger.info('Starting getOpenAIThreadMessagesController at', { time: new Date().toISOString() });
   try {
     const { phoneNumber } = req.params;
     const { limit = 50, order = 'desc', runId } = req.query;
     const variant = process.env.VARIANT || 'assistants';
     
-    logger.info('Fetching OpenAI thread messages for:', phoneNumber);
-    logger.info('Variant:', variant, 'Limit:', limit, 'Order:', order);
+    logger.info('Fetching OpenAI thread messages for:', { phoneNumber });
+    logger.info('Variant:', { variant }, 'Limit:', { limit }, 'Order:', { order });
     
     if (!phoneNumber) {
       return res.status(400).json({
@@ -649,7 +649,7 @@ const getOpenAIThreadMessagesController = async (req, res) => {
     }).sort({ createdAt: -1 });
     
     if (!thread) {
-      logger.info('No active OpenAI thread found for:', phoneNumber);
+      logger.info('No active OpenAI thread found for:', { phoneNumber });
       return res.status(404).json({
         success: false,
         error: 'No active OpenAI thread found for this phone number'
@@ -657,14 +657,14 @@ const getOpenAIThreadMessagesController = async (req, res) => {
     }
     
     let conversationId = thread.conversation_id;
-    logger.info('Thread found - Conversation ID:', conversationId);
+    logger.info('Thread found - Conversation ID:', { conversationId });
     
     const provider = llmConfig.getOpenAIProvider({ instantiate: true, variant });
     if (!provider) {
       throw new Error('OpenAI provider not initialized');
     }
     
-    logger.info('Using provider variant:', provider.getVariant());
+    logger.info('Using provider variant:', { variant: provider.getVariant() });
     
     const queryParams = { 
       threadId: conversationId, 
@@ -679,7 +679,7 @@ const getOpenAIThreadMessagesController = async (req, res) => {
     let messages;
     let threadRecreated = false;
     
-    logger.info('Calling listMessages with params:', queryParams);
+    logger.info('Calling listMessages with params:', { queryParams });
     messages = await withThreadRecovery(
       async (currentThread = thread) => {
         if (currentThread !== thread) {
@@ -712,8 +712,8 @@ const getOpenAIThreadMessagesController = async (req, res) => {
     });
     
   } catch (error) {
-    logger.error('Error fetching OpenAI thread messages:', error);
-    logger.error('Error stack:', error.stack);
+    logger.error('Error fetching OpenAI thread messages:', { error });
+    logger.error('Error stack:', { error: error.stack });
     res.status(500).json({
       success: false,
       error: error.message || 'Failed to fetch OpenAI thread messages'

package/lib/routes/index.js

@@ -68,8 +68,8 @@ const templateRouteDefinitions = {
 };
 
 const threadRouteDefinitions = {
-  'PUT /review/:code': 'updateThreadReviewStatus',
   'PUT /review/all': 'updateAllThreadsReviewStatus',
+  'PUT /review/:code': 'updateThreadReviewStatus',
   'GET /review': 'getThreadsByReviewStatus'
 };
 

package/lib/services/conversationService.js

@@ -12,6 +12,7 @@ const fetchConversationData = async (filter, skip, limit) => {
     unread: { ...baseMatch, ...unreadMatch },
     recent: { ...baseMatch, createdAt: { $gt: new Date(Date.now() - 24 * 60 * 60 * 1000) } },
     'no-response': baseMatch,
+    'pending-review': baseMatch,
     all: baseMatch
   };
   
@@ -24,7 +25,22 @@ const fetchConversationData = async (filter, skip, limit) => {
     { $sort: { createdAt: 1, timestamp: 1 } },
     { $group: { _id: '$numero', latestMessage: { $last: '$$ROOT' }, messageCount: { $sum: 1 } } },
     ...(filter === 'no-response' ? [{ $match: { 'latestMessage.from_me': false } }] : []),
-    { $sort: { 'latestMessage.createdAt': -1 } },
+    {
+      $lookup: {
+        from: 'threads',
+        localField: '_id',
+        foreignField: 'code', 
+        as: 'threadInfo'
+      }
+    },
+    {
+      $addFields: {
+        review: { $arrayElemAt: ['$threadInfo.review', 0] }
+      }
+    },
+    { $project: { threadInfo: 0 } },
+    ...(filter === 'pending-review' ? [{ $match: { $or: [{ review: false }, { review: null }] } }] : []),
+    { $sort: { 'latestMessage.createdAt': -1, 'latestMessage.timestamp': -1 } },
     { $skip: skip },
     { $limit: limit }
   ];
@@ -34,9 +50,12 @@ const fetchConversationData = async (filter, skip, limit) => {
     Message.aggregate(pipeline),
     Message.aggregate([{ $match: { ...baseMatch, from_me: false } }, { $sort: { createdAt: -1 } }, { $group: { _id: '$numero', name: { $first: '$nombre_whatsapp' } } }]),
     Message.aggregate([{ $match: { ...baseMatch, ...unreadMatch } }, { $group: { _id: '$numero', unreadCount: { $sum: 1 } } }]),
-    Message.aggregate(filter === 'no-response' 
-      ? [{ $match: baseMatch }, { $project: { numero: 1, from_me: 1, createdAt: 1, timestamp: 1 } }, { $sort: { createdAt: -1 } }, { $group: { _id: '$numero', latestMessage: { $first: '$$ROOT' } } }, { $match: { 'latestMessage.from_me': false } }, { $count: 'total' }]
-      : [{ $match: filterConditions }, { $group: { _id: '$numero' } }, { $count: 'total' }]
+    Message.aggregate(
+      filter === 'no-response' 
+        ? [{ $match: baseMatch }, { $project: { numero: 1, from_me: 1, createdAt: 1, timestamp: 1 } }, { $sort: { createdAt: -1 } }, { $group: { _id: '$numero', latestMessage: { $first: '$$ROOT' } } }, { $match: { 'latestMessage.from_me': false } }, { $count: 'total' }]
+        : filter === 'pending-review'
+          ? [{ $match: baseMatch }, { $group: { _id: '$numero' } }, { $lookup: { from: 'threads', localField: '_id', foreignField: 'code', as: 'threadInfo' } }, { $addFields: { review: { $arrayElemAt: ['$threadInfo.review', 0] } } }, { $match: { $or: [{ review: false }, { review: null }] } }, { $count: 'total' }]
+          : [{ $match: filterConditions }, { $group: { _id: '$numero' } }, { $count: 'total' }]
     )
   ]);
   
@@ -76,7 +95,8 @@ const processConversations = async (conversations, nameMap, unreadMap) => {
       unreadCount: unreadMap[phoneNumber] || 0,
       isLastMessageMedia: !!msg?.media,
       lastMessageType: getMediaType(msg?.media),
-      lastMessageFromMe: msg?.from_me || false
+      lastMessageFromMe: msg?.from_me || false,
+      review: conv?.review || false
     };
   };
   

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@peopl-health/nexus",
-  "version": "2.5.11",
+  "version": "2.6.0",
   "description": "Core messaging and assistant library for WhatsApp communication platforms",
   "keywords": [
     "whatsapp",