@peopl-health/nexus 3.3.1 → 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/lib/controllers/interactionController.js

@@ -1,11 +1,11 @@
-const { Interaction } = require('../models/interactionModel');
+const { getInteraction } = require('../models/interactionModel');
 const { Message } = require('../models/messageModel');
 const { INTERACTION_QUALITY_VALUES } = require('../config/interactionConfig');
 const { addRecord, getRecordByFilter } = require('../services/airtableService');
 const { Logging_ID } = require('../config/airtableConfig');
 const { logger } = require('../utils/logger');
 
-async function logInteractionToAirtable(messageIds, whatsapp_id, voter_username, description) {
+async function logInteractionToAirtable(messageIds, whatsapp_id, voter_username, description, type, medical_note) {
   try {
     const messageObjects = await Message.find({ _id: { $in: messageIds } }).sort({ createdAt: -1 });
     
@@ -29,7 +29,9 @@ async function logInteractionToAirtable(messageIds, whatsapp_id, voter_username,
       patient_id: patientId ? [patientId] : undefined,
       reporter: voter_username,
       conversation,
-      description
+      description,
+      type: type && type.length ? type : undefined,
+      medical_note: medical_note || undefined
     };
 
     await addRecord(Logging_ID, 'interactions', airtableData);
@@ -41,7 +43,7 @@ async function logInteractionToAirtable(messageIds, whatsapp_id, voter_username,
 
 const addInteractionController = async (req, res) => {
   try {
-    const { messages, whatsapp_id, voter_username, quality, description } = req.body;
+    const { messages, whatsapp_id, voter_username, quality, description, type, medical_note } = req.body;
     if (!messages || !Array.isArray(messages) || messages.length === 0) {
       return res.status(400).json({ success: false, error: 'Messages array is required and must not be empty' });
     }
@@ -50,9 +52,11 @@ const addInteractionController = async (req, res) => {
     if (!quality || !INTERACTION_QUALITY_VALUES.includes(quality)) {
       return res.status(400).json({ success: false, error: `Quality must be one of: ${INTERACTION_QUALITY_VALUES.join(', ')}` });
     }
-    const interaction = await Interaction.create({ messages, whatsapp_id, voter_username, quality, description });
-    
-    logInteractionToAirtable(messages, whatsapp_id, voter_username, description).catch(err => 
+    const typeArray = Array.isArray(type) ? type : type ? [type] : undefined;
+    const Interaction = getInteraction();
+    const interaction = await Interaction.create({ messages, whatsapp_id, voter_username, quality, description, type: typeArray, medical_note });
+
+    logInteractionToAirtable(messages, whatsapp_id, voter_username, description, typeArray, medical_note).catch(err => 
       logger.error('Background Airtable logging failed:', err)
     );
     
@@ -66,6 +70,7 @@ const addInteractionController = async (req, res) => {
 const getInteractionsByWhatsappIdController = async (req, res) => {
   try {
     const { whatsapp_id } = req.params;
+    const Interaction = getInteraction();
     const interactions = await Interaction.find({ whatsapp_id }).populate('messages').sort({ createdAt: -1 });
     res.status(200).json({ success: true, whatsappId: whatsapp_id, count: interactions.length, interactions });
   } catch (error) {

package/lib/controllers/qualityMessageController.js

@@ -1,4 +1,4 @@
-const { QualityMessage } = require('../models/qualityMessageModel');
+const { getQualityMessage } = require('../models/qualityMessageModel');
 const { Message } = require('../models/messageModel');
 const { logger } = require('../utils/logger');
 
@@ -15,7 +15,7 @@ const addQualityVoteController = async (req, res) => {
     const message = await Message.findById(message_id);
     if (!message) return res.status(404).json({ success: false, error: 'Message not found' });
 
-    const qualityVote = await QualityMessage.findOneAndUpdate(
+    const qualityVote = await getQualityMessage().findOneAndUpdate(
       { message_id, voter_username },
       { quality, notes, context },
       { upsert: true, new: true }
@@ -31,7 +31,7 @@ const addQualityVoteController = async (req, res) => {
 const getQualityVotesByMessageController = async (req, res) => {
   try {
     const { message_id } = req.params;
-    const votes = await QualityMessage.find({ message_id }).sort({ createdAt: -1 });
+    const votes = await getQualityMessage().find({ message_id }).sort({ createdAt: -1 });
     
     const summary = {
       total: votes.length,
@@ -50,7 +50,7 @@ const getQualityVotesByMessageController = async (req, res) => {
 const getQualityVotesByVoterController = async (req, res) => {
   try {
     const { voter_username } = req.params;
-    const votes = await QualityMessage.find({ voter_username }).populate('message_id').sort({ createdAt: -1 });
+    const votes = await getQualityMessage().find({ voter_username }).populate('message_id').sort({ createdAt: -1 });
     res.status(200).json({ success: true, voterUsername: voter_username, count: votes.length, votes });
   } catch (error) {
     logger.error('Error fetching voter quality votes:', error);
@@ -61,7 +61,7 @@ const getQualityVotesByVoterController = async (req, res) => {
 const getQualityVoteByMessageAndVoterController = async (req, res) => {
   try {
     const { message_id, voter_username } = req.params;
-    const vote = await QualityMessage.findOne({ message_id, voter_username }).populate('message_id');
+    const vote = await getQualityMessage().findOne({ message_id, voter_username }).populate('message_id');
     
     if (!vote) {
       return res.status(404).json({ success: false, error: 'Vote not found' });

package/lib/models/index.js

@@ -1,13 +1,15 @@
 const { Message, getMessageValues, formatTimestamp } = require('./messageModel');
 const { Thread } = require('./threadModel');
-const { Interaction } = require('./interactionModel');
-const { QualityMessage } = require('./qualityMessageModel');
+const { getInteraction } = require('./interactionModel');
+const { getQualityMessage } = require('./qualityMessageModel');
+const { getPredictionMetrics } = require('./predictionMetricsModel');
 
 module.exports = {
   Message,
   Thread,
-  Interaction,
-  QualityMessage,
+  getInteraction,
+  getQualityMessage,
+  getPredictionMetrics,
   getMessageValues,
   formatTimestamp
 };

package/lib/models/interactionModel.js

@@ -13,6 +13,8 @@ const interactionSchema = new mongoose.Schema({
     required: true 
   },
   description: { type: String, default: null },
+  medical_note: { type: String, default: null },
+  type: { type: [String], default: [] },
   source: { type: String, default: () => process.env.USER_DB_MONGO }
 }, { timestamps: true });
 
@@ -23,4 +25,4 @@ const getInteraction = () => {
   return db.models.Interaction || db.model('Interaction', interactionSchema);
 };
 
-module.exports = { getInteraction, interactionSchema, get Interaction() { return getInteraction(); } };
+module.exports = { getInteraction, interactionSchema };

package/lib/models/predictionMetricsModel.js

@@ -26,4 +26,4 @@ const getPredictionMetrics = () => {
   return db.models.PredictionMetrics || db.model('PredictionMetrics', predictionMetricsSchema);
 };
 
-module.exports = { getPredictionMetrics, predictionMetricsSchema, get PredictionMetrics() { return getPredictionMetrics(); } };
+module.exports = { getPredictionMetrics, predictionMetricsSchema };

package/lib/models/qualityMessageModel.js

@@ -24,4 +24,4 @@ const getQualityMessage = () => {
   return db.models.QualityMessage || db.model('QualityMessage', qualityMessageSchema);
 };
 
-module.exports = { getQualityMessage, qualityMessageSchema, get QualityMessage() { return getQualityMessage(); } };
+module.exports = { getQualityMessage, qualityMessageSchema };

package/lib/services/assistantServiceCore.js

@@ -3,7 +3,7 @@ const runtimeConfig = require('../config/runtimeConfig');
 const { createProvider } = require('../providers/createProvider');
 
 const { Thread } = require('../models/threadModel.js');
-const { PredictionMetrics } = require('../models/predictionMetricsModel');
+const { getPredictionMetrics } = require('../models/predictionMetricsModel');
 const { insertMessage } = require('../models/messageModel');
 const { Historial_Clinico_ID } = require('../config/airtableConfig');
 
@@ -267,7 +267,7 @@ const replyAssistantCore = async (code, message_ = null, thread_ = null, runOpti
         has_breakdown: !!timings.process_messages_breakdown
       });
       
-      await PredictionMetrics.create({
+      await getPredictionMetrics().create({
         message_id: `${code}-${Date.now()}`,
         numero: code,
         assistant_id: finalThread.getAssistantId(),

package/lib/storage/MongoStorage.js

@@ -2,7 +2,6 @@ const { connect: mongoConnect, disconnect: mongoDisconnect, getDb } = require('.
 const runtimeConfig = require('../config/runtimeConfig');
 
 const { Message, insertMessage } = require('../models/messageModel');
-const { Interaction } = require('../models/interactionModel');
 const { Thread } = require('../models/threadModel');
 
 const { ensureWhatsAppFormat } = require('../helpers/twilioHelper');
@@ -18,7 +17,6 @@ class MongoStorage {
     this.dbName = config.dbName;
     this.collections = config.collections || {
       messages: 'messages',
-      interactions: 'interactions',
       threads: 'threads'
     };
     this.schemas = this.createSchemas();
@@ -27,7 +25,6 @@ class MongoStorage {
   createSchemas() {
     return {
       Message,
-      Interaction,
       Thread
     };
   }

package/package.json

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