payservedb 3.5.0 → 3.5.2

package/package.json

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

package/src/models/analog_water_meter.js

@@ -22,6 +22,10 @@ const analogMeterSchema = new mongoose.Schema({
     status: {
         type: String
     },
+    userType: {
+        type: String,
+        enum: ['postpaid', 'prepaid'],
+    },
     lastReadingDate: {
         type: Date,
         default: Date.now

package/src/models/leaseagreement.js

@@ -57,13 +57,9 @@ const leaseAgreementSchema = new mongoose.Schema({
             isPrimary: { type: Boolean, default: false }
         }],
         securityDeposit: { type: Number, required: true },
-        penalty: {
-            type: {
-                amount: { type: Number },
-                percentage: { type: Number },
-                appliesAfter: { type: Number, default: 7 } // Days after due date
-            },
-            default: null
+        penaltyId: { // Reference to Penalty collection
+            type: mongoose.Schema.Types.ObjectId,
+            ref: 'Penalty'
         }
     },
     billingCycle: {
@@ -96,8 +92,10 @@ const leaseAgreementSchema = new mongoose.Schema({
     ],
     reminders: [
         {
-            type: { type: String, enum: ['SMS', 'Email', 'WhatsApp'], required: true },
-            scheduledDate: { type: Date, required: true },
+            reminderId: { // Reference to Reminder collection
+                type: mongoose.Schema.Types.ObjectId,
+                ref: 'Reminder'
+            },
             status: { type: String, enum: ['Pending', 'Sent'], default: 'Pending' }
         }
     ],

package/src/models/reminder.js

@@ -12,13 +12,13 @@ const reminderSchema = new mongoose.Schema(
     type: {
       type: String,
       required: true,
-      enum: ['standard', 'custom'], 
+      enum: ['standard', 'custom'],
       default: 'standard'
     },
     module: {
       type: String,
       required: true,
-      enum: ['levy', 'lease'], 
+      enum: ['levy', 'lease'],
       default: 'levy'
     },
     remindOn: {
@@ -171,4 +171,4 @@ reminderSchema.methods.isTimeToProcess = function (currentTime) {
 
 const Reminder = mongoose.model("Reminder", reminderSchema);
 
-module.exports = Reminder;
+module.exports = Reminder;

package/src/models/smart_water_meter.js

@@ -22,6 +22,10 @@ const meterSchema = new mongoose.Schema({
         trim: true,
         unique: true
     },
+    userType: {
+        type: String,
+        enum: ['postpaid', 'prepaid'],
+    },
     isInstalled: {
         type: Boolean,
         default: false