@peopl-health/nexus 3.3.2 → 3.3.3

package/lib/controllers/conversationController.js

@@ -314,31 +314,48 @@ const searchConversationsController = async (req, res) => {
 
     const escapedQuery = query.replace(/\+/g, '\\+');
 
-    // Search through all conversations in the database
+    // Prioritize matches on numero/nombre_whatsapp; body search is a last resort.
     const conversations = await Message.aggregate([
-      { $match: { 
-        group_id: null,
-        $or: [
-          { numero: { $regex: escapedQuery, $options: 'i' } },
-          { nombre_whatsapp: { $regex: escapedQuery, $options: 'i' } },
-          { body: { $regex: escapedQuery, $options: 'i' } }
-        ]
-      }},
-      { $project: {
-        numero: 1,
-        body: 1,
-        createdAt: 1,
-        timestamp: 1,
-        media: 1,
-        nombre_whatsapp: 1,
-        from_me: 1
-      }},
-      { $group: {
-        _id: '$numero',
-        latestMessage: { $first: '$$ROOT' },
-        messageCount: { $sum: 1 }
-      }},
-      { $sort: { 'latestMessage.createdAt': -1 } },
+      {
+        $facet: {
+          primary: [
+            { $match: { 
+              group_id: null,
+              $or: [
+                { numero: { $regex: escapedQuery, $options: 'i' } },
+                { nombre_whatsapp: { $regex: escapedQuery, $options: 'i' } }
+              ]
+            }},
+            { $sort: { createdAt: -1, timestamp: -1 } },
+            { $group: {
+              _id: '$numero',
+              latestMessage: { $first: '$$ROOT' },
+              messageCount: { $sum: 1 }
+            }},
+            { $addFields: { priority: 1 } }
+          ],
+          secondary: [
+            { $match: { 
+              group_id: null,
+              body: { $regex: escapedQuery, $options: 'i' }
+            }},
+            { $sort: { createdAt: -1, timestamp: -1 } },
+            { $group: {
+              _id: '$numero',
+              latestMessage: { $first: '$$ROOT' },
+              messageCount: { $sum: 1 }
+            }},
+            { $addFields: { priority: 2 } }
+          ]
+        }
+      },
+      { $project: { merged: { $concatArrays: ['$primary', '$secondary'] } } },
+      { $unwind: '$merged' },
+      { $replaceRoot: { newRoot: '$merged' } },
+      { $sort: { priority: 1, 'latestMessage.createdAt': -1 } },
+      // Deduplicate numbers keeping highest-priority (name/number) result first
+      { $group: { _id: '$_id', doc: { $first: '$$ROOT' } } },
+      { $replaceRoot: { newRoot: '$doc' } },
       { $limit: parsedLimit }
     ]);
 
@@ -741,4 +758,4 @@ module.exports = {
   searchConversationsController,
   sendTemplateToNewNumberController,
   getOpenAIThreadMessagesController
-};
+};

package/package.json

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