payservedb 5.7.0 → 5.7.2

package/package.json

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

package/src/models/assetsAssignment.js

@@ -0,0 +1,74 @@
+const mongoose = require('mongoose');
+
+const assetAssignmentSchema = new mongoose.Schema({
+    assetId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Asset',
+        required: true,
+    },
+    serviceVendorId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'ServiceVendor',
+        required: true,
+    },
+    facilityId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Facility',
+        required: true,
+    },
+    assignedDate: {
+        type: Date,
+        default: Date.now,
+        required: true,
+    },
+    unassignedDate: {
+        type: Date,
+    },
+    status: {
+        type: String,
+        enum: ['Active', 'Inactive', 'Completed'],
+        default: 'Active',
+    },
+    notes: {
+        type: String,
+    },
+    priority: {
+        type: String,
+        enum: ['Low', 'Medium', 'High', 'Critical'],
+        default: 'Medium',
+    },
+    serviceType: {
+        type: String,
+        enum: ['Maintenance', 'Repair', 'Installation', 'Inspection', 'Other'],
+    },
+    estimatedCompletionDate: {
+        type: Date,
+    },
+    actualCompletionDate: {
+        type: Date,
+    },
+    cost: {
+        type: Number,
+        min: 0,
+    },
+}, {
+    timestamps: true,
+});
+
+// Compound index to ensure unique active assignments per asset-vendor pair
+assetAssignmentSchema.index(
+    { assetId: 1, serviceVendorId: 1, status: 1 },
+    { 
+        unique: true,
+        partialFilterExpression: { status: 'Active' }
+    }
+);
+
+// Index for efficient querying by facility
+assetAssignmentSchema.index({ facilityId: 1 });
+
+// Index for date-based queries
+assetAssignmentSchema.index({ assignedDate: 1 });
+assetAssignmentSchema.index({ estimatedCompletionDate: 1 });
+
+module.exports = mongoose.model('AssetAssignment', assetAssignmentSchema);

package/src/models/levy.js

@@ -37,18 +37,16 @@ const levySchema = new mongoose.Schema(
       type: String,
       required: true,
     },
-    // New billing type field
     billingType: {
       type: String,
       enum: ['Prepaid', 'Postpaid'],
       required: true,
       default: 'Postpaid'
     },
-    // Fields from levy contract
     currency: {
       type: mongoose.Schema.Types.ObjectId,
       ref: "Currency",
-      required: false,
+      required: true,
     },
     mobilePayment: {
       type: Boolean,
@@ -57,71 +55,56 @@ const levySchema = new mongoose.Schema(
     },
     paymentMethodId: {
       type: mongoose.Schema.Types.ObjectId,
+      ref: "FacilityPaymentDetails",
       required: false,
     },
-    // New bank payment field
     bankPayment: {
       type: Boolean,
       default: false,
       required: false,
     },
-    // Bank details for bank payment
-    bankDetails: {
-      bankName: {
-        type: String,
-        required: false,
-        trim: true,
-      },
-      accountName: {
-        type: String,
-        required: false,
-        trim: true,
-      },
-      accountNumber: {
-        type: String,
-        required: false,
-        trim: true,
-      },
-      branch: {
-        type: String,
-        required: false,
-        trim: true,
-      },
-      swiftCode: {
-        type: String,
-        required: false,
-        trim: true,
-      }
+    // Reference to BankDetails document
+    bankAccountId: {
+      type: mongoose.Schema.Types.ObjectId,
+      ref: "BankDetails",
+      required: false,
     },
-    // GL Account Configuration (moved from levy contract)
+    // Reference to BillerAddress document
+    billerAddressId: {
+      type: mongoose.Schema.Types.ObjectId,
+      ref: "BillerAddress",
+      required: true,
+    },
+    // GL Account Configuration
     glAccounts: {
       invoice: {
         debit: {
           type: mongoose.Schema.Types.ObjectId,
           ref: "GLAccount",
-          required: false,
+          required: true,
         },
         credit: {
           type: mongoose.Schema.Types.ObjectId,
           ref: "GLAccount",
-          required: false,
+          required: true,
         }
       },
       payment: {
         debit: {
           type: mongoose.Schema.Types.ObjectId,
           ref: "GLAccount",
-          required: false,
+          required: true,
         },
         credit: {
           type: mongoose.Schema.Types.ObjectId,
           ref: "GLAccount",
-          required: false,
+          required: true,
         }
       }
     },
     disabled: {
       type: Boolean,
+      default: false,
       required: false,
     },
     facilityId: {
@@ -129,13 +112,13 @@ const levySchema = new mongoose.Schema(
       ref: "Facility",
       required: true,
     },
-    // Added reminder reference
+    // Reminder reference
     reminderId: {
       type: mongoose.Schema.Types.ObjectId,
       ref: 'Reminder',
       required: false
     },
-    // Added penalty reference
+    // Penalty reference
     penaltyId: {
       type: mongoose.Schema.Types.ObjectId,
       ref: 'Penalty',
@@ -147,6 +130,77 @@ const levySchema = new mongoose.Schema(
   }
 );
 
+// Add virtuals for populated references
+levySchema.virtual('bankAccount', {
+  ref: 'BankDetails',
+  localField: 'bankAccountId',
+  foreignField: '_id',
+  justOne: true
+});
+
+levySchema.virtual('billerAddress', {
+  ref: 'BillerAddress',
+  localField: 'billerAddressId',
+  foreignField: '_id',
+  justOne: true
+});
+
+levySchema.virtual('reminder', {
+  ref: 'Reminder',
+  localField: 'reminderId',
+  foreignField: '_id',
+  justOne: true
+});
+
+levySchema.virtual('penalty', {
+  ref: 'Penalty',
+  localField: 'penaltyId',
+  foreignField: '_id',
+  justOne: true
+});
+
+// Pre-save validation middleware
+levySchema.pre('save', function (next) {
+  // Validate bank payment requirements
+  if (this.bankPayment && !this.bankAccountId) {
+    const error = new Error('Bank account is required when bank payment is enabled');
+    return next(error);
+  }
+
+  // Validate mobile payment requirements
+  if (this.mobilePayment && !this.paymentMethodId) {
+    const error = new Error('Payment method is required when mobile payment is enabled');
+    return next(error);
+  }
+
+  // Validate GL accounts
+  if (!this.glAccounts?.invoice?.debit || !this.glAccounts?.invoice?.credit ||
+    !this.glAccounts?.payment?.debit || !this.glAccounts?.payment?.credit) {
+    const error = new Error('All GL accounts (invoice and payment, debit and credit) are required');
+    return next(error);
+  }
+
+  next();
+});
+
+// Add indexes for better performance
+levySchema.index({ facilityId: 1 });
+levySchema.index({ levyType: 1 });
+levySchema.index({ disabled: 1 });
+levySchema.index({ bankAccountId: 1 });
+levySchema.index({ billerAddressId: 1 });
+levySchema.index({ reminderId: 1 });
+levySchema.index({ penaltyId: 1 });
+levySchema.index({ createdAt: -1 });
+
+// Compound indexes
+levySchema.index({ facilityId: 1, disabled: 1 });
+levySchema.index({ facilityId: 1, levyType: 1 });
+
+// Ensure virtual fields are serialized
+levySchema.set('toJSON', { virtuals: true });
+levySchema.set('toObject', { virtuals: true });
+
 // Compile the model from the schema
 const Levy = mongoose.model("Levy", levySchema);
 

package/src/models/tickets.js

@@ -37,7 +37,7 @@ const ticketSchema = new mongoose.Schema({
   },
   status: {
     type: String,
-    enum: ['open', 'on hold', 'ongoing', 'resolved', 'cancelled', 'closed'],
+    enum: ['open', 'under review', 'ongoing', 'resolved', 'cancelled', 'closed'],
     required: true,
     default: 'open',
   },