@peopl-health/nexus 3.8.26 → 3.8.28

package/lib/controllers/conversationController.js

@@ -714,7 +714,7 @@ const startConversationController = async (req, res) => {
     });
   } catch (error) {
     logger.error('[StartConversation] Error', { error: error.message });
-    res.status(500).json({
+    res.status(error.statusCode || 500).json({
       success: false,
       error: error.message || 'Failed to start conversation'
     });

package/lib/models/messageModel.js

@@ -7,6 +7,8 @@ const { logger } = require('../utils/logger');
 
 const { getRecordByFilter, updateRecordByFilter } = require('../services/airtableService');
 
+const { Thread } = require('./threadModel');
+
 const messageSchema = new mongoose.Schema({
   raw: { type: Object, default: null },
   body: { type: String, required: true },
@@ -152,8 +154,18 @@ async function insertMessage(values) {
         .filter(([k, v]) => v !== undefined && !k.startsWith('delivery_'))
     );
     messageData.clinical_context = clinicalContext;
-    if (nombreWhatsapp && values.from_me === false) {
-      messageData.nombre_whatsapp = nombreWhatsapp;
+    let patientName = nombreWhatsapp;
+    if (!patientName && values.from_me === false) {
+      try {
+        const thread = await Thread.findOne({ code: values.numero }).select('nombre').lean();
+        patientName = thread?.nombre;
+      } catch (error) {
+        logger.error('Error fetching patient name from Thread:', error);
+      }
+    }
+    if (patientName && values.from_me === false) {
+      messageData.nombre_whatsapp = patientName;
+      values.nombre_whatsapp = patientName;
     }
     if (!messageData.statusInfo && values.delivery_status) {
       messageData.statusInfo = {

package/lib/services/conversationService.js

@@ -170,17 +170,13 @@ const processConversations = async (conversations, nameMap, unreadMap) => {
 };
 
 const startConversation = async (phoneNumber, message, name) => {
-  const thread = await Thread.findOneAndUpdate(
-    { code: phoneNumber },
-    {
-      code: phoneNumber,
-      ...(name && { nombre: name }),
-      active: true
-    },
-    { upsert: true, new: true }
-  );
 
-  logger.info('[StartConversation] Thread ready', { phoneNumber, threadId: thread._id, name });
+  const existing = await Thread.findOne({ code: phoneNumber });
+  if (existing) {
+    const err = new Error('Conversation already exists');
+    err.statusCode = 409;
+    throw err;
+  }
 
   const provider = requireProvider();
   const templateName = `auto_${Date.now()}_${Math.floor(Math.random() * 1000)}`;
@@ -237,6 +233,12 @@ const startConversation = async (phoneNumber, message, name) => {
     label: '[StartConversation]',
     logContext: { phoneNumber },
     onApproved: async (prov) => {
+      const thread = await Thread.findOneAndUpdate(
+        { code: phoneNumber },
+        { code: phoneNumber, ...(name && { nombre: name }), active: true },
+        { upsert: true, new: true }
+      );
+      logger.info('[StartConversation] Thread ready', { phoneNumber, threadId: thread._id });
       await sendMessage({ code: phoneNumber, contentSid: twilioContent.sid, variables: {} });
       logger.info('[StartConversation] Template sent successfully', { phoneNumber, templateSid: twilioContent.sid });
       await TemplateModel.updateOne({ sid: twilioContent.sid }, { status: 'APPROVED' });
@@ -260,7 +262,6 @@ const startConversation = async (phoneNumber, message, name) => {
 
   return {
     phoneNumber,
-    threadId: thread._id,
     contentSid: twilioContent.sid,
     approvalStatus: approvalResponse.status || 'PENDING'
   };

package/lib/storage/MongoStorage.js

@@ -50,6 +50,7 @@ class MongoStorage {
           messageId,
           from: chatId,
           code: values.numero,
+          name: values.nombre_whatsapp,
           origin: values.origin,
           body: values.body,
           media: values.media,

package/package.json

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