@peopl-health/nexus 4.2.7 → 4.2.9

package/lib/controllers/messageController.js

@@ -1,9 +1,11 @@
 const moment = require('moment-timezone');
+const mongoose = require('mongoose');
 
 const { logger } = require('../utils/logger');
 
 const { Message } = require('../models/messageModel.js');
 const { ScheduledMessage } = require('../models/agendaMessageModel.js');
+const { DeliveryAttempt } = require('../models/deliveryAttemptModel.js');
 const FlowRouting = require('../models/flowRoutingModel.js');
 
 const { ensureWhatsAppFormat } = require('../helpers/twilioHelper');
@@ -253,11 +255,29 @@ const checkMessageStatusController = async (req, res) => {
   }
 };
 
+const getDeliveryAttemptsController = async (req, res) => {
+  const { id } = req.params;
+  if (!id || !mongoose.Types.ObjectId.isValid(id)) {
+    return res.status(400).json({ success: false, error: 'Valid message id is required' });
+  }
+  try {
+    const attempts = await DeliveryAttempt
+      .find({ messageId: id }, { raw: 0 })
+      .sort({ attemptedAt: 1 })
+      .lean();
+    return res.status(200).json({ success: true, attempts });
+  } catch (err) {
+    logger.error('Error fetching delivery attempts:', { messageId: id, error: err.message });
+    return res.status(500).json({ success: false, error: 'Failed to fetch delivery attempts' });
+  }
+};
+
 module.exports = {
   sendMessageController,
   sendBulkMessageController,
   sendBulkMessageAirtableController,
   getLastInteractionController,
   checkScheduledMessageStatusController,
-  checkMessageStatusController
+  checkMessageStatusController,
+  getDeliveryAttemptsController
 };

package/lib/jobs/TemplateApprovalJob.js

@@ -1,5 +1,6 @@
 const { logger } = require('../utils/logger');
 const { Message } = require('../models/messageModel');
+const { DeliveryAttempt } = require('../models/deliveryAttemptModel');
 const { BaseJob } = require('./BaseJob');
 
 const QUEUE_NAME = 'template-approval';
@@ -139,6 +140,11 @@ class TemplateApprovalJob extends BaseJob {
 
     logger.info('[TemplateApprovalJob] Recovered', { originalMessageSid, recoveryMessageId: sendResult.messageId, templateSid });
 
+    await DeliveryAttempt.updateOne(
+      { messageId: message._id, kind: 'recovery_template_setup', twilioSid: templateSid },
+      { $set: { status: 'sent', completedAt: new Date() } }
+    );
+
     provider.deleteTemplate(templateSid).catch((deleteErr) =>
       logger.warn('[TemplateApprovalJob] Failed to delete template after send', { templateSid, error: deleteErr.message })
     );
@@ -152,6 +158,16 @@ class TemplateApprovalJob extends BaseJob {
       { $set: { 'statusInfo.recoveryRejectedAt': new Date() } }
     );
 
+    await DeliveryAttempt.updateOne(
+      { messageId: message._id, kind: 'recovery_template_setup', twilioSid: templateSid },
+      { $set: {
+        status: 'failed',
+        errorSource: 'server',
+        errorMessage: 'Rejected by WhatsApp',
+        completedAt: new Date()
+      } }
+    );
+
     try {
       await provider.deleteTemplate(templateSid);
       logger.info('[TemplateApprovalJob] Rejected template deleted', { templateSid, messageId: message._id });

package/lib/routes/index.js

@@ -49,7 +49,8 @@ const messageRouteDefinitions = {
   'POST /quality': 'addQualityVoteController',
   'GET /quality/:message_id': 'getQualityVotesByMessageController',
   'GET /quality/:message_id/voter/:voter_username': 'getQualityVoteByMessageAndVoterController',
-  'GET /quality/voter/:voter_username': 'getQualityVotesByVoterController'
+  'GET /quality/voter/:voter_username': 'getQualityVotesByVoterController',
+  'GET /:id/attempts': 'getDeliveryAttemptsController'
 };
 
 const patientRouteDefinitions = {
@@ -164,6 +165,7 @@ const builtInControllers = {
   getLastInteractionController: messageController.getLastInteractionController,
   checkScheduledMessageStatusController: messageController.checkScheduledMessageStatusController,
   checkMessageStatusController: messageController.checkMessageStatusController,
+  getDeliveryAttemptsController: messageController.getDeliveryAttemptsController,
   getMessageStatusController: messageStatusController.getMessageStatusController,
   messageStatusCallbackController: messageStatusController.messageStatusCallbackController,
   addQualityVoteController: qualityMessageController.addQualityVoteController,

package/package.json

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