payservedb 5.6.7 → 5.6.8

package/src/models/levy.js

@@ -1,153 +1,153 @@
-const mongoose = require("mongoose");
-
-// Define the schema for Levy
-const levySchema = new mongoose.Schema(
-  {
-    levyName: {
-      type: String,
-      required: true,
-      trim: true,
-      minlength: [1, "Levy name must be at least 1 character long"],
-    },
-    levyType: {
-      type: mongoose.Schema.Types.ObjectId,
-      ref: "LevyType",
-      required: true,
-    },
-    amount: {
-      type: Number,
-      required: true,
-      min: [0, "Amount must be a positive number"],
-    },
-    dueDate: {
-      type: String,
-      required: true,
-    },
-    levyApplicant: {
-      type: String,
-      required: true,
-      trim: true,
-    },
-    collectionFrequency: {
-      type: String,
-      required: true,
-      trim: true,
-    },
-    invoiceDay: {
-      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,
-    },
-    mobilePayment: {
-      type: Boolean,
-      default: false,
-      required: false,
-    },
-    paymentMethodId: {
-      type: mongoose.Schema.Types.ObjectId,
-      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,
-      }
-    },
-    // GL Account Configuration (moved from levy contract)
-    glAccounts: {
-      invoice: {
-        debit: {
-          type: mongoose.Schema.Types.ObjectId,
-          ref: "GLAccount",
-          required: false,
-        },
-        credit: {
-          type: mongoose.Schema.Types.ObjectId,
-          ref: "GLAccount",
-          required: false,
-        }
-      },
-      payment: {
-        debit: {
-          type: mongoose.Schema.Types.ObjectId,
-          ref: "GLAccount",
-          required: false,
-        },
-        credit: {
-          type: mongoose.Schema.Types.ObjectId,
-          ref: "GLAccount",
-          required: false,
-        }
-      }
-    },
-    disabled: {
-      type: Boolean,
-      required: false,
-    },
-    facilityId: {
-      type: mongoose.Schema.Types.ObjectId,
-      ref: "Facility",
-      required: true,
-    },
-    // Added reminder reference
-    reminderId: {
-      type: mongoose.Schema.Types.ObjectId,
-      ref: 'Reminder',
-      required: false
-    },
-    // Added penalty reference
-    penaltyId: {
-      type: mongoose.Schema.Types.ObjectId,
-      ref: 'Penalty',
-      required: false
-    }
-  },
-  {
-    timestamps: true,
-  }
-);
-
-// Compile the model from the schema
-const Levy = mongoose.model("Levy", levySchema);
-
+const mongoose = require("mongoose");
+
+// Define the schema for Levy
+const levySchema = new mongoose.Schema(
+  {
+    levyName: {
+      type: String,
+      required: true,
+      trim: true,
+      minlength: [1, "Levy name must be at least 1 character long"],
+    },
+    levyType: {
+      type: mongoose.Schema.Types.ObjectId,
+      ref: "LevyType",
+      required: true,
+    },
+    amount: {
+      type: Number,
+      required: true,
+      min: [0, "Amount must be a positive number"],
+    },
+    dueDate: {
+      type: String,
+      required: true,
+    },
+    levyApplicant: {
+      type: String,
+      required: true,
+      trim: true,
+    },
+    collectionFrequency: {
+      type: String,
+      required: true,
+      trim: true,
+    },
+    invoiceDay: {
+      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,
+    },
+    mobilePayment: {
+      type: Boolean,
+      default: false,
+      required: false,
+    },
+    paymentMethodId: {
+      type: mongoose.Schema.Types.ObjectId,
+      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,
+      }
+    },
+    // GL Account Configuration (moved from levy contract)
+    glAccounts: {
+      invoice: {
+        debit: {
+          type: mongoose.Schema.Types.ObjectId,
+          ref: "GLAccount",
+          required: false,
+        },
+        credit: {
+          type: mongoose.Schema.Types.ObjectId,
+          ref: "GLAccount",
+          required: false,
+        }
+      },
+      payment: {
+        debit: {
+          type: mongoose.Schema.Types.ObjectId,
+          ref: "GLAccount",
+          required: false,
+        },
+        credit: {
+          type: mongoose.Schema.Types.ObjectId,
+          ref: "GLAccount",
+          required: false,
+        }
+      }
+    },
+    disabled: {
+      type: Boolean,
+      required: false,
+    },
+    facilityId: {
+      type: mongoose.Schema.Types.ObjectId,
+      ref: "Facility",
+      required: true,
+    },
+    // Added reminder reference
+    reminderId: {
+      type: mongoose.Schema.Types.ObjectId,
+      ref: 'Reminder',
+      required: false
+    },
+    // Added penalty reference
+    penaltyId: {
+      type: mongoose.Schema.Types.ObjectId,
+      ref: 'Penalty',
+      required: false
+    }
+  },
+  {
+    timestamps: true,
+  }
+);
+
+// Compile the model from the schema
+const Levy = mongoose.model("Levy", levySchema);
+
 module.exports = Levy;

package/src/models/levy_invoice_settings.js

@@ -1,27 +1,27 @@
-const mongoose = require('mongoose');
-
-const InvoiceSettingsSchema = new mongoose.Schema({
-    facilityId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'Facility',
-        required: [true, 'Facility ID is required']
-    },
-    termsAndConditions: {
-        type: String,
-        default: 'Payment is due within 15 days'
-    },
-    bankName: {
-        type: String,
-        required: [true, 'Bank name is required']
-    },
-    accountNumber: {
-        type: String,
-        required: [true, 'Account number is required']
-    }
-}, {
-    timestamps: true
-});
-
-const InvoiceSettings = mongoose.model('InvoiceSettings', InvoiceSettingsSchema);
-
+const mongoose = require('mongoose');
+
+const InvoiceSettingsSchema = new mongoose.Schema({
+    facilityId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Facility',
+        required: [true, 'Facility ID is required']
+    },
+    termsAndConditions: {
+        type: String,
+        default: 'Payment is due within 15 days'
+    },
+    bankName: {
+        type: String,
+        required: [true, 'Bank name is required']
+    },
+    accountNumber: {
+        type: String,
+        required: [true, 'Account number is required']
+    }
+}, {
+    timestamps: true
+});
+
+const InvoiceSettings = mongoose.model('InvoiceSettings', InvoiceSettingsSchema);
+
 module.exports = InvoiceSettings;

package/src/models/levycontract.js

@@ -1,118 +1,118 @@
-const mongoose = require('mongoose');
-const Schema = mongoose.Schema;
-
-const LevyContractSchema = new Schema(
-    {
-        contractName: {
-            type: String,
-            required: [true, 'Contract name is required']
-        },
-        levyId: {
-            type: mongoose.Schema.Types.ObjectId,
-            ref: 'Levy',
-            required: [true, 'Levy ID is required']
-        },
-        customerId: {
-            type: mongoose.Schema.Types.ObjectId,
-            ref: 'Customer',
-            required: [true, 'Customer ID is required']
-        },
-        unitId: {
-            type: mongoose.Schema.Types.ObjectId,
-            ref: 'Unit',
-            required: [true, 'Unit ID is required']
-        },
-        amount: {
-            type: Number,
-            required: [true, 'Amount is required'],
-            min: [0, 'Amount cannot be negative']
-        },
-        startDate: {
-            type: Date,
-            required: [true, 'Start date is required']
-        },
-        endDate: {
-            type: Date,
-            required: [true, 'End date is required']
-        },
-        status: {
-            type: String,
-            enum: ['Active', 'Inactive', 'Completed', 'Suspended', 'Terminated'],
-            default: 'Active',
-            required: [true, 'Status is required']
-        },
-        balanceBroughtForward: {
-            type: Number,
-            default: 0
-        },
-        paymentFrequency: {
-            type: String,
-            enum: ['Daily', 'Weekly', 'Bi-Weekly', 'Monthly', 'Quarterly', 'Semi-Annually', 'Annually'],
-            default: 'Monthly'
-        },
-        facilityId: {
-            type: mongoose.Schema.Types.ObjectId,
-            ref: 'Facility',
-            required: [true, 'Facility ID is required']
-        },
-        lastInvoiceDate: {
-            type: Date
-        },
-        createdBy: {
-            type: mongoose.Schema.Types.ObjectId,
-            ref: 'User'
-        },
-        updatedBy: {
-            type: mongoose.Schema.Types.ObjectId,
-            ref: 'User'
-        }
-    },
-    {
-        timestamps: true,
-        toJSON: { virtuals: true },
-        toObject: { virtuals: true }
-    }
-);
-
-// Virtual populate for Levy details
-LevyContractSchema.virtual('levy', {
-    ref: 'Levy',
-    localField: 'levyId',
-    foreignField: '_id',
-    justOne: true
-});
-
-// Virtual populate for Customer details
-LevyContractSchema.virtual('customer', {
-    ref: 'Customer',
-    localField: 'customerId',
-    foreignField: '_id',
-    justOne: true
-});
-
-// Virtual populate for Unit details
-LevyContractSchema.virtual('unit', {
-    ref: 'Unit',
-    localField: 'unitId',
-    foreignField: '_id',
-    justOne: true
-});
-
-// Pre-save middleware to ensure endDate is after startDate
-LevyContractSchema.pre('save', function (next) {
-    if (this.startDate && this.endDate && this.startDate >= this.endDate) {
-        next(new Error('End date must be after start date'));
-    } else {
-        next();
-    }
-});
-
-// Index for efficient queries
-LevyContractSchema.index({ levyId: 1, unitId: 1, status: 1 });
-LevyContractSchema.index({ facilityId: 1 });
-LevyContractSchema.index({ customerId: 1 });
-
-module.exports = {
-    schema: LevyContractSchema,
-    name: 'LevyContract'
+const mongoose = require('mongoose');
+const Schema = mongoose.Schema;
+
+const LevyContractSchema = new Schema(
+    {
+        contractName: {
+            type: String,
+            required: [true, 'Contract name is required']
+        },
+        levyId: {
+            type: mongoose.Schema.Types.ObjectId,
+            ref: 'Levy',
+            required: [true, 'Levy ID is required']
+        },
+        customerId: {
+            type: mongoose.Schema.Types.ObjectId,
+            ref: 'Customer',
+            required: [true, 'Customer ID is required']
+        },
+        unitId: {
+            type: mongoose.Schema.Types.ObjectId,
+            ref: 'Unit',
+            required: [true, 'Unit ID is required']
+        },
+        amount: {
+            type: Number,
+            required: [true, 'Amount is required'],
+            min: [0, 'Amount cannot be negative']
+        },
+        startDate: {
+            type: Date,
+            required: [true, 'Start date is required']
+        },
+        endDate: {
+            type: Date,
+            required: [true, 'End date is required']
+        },
+        status: {
+            type: String,
+            enum: ['Active', 'Inactive', 'Completed', 'Suspended', 'Terminated'],
+            default: 'Active',
+            required: [true, 'Status is required']
+        },
+        balanceBroughtForward: {
+            type: Number,
+            default: 0
+        },
+        paymentFrequency: {
+            type: String,
+            enum: ['Daily', 'Weekly', 'Bi-Weekly', 'Monthly', 'Quarterly', 'Semi-Annually', 'Annually'],
+            default: 'Monthly'
+        },
+        facilityId: {
+            type: mongoose.Schema.Types.ObjectId,
+            ref: 'Facility',
+            required: [true, 'Facility ID is required']
+        },
+        lastInvoiceDate: {
+            type: Date
+        },
+        createdBy: {
+            type: mongoose.Schema.Types.ObjectId,
+            ref: 'User'
+        },
+        updatedBy: {
+            type: mongoose.Schema.Types.ObjectId,
+            ref: 'User'
+        }
+    },
+    {
+        timestamps: true,
+        toJSON: { virtuals: true },
+        toObject: { virtuals: true }
+    }
+);
+
+// Virtual populate for Levy details
+LevyContractSchema.virtual('levy', {
+    ref: 'Levy',
+    localField: 'levyId',
+    foreignField: '_id',
+    justOne: true
+});
+
+// Virtual populate for Customer details
+LevyContractSchema.virtual('customer', {
+    ref: 'Customer',
+    localField: 'customerId',
+    foreignField: '_id',
+    justOne: true
+});
+
+// Virtual populate for Unit details
+LevyContractSchema.virtual('unit', {
+    ref: 'Unit',
+    localField: 'unitId',
+    foreignField: '_id',
+    justOne: true
+});
+
+// Pre-save middleware to ensure endDate is after startDate
+LevyContractSchema.pre('save', function (next) {
+    if (this.startDate && this.endDate && this.startDate >= this.endDate) {
+        next(new Error('End date must be after start date'));
+    } else {
+        next();
+    }
+});
+
+// Index for efficient queries
+LevyContractSchema.index({ levyId: 1, unitId: 1, status: 1 });
+LevyContractSchema.index({ facilityId: 1 });
+LevyContractSchema.index({ customerId: 1 });
+
+module.exports = {
+    schema: LevyContractSchema,
+    name: 'LevyContract'
 };

package/src/models/levytype.js

@@ -1,23 +1,23 @@
-const mongoose = require('mongoose');
-
-// Define the schema for LevyType
-const levyTypeSchema = new mongoose.Schema({
-    name: {
-        type: String,
-        required: true,
-        trim: true,
-        minlength: [1, 'Levy type name must be at least 1 character long']
-    },
-    facilityId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'Facility',
-        required: [true, 'Facility ID is required']
-    }
-}, {
-    timestamps: true // Automatically add createdAt and updatedAt fields
-});
-
-// Compile the model from the schema
-const LevyType = mongoose.model('LevyType', levyTypeSchema);
-
-module.exports = LevyType;
+const mongoose = require('mongoose');
+
+// Define the schema for LevyType
+const levyTypeSchema = new mongoose.Schema({
+    name: {
+        type: String,
+        required: true,
+        trim: true,
+        minlength: [1, 'Levy type name must be at least 1 character long']
+    },
+    facilityId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Facility',
+        required: [true, 'Facility ID is required']
+    }
+}, {
+    timestamps: true // Automatically add createdAt and updatedAt fields
+});
+
+// Compile the model from the schema
+const LevyType = mongoose.model('LevyType', levyTypeSchema);
+
+module.exports = LevyType;