payservedb 5.2.2 → 5.2.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payservedb",
-  "version": "5.2.2",
+  "version": "5.2.3",
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"

package/src/models/reminder.js

@@ -39,16 +39,26 @@ const reminderSchema = new mongoose.Schema(
           type: Boolean,
           default: false,
         },
+        daily: {
+          type: Boolean,
+          default: false,
+        },
         days: {
           type: [Number],
           validate: {
             validator: function (value) {
-              if (!this.remindOn.afterOverdue.enabled) return true;
+              // If daily reminders are enabled, no need to validate days
+              if (this.remindOn?.afterOverdue?.daily === true) return true;
+
+              // If overdue reminders are disabled, no validation needed
+              if (!this.remindOn?.afterOverdue?.enabled) return true;
+
+              // If overdue is enabled but daily is false, then validate days array
               return Array.isArray(value) &&
                 value.length > 0 &&
                 value.every(day => [1, 3, 7].includes(day));
             },
-            message: 'When overdue reminders are enabled, days can only be 1, 3, or 7'
+            message: 'When overdue reminders are enabled (and daily is false), days must include only values of 1, 3, or 7'
           }
         }
       }
@@ -117,13 +127,14 @@ const reminderSchema = new mongoose.Schema(
       { facilityId: 1, isActive: 1, 'remindOn.invoiceDate': 1 },
       { facilityId: 1, isActive: 1, 'remindOn.dueDate': 1 },
       { facilityId: 1, isActive: 1, 'remindOn.afterOverdue.enabled': 1 },
+      { facilityId: 1, isActive: 1, 'remindOn.afterOverdue.daily': 1 },
       { moduleId: 1, isActive: 1 },
       { facilityId: 1, lastProcessed: 1 }
     ]
   }
 );
 
-// Add methods to reminder schema
+// Helper method to check if reminder should be processed
 reminderSchema.methods.shouldProcess = function (currentTime, invoice) {
   if (!this.isActive || !invoice) return false;
 
@@ -132,17 +143,27 @@ reminderSchema.methods.shouldProcess = function (currentTime, invoice) {
   const dueDate = moment(invoice.dueDate);
   const today = moment().startOf('day');
 
+  // Check if current time matches reminder time
   if (!this.isTimeToProcess(now)) return false;
 
+  // Check for invoice date reminder
   if (this.remindOn.invoiceDate && invoiceDate.isSame(today, 'day')) {
     return true;
   }
 
+  // Check for due date reminder
   if (this.remindOn.dueDate && dueDate.isSame(today, 'day')) {
     return true;
   }
 
+  // Check for overdue reminder
   if (this.remindOn.afterOverdue.enabled && dueDate.isBefore(today, 'day')) {
+    // If daily reminders are enabled, send reminder every day after due date
+    if (this.remindOn.afterOverdue.daily) {
+      return true;
+    }
+
+    // Otherwise, check if today is one of the specific days after due date
     const daysOverdue = today.diff(dueDate, 'days');
     return this.remindOn.afterOverdue.days.includes(daysOverdue);
   }
@@ -150,11 +171,26 @@ reminderSchema.methods.shouldProcess = function (currentTime, invoice) {
   return false;
 };
 
+// Helper to check if current time is close to scheduled reminder time
 reminderSchema.methods.isTimeToProcess = function (currentTime) {
-  const reminderMoment = moment(this.time, 'HH:mm');
+  const reminderTime = moment(this.time, 'HH:mm');
   const currentMoment = moment(currentTime).format('HH:mm');
-  const diffMinutes = moment(currentMoment, 'HH:mm').diff(reminderMoment, 'minutes');
-  return Math.abs(diffMinutes) <= 5;
+  const diffMinutes = Math.abs(
+    moment(currentMoment, 'HH:mm').diff(reminderTime, 'minutes')
+  );
+
+  // Allow processing within 5 minutes of scheduled time
+  return diffMinutes <= 5;
+};
+
+// Method to check if reminder has been processed today
+reminderSchema.methods.hasBeenProcessedToday = function () {
+  if (!this.lastProcessed) return false;
+
+  const today = moment().startOf('day');
+  const processedDate = moment(this.lastProcessed).startOf('day');
+
+  return processedDate.isSame(today, 'day');
 };
 
 const Reminder = mongoose.model("Reminder", reminderSchema);