payservedb 5.1.1 → 5.1.3

package/package.json

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

package/src/models/common_area_generator.js

@@ -11,22 +11,25 @@ const commonAreaGeneratorReadingSchema = new mongoose.Schema({
     type: Date,
     required: true
   },
-  openingReadingLtrs: {
-    type: Number,
+  openingReading: {
+    type: Number, // Stored in total minutes (e.g., 3hrs 40mins = 220 minutes)
     required: true
   },
-  closingReadingLtrs: {
-    type: Number,
+  closingReading: {
+    type: Number, // Stored in total minutes (e.g., 8hrs 15mins = 495 minutes)
     required: true
   },
   totalHrsRun: {
-    type: Number,
+    type: Number, // Can be calculated or entered directly
     required: true
   },
-  totalFuelLevel: {
+  totalFuelLevelFraction: {
     type: String,
     trim: true
   },
+  totalFuelLevelLiters: {
+    type: Number
+  },
   refillAmountLiters: {
     type: Number
   }
@@ -34,5 +37,6 @@ const commonAreaGeneratorReadingSchema = new mongoose.Schema({
   timestamps: true
 });
 
+
 const CommonAreaGeneratorReading = mongoose.model('CommonAreaGeneratorReading', commonAreaGeneratorReadingSchema);
-module.exports = CommonAreaGeneratorReading;
+module.exports = CommonAreaGeneratorReading;

package/src/models/invoice.js

@@ -189,6 +189,28 @@ const invoiceSchema = new mongoose.Schema(
         facilityId: { type: mongoose.Schema.Types.ObjectId, ref: "Facility" },
         userId: { type: mongoose.Schema.Types.ObjectId, ref: "User" }
       }]
+    },
+    // New fields for double entry accounts
+    invoiceDoubleEntryAccount: {
+      type: mongoose.Schema.Types.ObjectId,
+      ref: "GLAccountDoubleEntries",
+      required: false,
+    },
+    paymentDoubleEntryAccount: {
+      type: mongoose.Schema.Types.ObjectId,
+      ref: "GLAccountDoubleEntries",
+      required: false,
+    },
+    // GL account details for invoice entries
+    accountdebitedData: {
+      amount: { type: Number },
+      description: { type: String },
+      isActive: { type: Boolean, default: true }
+    },
+    accountcreditedData: {
+      amount: { type: Number },
+      description: { type: String },
+      isActive: { type: Boolean, default: true }
     }
   },
   {
@@ -208,6 +230,9 @@ invoiceSchema.index({ 'currency.code': 1, 'client.clientId': 1, status: 1 }); //
 invoiceSchema.index({ 'client.clientId': 1, balanceBroughtForward: 1 }); // Add index for finding invoices with credit balances
 invoiceSchema.index({ 'viewStatus.isOpened': 1 }); // Add index for view status
 invoiceSchema.index({ 'viewStatus.openedBy.facilityId': 1 }); // Add index for facility view tracking
+// Add index for double entry accounts
+invoiceSchema.index({ invoiceDoubleEntryAccount: 1 });
+invoiceSchema.index({ paymentDoubleEntryAccount: 1 });
 
 // Add virtual field for calculating balance
 invoiceSchema.virtual('calculatedBalance').get(function () {
@@ -232,6 +257,22 @@ invoiceSchema.virtual('effectiveOverpay').get(function () {
   return this.balanceBroughtForward < 0 ? Math.abs(this.balanceBroughtForward) : 0;
 });
 
+// Add virtual populate for invoice double entry account
+invoiceSchema.virtual('invoiceDoubleEntry', {
+  ref: 'GLAccountDoubleEntries',
+  localField: 'invoiceDoubleEntryAccount',
+  foreignField: '_id',
+  justOne: true
+});
+
+// Add virtual populate for payment double entry account
+invoiceSchema.virtual('paymentDoubleEntry', {
+  ref: 'GLAccountDoubleEntries',
+  localField: 'paymentDoubleEntryAccount',
+  foreignField: '_id',
+  justOne: true
+});
+
 // Add method for currency conversion if needed
 invoiceSchema.methods.convertAmount = function (amount, fromCurrency, toCurrency, exchangeRate) {
   if (fromCurrency === toCurrency) {

package/src/models/levycontract.js

@@ -66,6 +66,9 @@ const LevyContractSchema = new Schema(
             ref: 'Facility',
             required: [true, 'Facility ID is required']
         },
+        lastInvoiceDate: {
+            type: Date
+        },
         createdBy: {
             type: mongoose.Schema.Types.ObjectId,
             ref: 'User'
@@ -77,9 +80,79 @@ const LevyContractSchema = new Schema(
     },
     {
         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
+});
+
+// Virtual populate for invoice double entry account
+LevyContractSchema.virtual('invoiceDoubleEntry', {
+    ref: 'GLAccountDoubleEntries',
+    localField: 'invoiceDoubleEntryAccount',
+    foreignField: '_id',
+    justOne: true
+});
+
+// Virtual populate for payment double entry account
+LevyContractSchema.virtual('paymentDoubleEntry', {
+    ref: 'GLAccountDoubleEntries',
+    localField: 'paymentDoubleEntryAccount',
+    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();
+    }
+});
+
+// Pre-save middleware to maintain backward compatibility during migration
+LevyContractSchema.pre('save', function (next) {
+    // If we have the old doubleEntryAccount but not the new ones, 
+    // use the old one for both new fields during the transition
+    if (this.doubleEntryAccount &&
+        (!this.invoiceDoubleEntryAccount || !this.paymentDoubleEntryAccount)) {
+        this.invoiceDoubleEntryAccount = this.doubleEntryAccount;
+        this.paymentDoubleEntryAccount = this.doubleEntryAccount;
+    }
+    next();
+});
+
+// Index for efficient queries
+LevyContractSchema.index({ levyId: 1, unitId: 1, status: 1 });
+LevyContractSchema.index({ facilityId: 1 });
+LevyContractSchema.index({ customerId: 1 });
+LevyContractSchema.index({ invoiceDoubleEntryAccount: 1 });
+LevyContractSchema.index({ paymentDoubleEntryAccount: 1 });
+
 module.exports = {
     schema: LevyContractSchema,
     name: 'LevyContract'