@peopl-health/nexus 3.5.1 → 3.5.2

package/lib/controllers/conversationController.js

@@ -344,18 +344,58 @@ const searchConversationsController = async (req, res) => {
 
 const getConversationsByNameController = async (req, res) => {
   try {
-    const conversations = await Message.aggregate([
-      { $match: { from_me: false, group_id: null } },
-      { $sort: { createdAt: -1 } },
-      { $group: {
-        _id: '$numero',
-        name: { $first: '$nombre_whatsapp' },
-        latestMessage: { $first: '$$ROOT' },
-        messageCount: { $sum: 1 }
-      }},
-      { $sort: { 'latestMessage.createdAt': -1 } }
-    ]);
-        
+    const { name } = req.query;
+
+    if (!name || name.trim().length === 0) {
+      return res.status(400).json({
+        success: false,
+        error: 'Name parameter is required'
+      });
+    }
+
+    const escapedName = name.trim().replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+
+    const limit = Math.min(Math.max(parseInt(req.query.limit) || 10, 1), 100);
+    const page = Math.max(parseInt(req.query.page) || 1, 1);
+    const skip = (page - 1) * limit;
+
+    const matchStage = {
+      $match: {
+        group_id: null,
+        nombre_whatsapp: { $regex: escapedName, $options: 'i' }
+      }
+    };
+
+    const pipeline = [
+      matchStage,
+      {
+        $group: {
+          _id: '$numero',
+          name: { $first: '$nombre_whatsapp' },
+          latestMessage: { $first: '$$ROOT' },
+          messageCount: { $sum: 1 }
+        }
+      },
+      { $sort: { 'latestMessage.createdAt': -1 } },
+      {
+        $facet: {
+          data: [
+            { $skip: skip },
+            { $limit: limit }
+          ],
+          totalCount: [
+            { $count: 'total' }
+          ]
+        }
+      }
+    ];
+
+    const [facetResult] = await Message.aggregate(pipeline);
+
+    const conversations = facetResult?.data ?? [];
+    const total = facetResult?.totalCount[0]?.total ?? 0;
+    const totalPages = Math.ceil(total / limit);
+
     res.status(200).json({
       success: true,
       conversations: conversations.map(conv => ({
@@ -364,7 +404,15 @@ const getConversationsByNameController = async (req, res) => {
         lastMessage: conv.latestMessage.body,
         lastMessageTime: conv.latestMessage.timestamp,
         messageCount: conv.messageCount
-      }))
+      })),
+      pagination: {
+        page,
+        limit,
+        total,
+        totalPages,
+        hasNext: page < totalPages,
+        hasPrev: page > 1
+      }
     });
   } catch (error) {
     logger.error('Error fetching conversations by name:', { error });
@@ -563,11 +611,73 @@ const getOpenAIThreadMessagesController = async (req, res) => {
   }
 };
 
+const searchMessagesByNumberController = async (req, res) => {
+  try {
+    const { phoneNumber } = req.params;
+    const { query } = req.query;
+
+    if (!phoneNumber || phoneNumber.trim().length === 0) {
+      return res.status(400).json({
+        success: false,
+        error: 'Phone number is required'
+      });
+    }
+
+    if (!query || query.trim().length === 0) {
+      return res.status(400).json({
+        success: false,
+        error: 'Search query is required'
+      });
+    }
+
+    const maxLimit = 100;
+    const limit = Math.min(Math.max(parseInt(req.query.limit) || 50, 1), maxLimit);
+    const page = Math.max(parseInt(req.query.page) || 1, 1);
+    const skip = (page - 1) * limit;
+    
+    const escapedQuery = query.trim().replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+    const formattedPhoneNumber = ensureWhatsAppFormat(phoneNumber);
+
+    const mongoQuery = {
+      group_id: null,
+      numero: formattedPhoneNumber,
+      body: { $regex: escapedQuery, $options: 'i' }
+    };
+    
+    const mongoSort = { createdAt: -1 };
+
+    const total = await Message.countDocuments(mongoQuery);
+    const messages = await Message.find(mongoQuery).sort(mongoSort).skip(skip).limit(limit).lean();
+    const totalPages = Math.ceil(total / limit);
+
+    res.status(200).json({
+      success: true,
+      messages,
+      pagination: {
+        page,
+        limit,
+        total,
+        totalPages,
+        hasNext: page < totalPages,
+        hasPrev: page > 1
+      },
+    });
+
+  } catch (error) {
+    logger.error('Error fetching conversation messages by number:', {error: error.message});
+    res.status(500).json({
+      success: false,
+      error: error.message || 'Failed to fetch conversation messages'
+    });
+  }
+};
+
 module.exports = {
   getConversationController,
   getConversationMessagesController,
   getConversationReplyController,
   getConversationsByNameController,
+  searchMessagesByNumberController,
   getNewMessagesController,
   markMessagesAsReadController,
   searchConversationsController,

package/lib/helpers/templateRecoveryHelper.js

@@ -1,8 +1,9 @@
 const { logger } = require('../utils/logger');
 const { Message } = require('../models/messageModel');
-const { requireProvider, sendMessage } = require('../core/NexusMessaging');
 const { Template } = require('../templates/templateStructure');
 
+const getMessaging = () => require('../core/NexusMessaging');
+
 async function handle24HourWindowError(message, messageSid) {
   try {
     if (!message?.body || !message?.numero) return;
@@ -26,6 +27,7 @@ async function handle24HourWindowError(message, messageSid) {
       return;
     }
 
+    const { requireProvider, sendMessage } = getMessaging();
     const provider = requireProvider();
     if (typeof provider.createTemplate !== 'function') return;
 

package/lib/models/messageModel.js

@@ -90,6 +90,9 @@ messageSchema.index({ numero: 1, createdAt: -1, processed: 1 }, { name: 'numero_
 messageSchema.index({ group_id: 1, createdAt: 1 }, { name: 'conversation_sort_idx' });
 messageSchema.index({ group_id: 1, from_me: 1, read: 1 }, { name: 'unread_filter_idx' });
 messageSchema.index({ group_id: 1, numero: 1, createdAt: -1 }, { name: 'conversation_lookup_idx' });
+
+messageSchema.index({ nombre_whatsapp: 1, createdAt: -1 }, { name: 'nombre_whatsapp_idx' });
+
 messageSchema.index({ createdAt: -1 }, { name: 'global_sort_idx' });
 
 messageSchema.pre('save', function (next) {
@@ -117,6 +120,7 @@ async function getClinicalContext(whatsappId) {
   try {
     const records = await getRecordByFilter(Monitoreo_ID, 'estado_general', `{whatsapp_id}='${whatsappId}'`);
     let clinicalContext = null;
+    let nombreWhatsapp = records?.[0]?.['name'] || null;
 
     if (records && records.length > 0 && records[0]['clinical-context-json']) {
       clinicalContext = JSON.parse(records[0]['clinical-context-json']);
@@ -129,11 +133,11 @@ async function getClinicalContext(whatsappId) {
     }
 
     CLINICAL_CONTEXT_CACHE.set(whatsappId, {
-      data: clinicalContext,
+      data: {nombreWhatsapp, clinicalContext},
       timestamp: now
     });
 
-    return clinicalContext;
+    return {nombreWhatsapp, clinicalContext};
   } catch (error) {
     logger.error('Error fetching clinical context from Airtable:', error);
     return null;
@@ -142,12 +146,15 @@ async function getClinicalContext(whatsappId) {
 
 async function insertMessage(values) {
   try {
-    const clinical_context = await getClinicalContext(values.numero);
+    const {nombreWhatsapp, clinicalContext} = await getClinicalContext(values.numero);
     const messageData = Object.fromEntries(
       Object.entries(values)
         .filter(([k, v]) => v !== undefined && !k.startsWith('delivery_'))
     );
-    messageData.clinical_context = clinical_context;
+    messageData.clinical_context = clinicalContext;
+    if (nombreWhatsapp && values.from_me === false) {
+      messageData.nombre_whatsapp = nombreWhatsapp;
+    }
     if (!messageData.statusInfo && values.delivery_status) {
       messageData.statusInfo = {
         status: values.delivery_status,

package/lib/routes/index.js

@@ -18,6 +18,7 @@ const conversationRouteDefinitions = {
   'GET /:phoneNumber': 'getConversationMessagesController',
   'GET /:phoneNumber/new': 'getNewMessagesController',
   'GET /:phoneNumber/openai': 'getOpenAIThreadMessagesController',
+  'GET /:phoneNumber/search': 'searchMessagesByNumberController',
   'POST /reply': 'getConversationReplyController',
   'POST /send-template': 'sendTemplateToNewNumberController',
   'POST /:phoneNumber/read': 'markMessagesAsReadController',
@@ -127,6 +128,7 @@ const builtInControllers = {
   getConversationReplyController: conversationController.getConversationReplyController,
   sendTemplateToNewNumberController: conversationController.sendTemplateToNewNumberController,
   markMessagesAsReadController: conversationController.markMessagesAsReadController,
+  searchMessagesByNumberController: conversationController.searchMessagesByNumberController,
   reportBugController: bugReportController.reportBugController,
   caseDocumentationController: caseDocumentationController.caseDocumentationController,
   

package/lib/templates/templateStructure.js

@@ -1,6 +1,6 @@
 const { v4: uuidv4 } = require('uuid');
 
-const { requireProvider } = require('../core/NexusMessaging');
+const getRequireProvider = () => require('../core/NexusMessaging').requireProvider;
 
 class Template {
   constructor(name, category = 'UTILITY', language = 'es') {
@@ -145,7 +145,7 @@ class Template {
     
   async save() {
     const twilioFormat = this.toTwilioFormat();
-    return requireProvider().createTemplate(twilioFormat);
+    return getRequireProvider()().createTemplate(twilioFormat);
   }
 
   static normalizeVariables(input = []) {

package/lib/utils/errorUtils.js

@@ -1,7 +1,10 @@
 const { logger } = require('../utils/logger');
 
 const handleApiError = (res, error, message) => {
-  logger.error(message, { error });
+  logger.error(message, {
+    error: error?.message || String(error),
+    stack: error?.stack
+  });
   const code = error.statusCode;
   const status = (typeof code === 'number' && code >= 400 && code < 600) ? code : 500;
   const bodyMessage = error.message || message;

package/package.json

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