@peopl-health/nexus 1.3.0 → 1.3.2

package/lib/controllers/assistantController.js

@@ -1,6 +1,6 @@
 const { Config_ID } = require('../config/airtableConfig');
 
-const { updateThreadActive, updateThreadStop, Thread } = require('../models/threadModel');
+const { Thread } = require('../models/threadModel');
 
 const { getRecordByFilter } = require('../services/airtableService');
 const { createAssistant, addMsgAssistant, addInsAssistant } = require('../services/assistantService');
@@ -12,7 +12,7 @@ const activeAssistantController = async (req, res) => {
   const { code, active } = req.body;
 
   try {
-    await updateThreadActive(code, active);
+    await Thread.updateOne({ code }, { $set: { active: !!active } });
     return res.status(200).send({ message: 'Active assistant' });
   } catch (error) {
     console.log(error);
@@ -114,7 +114,7 @@ const stopAssistantController = async (req, res) => {
   const { code, stop } = req.body;
 
   try {
-    await updateThreadStop(code, stop);
+    await Thread.updateOne({ code }, { $set: { stopped: !!stop } });
     return res.status(200).send({ message: 'Stop assistant' });
   } catch (error) {
     console.log(error);

package/lib/controllers/conversationController.js

@@ -1,4 +1,3 @@
-// Use mongoose models directly to avoid conflicts
 const mongoose = require('mongoose');
 const { fetchConversationData, processConversations } = require('../services/conversationService');
 const { sendMessage } = require('../core/NexusMessaging');  

package/lib/controllers/mediaController.js

@@ -1,11 +1,4 @@
-// Optional AWS config - will be undefined if not available
-let downloadFileFromS3, s3;
-try {
-  downloadFileFromS3 = require('../config/awsConfig')?.downloadFileFromS3;
-  s3 = require('../config/awsConfig')?.s3;
-} catch (e) {
-  // AWS config not available
-}
+const { s3, downloadFileFromS3 } = require('../config/awsConfig');
 const bucketName = process.env.AWS_S3_BUCKET_NAME;
 
 
@@ -24,6 +17,14 @@ const getMediaController = async (req, res) => {
       });
     }
         
+    // Validate configuration
+    if (!downloadFileFromS3 || typeof downloadFileFromS3 !== 'function') {
+      return res.status(500).json({ success: false, error: 'downloadFileFromS3 not configured. Call configureMediaController() to inject it.' });
+    }
+    if (!bucketName) {
+      return res.status(500).json({ success: false, error: 'AWS_S3_BUCKET_NAME not configured. Pass bucketName to configureMediaController() or set env.' });
+    }
+
     let mediaKey = key;
         
     console.log(`[MediaController] Final S3 key to fetch: ${mediaKey}`);
@@ -32,36 +33,37 @@ const getMediaController = async (req, res) => {
         
     if (!fileData || !fileData.Body) {
       console.error(`[MediaController] Media not found in S3: ${key}`);
-            
-      try {
-        const prefix = key.split('/')[0];
-        console.log(`[MediaController] Checking S3 for objects with prefix: ${prefix}/`);
-                
-        s3.listObjectsV2({
-          Bucket: bucketName,
-          Prefix: prefix + '/',
-          MaxKeys: 10
-        }).promise()
-          .then(listData => {
-            if (listData.Contents && listData.Contents.length > 0) {
-              console.log(`[MediaController] Found ${listData.Contents.length} objects with similar prefix:`);
-              listData.Contents.forEach(item => {
-                console.log(`[MediaController] - ${item.Key} (${item.Size} bytes)`);
-                if (item.Key.includes(key.split('/').pop().substring(0, 10))) {
-                  console.log(`[MediaController] !!! POTENTIAL MATCH: ${item.Key}`);
-                }
-              });
-            } else {
-              console.log(`[MediaController] No objects found with prefix: ${prefix}/`);
-            }
-          })
-          .catch(listErr => {
-            console.error(`[MediaController] Error listing objects: ${listErr.message}`);
-          });
-      } catch (listErr) {
-        console.error(`[MediaController] Error setting up bucket listing: ${listErr.message}`);
+
+      if (s3) {
+        try {
+          const prefix = key.split('/') [0];
+          console.log(`[MediaController] Checking S3 for objects with prefix: ${prefix}/`);
+          s3.listObjectsV2({
+            Bucket: bucketName,
+            Prefix: prefix + '/',
+            MaxKeys: 10
+          }).promise()
+            .then(listData => {
+              if (listData.Contents && listData.Contents.length > 0) {
+                console.log(`[MediaController] Found ${listData.Contents.length} objects with similar prefix:`);
+                listData.Contents.forEach(item => {
+                  console.log(`[MediaController] - ${item.Key} (${item.Size} bytes)`);
+                  if (item.Key.includes(key.split('/').pop().substring(0, 10))) {
+                    console.log(`[MediaController] !!! POTENTIAL MATCH: ${item.Key}`);
+                  }
+                });
+              } else {
+                console.log(`[MediaController] No objects found with prefix: ${prefix}/`);
+              }
+            })
+            .catch(listErr => {
+              console.error(`[MediaController] Error listing objects: ${listErr.message}`);
+            });
+        } catch (listErr) {
+          console.error(`[MediaController] Error setting up bucket listing: ${listErr.message}`);
+        }
       }
-            
+
       return res.status(404).json({
         success: false,
         error: 'Media not found in S3',
@@ -102,4 +104,4 @@ const getMediaController = async (req, res) => {
 
 module.exports = {
   getMediaController
-};
+};

package/lib/controllers/messageController.js

@@ -1,22 +1,11 @@
 const { Message } = require('../models/messageModel.js');
-
-// Import from Nexus core
-const { sendMessage } = require('../core/NexusMessaging');
-
-// Stub for missing model
-const ScheduledMessage = {
-  create: () => Promise.resolve({ success: false, error: 'Model not available' }),
-  find: () => Promise.resolve([]),
-  findById: () => Promise.resolve(null),
-  deleteOne: () => Promise.resolve({ success: false, error: 'Model not available' })
-};
-
-// Stub functions for missing services
-const getRecordByFilter = () => Promise.resolve(null);
-const sendScheduledMessage = () => Promise.resolve({ success: false, error: 'Service not available' });
+const { ScheduledMessage } = require('../models/agendaMessageModel.js');
+const { getRecordByFilter } = require('../services/airtableService.js');
+const { sendMessage, sendScheduledMessage } = require('../core/NexusMessaging');
 
 const moment = require('moment-timezone');
 
+
 const sendMessageController = async (req, res) => {
   const {
     fileUrl,
@@ -29,7 +18,7 @@ const sendMessageController = async (req, res) => {
     contentSid = null,
     variables = null
   } = req.body || {};
-  const author = process.env.USER_DB_MONGO;
+  const author = (require('../config/runtimeConfig').get('USER_DB_MONGO'));
   const sendMoment = sendTime ? moment.tz(sendTime, timeZone) + 2500 : new Date();
 
   try {
@@ -74,7 +63,7 @@ const sendBulkMessageController = async (req, res) => {
     contentSid = null,
     variables = null
   } = req.body || {};
-  const author = process.env.USER_DB_MONGO;
+  const author = (require('../config/runtimeConfig').get('USER_DB_MONGO'));
   const sendMoment = sendTime ? moment.tz(sendTime, timeZone) + 20*1000 : new Date();
 
   try {
@@ -144,7 +133,7 @@ const sendBulkMessageAirtableController = async (req, res) => {
     condition = '1',
     variables = null
   } = req.body || {};
-  const author = process.env.USER_DB_MONGO;
+  const author = (require('../config/runtimeConfig').get('USER_DB_MONGO'));
   const sendMoment = sendTime ? moment.tz(sendTime, timeZone) + 20*1000 : new Date();
 
   const regex = /\[(.*?)\]/g;
@@ -194,14 +183,10 @@ const sendBulkMessageAirtableController = async (req, res) => {
         variables
       };
             
-      // Add to scheduledMessages for both saving and scheduling
       scheduledMessages.push(scheduledMessage);
-
-      // Increment delay and message counter
       extraDelay += Math.floor(Math.random() * 5001) + 5000;
     }
 
-    // Schedule all messages with Agenda in parallel
     const sentMessages = await Promise.all(
       scheduledMessages.map(async (message) => {
         const savedMessage = await ScheduledMessage.create(message);

package/lib/controllers/templateController.js

@@ -17,33 +17,21 @@ const checkTemplateSupport = () => {
     throw new Error('Template operations are only supported with Twilio provider');
   }
 };
-const mongoose = require('mongoose');
+
 const { handleApiError } = require('../utils/errorHandler');
 
 const { Template } = require('../templates/templateStructure');
 const predefinedTemplates = require('../templates/predefinedTemplates');
 
-// Use mongoose models to avoid conflicts
+
 const getTemplateModel = () => {
-  if (mongoose.models.Template) {
-    return mongoose.models.Template;
-  }
-  
-  // If not in mongoose.models, require and return the model
+  // Require the concrete model; enforce presence instead of stubbing
   try {
+    // If already registered in mongoose.models, require still returns the same model
     const TemplateModel = require('../models/templateModel');
     return TemplateModel;
   } catch (error) {
-    console.error('Failed to load Template model:', error);
-    // Return a stub model with required methods
-    return {
-      deleteMany: () => Promise.resolve({ deletedCount: 0 }),
-      find: () => ({ sort: () => ({ limit: () => ({ lean: () => Promise.resolve([]) }) }) }),
-      findOne: () => Promise.resolve(null),
-      create: () => Promise.resolve({}),
-      updateOne: () => Promise.resolve({}),
-      deleteOne: () => Promise.resolve({})
-    };
+    throw new Error('Template model not available. Ensure models are loaded before using template controllers.');
   }
 };
 

package/lib/models/agendaMessageModel.js

@@ -0,0 +1,24 @@
+const mongoose = require('mongoose');
+
+const scheduledMessageSchema = new mongoose.Schema({
+  fileUrl: String,
+  message: String,
+  fileType: String,
+  sendTime: Date,
+  hidePreview: Boolean,
+  contentSid: String,
+  code: String,
+  author: String,
+  variables: Object,
+  extraDelay: Number,
+  timeZone: { type: String, default: 'Etc/GMT'},
+  status: { type: String, default: 'pending' },
+  wa_id: { type: String, default: null },
+  createdAt: { type: Date, default: Date.now }
+});
+
+const ScheduledMessage = mongoose.model('ScheduledMessage', scheduledMessageSchema);
+
+module.exports = {
+  ScheduledMessage
+};

package/lib/services/assistantService.js

@@ -40,7 +40,6 @@ const getAssistantById = (assistant_id, thread) => {
   }
 
   if (!assistantConfig) {
-    // Provide a more permissive default: allow registry usage without full config
     assistantConfig = {};
   }
   

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@peopl-health/nexus",
-  "version": "1.3.0",
+  "version": "1.3.2",
   "description": "Core messaging and assistant library for WhatsApp communication platforms",
   "publishConfig": {
     "access": "public"

package/lib/services/appointmentService.js

@@ -1,55 +0,0 @@
-const { Calendar_ID } = require('../config/airtableConfig.js');
-
-const { ISO_DATE, parseStartTime, addDays } = require('../utils/dateUtils.js');
-const { dateAndTimeFromStart } = require('../utils/dateUtils.js');
-
-const { getRecordByFilter, updateRecordByFilter } = require('../services/airtableService.js');
-
-
-const getNextAppointmentForPatient = async (name, after = new Date()) => {
-  const filter = `AND(patient_name = "${name}", start_time >= '${ISO_DATE(after)}')`;
-  const rows   = await getRecordByFilter(Calendar_ID, 'calendar_quimio', filter);
-  if (!rows?.length) return null;
-  return rows.sort((a, b) => new Date(a.start_time) - new Date(b.start_time))[0];
-};
-
-const getAppointmentsBetween = async (start, end) => {
-  const filter = `AND(start_time >= '${ISO_DATE(start)}', start_time < '${ISO_DATE(end)}')`;
-  return getRecordByFilter(Calendar_ID, 'calendar_quimio', filter);
-};
-
-const updateAppointmentById = async (recordId, data) => {
-  return updateRecordByFilter(
-    Calendar_ID,
-    'calendar_quimio',
-    `REGEX_MATCH({record_id}, '${recordId}')`,
-    data
-  );
-};
-
-const buildAvailabilityWindow = async originalDate => {
-  const start = addDays(originalDate, 1);
-  const end = addDays(originalDate, 7);
-  
-  const allSlots = await getAppointmentsBetween(start, addDays(end, 1));
-  const availableSlots = allSlots.filter(row => !row.patient);
-  
-  const result = {};
-  availableSlots.forEach(row => {
-    const { date, time } = dateAndTimeFromStart(row.start_time);
-    if (!result[date]) result[date] = [];
-    result[date].push({ time, availableSpots: 1 });
-  });
-  
-  return result;
-};
-
-const parseStart = parseStartTime;
-
-module.exports = {
-  getNextAppointmentForPatient,
-  getAppointmentsBetween,
-  updateAppointmentById,
-  parseStart,
-  buildAvailabilityWindow
-};