@peopl-health/nexus 3.5.2 → 3.5.3

package/lib/adapters/TwilioProvider.js

@@ -524,7 +524,7 @@ class TwilioProvider extends MessageProvider {
         const wa = req.whatsapp;
         approvalRequest = {
           sid: req.sid,
-          status: (wa?.status || req.status || 'UNKNOWN').toUpperCase(),
+          status: (wa?.status || req.status).toUpperCase(),
           ...(wa && { category: wa.category, name: wa.name, rejectionReason: wa.rejection_reason, contentType: wa.content_type }),
           dateCreated: req.dateCreated || req.date_created,
           dateUpdated: req.dateUpdated || req.date_updated

package/lib/controllers/templateController.js

@@ -113,87 +113,86 @@ const createTemplate = async (req, res) => {
 
 const listTemplates = async (req, res) => {
   try {
-    const { status: queryStatus, type, limit = 50, showFlows: queryShowFlows } = req.query;
-    const provider = requireProvider();
-    const twilioRawTemplates = await provider.listTemplates({ limit: parseInt(limit, 10) });
-
-    const showFlows = type === 'flow' || queryShowFlows === 'true';
-    const filteredTwilioTemplates = twilioRawTemplates.filter(template => {
-      const isFlow = template.types && template.types['twilio/flex'];
-      const statusMatch = queryStatus ? template.status === queryStatus : true;
-      return (showFlows || !isFlow) && statusMatch;
-    });
-
-    const validTwilioSids = filteredTwilioTemplates.map(t => t.sid);
-
-    await TemplateModel.deleteMany({ sid: { $nin: validTwilioSids } });
-
-    for (const twilioTemplate of filteredTwilioTemplates) {
-      const updateFields = {
-        friendlyName: twilioTemplate.friendlyName,
-        category: twilioTemplate.types?.['twilio/text']?.categories?.[0] || 'UTILITY',
-        language: twilioTemplate.language || 'es',
-        status: twilioTemplate.status || 'DRAFT',
-        lastUpdated: new Date(),
-      };
-
-      try {
-        const approvalInfo = await provider.checkApprovalStatus(twilioTemplate.sid);
-        if (approvalInfo && approvalInfo.approvalRequest) {
-          const reqData = approvalInfo.approvalRequest;
-          updateFields.approvalRequest = {
-            sid: reqData.sid,
-            status: reqData.status || 'PENDING',
-            dateSubmitted: reqData.dateCreated ? new Date(reqData.dateCreated) : new Date(),
-            dateUpdated: reqData.dateUpdated ? new Date(reqData.dateUpdated) : new Date(),
-            rejectionReason: reqData.rejectionReason || ''
-          };
-          if (reqData.status === 'APPROVED') updateFields.status = 'APPROVED';
-          else if (reqData.status === 'REJECTED') updateFields.status = 'REJECTED';
-          else if (reqData.status === 'PENDING') updateFields.status = 'PENDING';
-        }
-      } catch (err) {
-        logger.warn(`Could not fetch approval status for template ${twilioTemplate.sid}:`, err.message);
-      }
-
-      const onInsertFields = {
-        sid: twilioTemplate.sid,
-        name: (twilioTemplate.friendlyName || `template_${twilioTemplate.sid}`).replace(/[^a-zA-Z0-9_]/g, '_').toLowerCase(),
-        dateCreated: new Date(twilioTemplate.dateCreated),
-        body: '', 
-        footer: '',
-        variables: [],
-        components: []
-      };
+    const { status: queryStatus, type, limit: queryLimit = 50, showFlows: queryShowFlows } = req.query;
+    const page = Math.max(parseInt(req.query.page) || 1, 1);
+    const limit = Math.min(Math.max(parseInt(queryLimit) || 50, 1), 100);
+    const skip = (page - 1) * limit;
 
-      await TemplateModel.updateOne(
-        { sid: twilioTemplate.sid },
-        {
-          $set: updateFields,
-          $setOnInsert: onInsertFields
-        },
-        { upsert: true }
-      );
-    }
-
-    const findCriteria = { sid: { $in: validTwilioSids } };
+    const findCriteria = {};
+    
     if (queryStatus) {
       findCriteria.status = queryStatus;
     }
+    
+    const showFlows = type === 'flow' || queryShowFlows === 'true';
+    if (showFlows) {
+      findCriteria.type = 'twilio/flex';
+    } else {
+      findCriteria.type = { $ne: 'twilio/flex' };
+    }
 
-    let finalTemplates = await TemplateModel.find(findCriteria)
+    const total = await TemplateModel.countDocuments(findCriteria);
+    const totalPages = Math.ceil(total / limit);
+    
+    const templates = await TemplateModel.find(findCriteria)
       .sort({ dateCreated: -1 })
-      .limit(parseInt(limit, 10))
+      .skip(skip)
+      .limit(limit)
       .lean();
 
-    const formattedTemplates = finalTemplates.map(_formatTemplate);
+    const provider = requireProvider();
+    
+    const approvalPromises = templates
+      .filter(template => template.status !== 'APPROVED' && template.status !== 'REJECTED')
+      .map(async (template) => {
+        try {
+          const approvalInfo = await provider.checkApprovalStatus(template.sid);
+          if (approvalInfo && approvalInfo.approvalRequest) {
+            const reqData = approvalInfo.approvalRequest;
+            const updateFields = {
+              approvalRequest: {
+                sid: reqData.sid,
+                status: reqData.status,
+                dateSubmitted: reqData.dateCreated ? new Date(reqData.dateCreated) : new Date(),
+                dateUpdated: reqData.dateUpdated ? new Date(reqData.dateUpdated) : new Date(),
+                rejectionReason: reqData.rejectionReason || ''
+              },
+              lastUpdated: new Date(),
+              status: reqData.status
+            };
+
+            await TemplateModel.updateOne(
+              { sid: template.sid },
+              { $set: updateFields }
+            );
+
+            Object.assign(template, {
+              approvalRequest: updateFields.approvalRequest,
+              status: updateFields.status,
+              lastUpdated: updateFields.lastUpdated
+            });
+          }
+        } catch (err) {
+          logger.warn(`Could not fetch approval status for template ${template.sid}:`, err.message);
+        }
+      });
+
+    await Promise.all(approvalPromises);
 
     return res.status(200).json({
       success: true,
-      templates: formattedTemplates,
-      count: formattedTemplates.length
+      templates: templates.map(_formatTemplate),
+      count: templates.length,
+      pagination: {
+        page,
+        limit,
+        total,
+        totalPages,
+        hasNext: page < totalPages,
+        hasPrev: page > 1
+      }
     });
-
+    
   } catch (error) {
     logger.error('Error in listTemplates:', { error: error.message });
     return handleApiError(res, error, 'Failed to list templates');

package/lib/models/templateModel.js

@@ -9,11 +9,12 @@ const TemplateSchema = new mongoose.Schema({
     default: 'UTILITY', 
     enum: ['UTILITY', 'MARKETING', 'AUTHENTICATION'] 
   },
+  type: String,
   language: { type: String, default: 'es' },
   status: {
     type: String,
-    default: 'DRAFT',
-    enum: ['DRAFT', 'PENDING', 'APPROVED', 'REJECTED', 'UNKNOWN']
+    default: 'UNSUBMITTED',
+    enum: ['UNSUBMITTED', 'RECEIVED', 'PENDING', 'APPROVED', 'REJECTED', 'PAUSED', 'DISABLED']
   },
   body: String,
   footer: String,

package/package.json

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