payservedb 5.1.0 → 5.1.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payservedb",
-  "version": "5.1.0",
+  "version": "5.1.2",
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
@@ -12,7 +12,6 @@
   "dependencies": {
     "dotenv": "^16.4.5",
     "moment-timezone": "^0.5.47",
-    "mongoose": "^8.3.5",
-    "payservedb": "^5.0.9"
+    "mongoose": "^8.3.5"
   }
 }

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/levycontract.js

@@ -1,83 +1,86 @@
 const mongoose = require('mongoose');
+const Schema = mongoose.Schema;
 
-// Define the schema for LevyContract
-const levyContractSchema = new mongoose.Schema({
-    contractName: {
-        type: String,
-        required: true,
-        trim: true
-    },
-    levyId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'Levy',
-        required: true
-    },
-    customerId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'Customer',
-        required: true
-    },
-    unitId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'Unit',
-        required: true
-    },
-    doubleEntryAccount: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'GLAccountDoubleEntries',
-        required: true
-    },
-    amount: {
-        type: Number,
-        required: true,
-        min: [0, 'Amount must be a positive number']
-    },
-    startDate: {
-        type: Date,
-        required: true
-    },
-    endDate: {
-        type: Date,
-        required: true
-    },
-    status: {
-        type: String,
-        required: true,
-        enum: ['Active', 'Inactive']
-    },
-    // We keep paymentFrequency in the schema for backward compatibility
-    // But it will now be populated from the levy's collectionFrequency
-    paymentFrequency: {
-        type: String,
-        required: true,
-        trim: true
-    },
-    // New field for balance brought forward
-    balanceBroughtForward: {
-        type: Number,
-        default: 0,
-    },
-    facilityId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'Facility',
-        required: true
-    },
-    // New field to track edit history
-    editHistory: [
-        {
-            editedBy: {
-                type: mongoose.Schema.Types.ObjectId,
-                ref: 'User'
-            },
-            editedAt: { type: Date, default: Date.now },
-            reason: { type: String, required: true },
-            changes: { type: Object } // Store what fields were changed
+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']
+        },
+        // Replace single doubleEntryAccount with two separate accounts
+        invoiceDoubleEntryAccount: {
+            type: mongoose.Schema.Types.ObjectId,
+            ref: 'GLAccountDoubleEntries',
+            required: [true, 'Invoice double entry account is required']
+        },
+        paymentDoubleEntryAccount: {
+            type: mongoose.Schema.Types.ObjectId,
+            ref: 'GLAccountDoubleEntries',
+            required: [true, 'Payment double entry account 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']
+        },
+        createdBy: {
+            type: mongoose.Schema.Types.ObjectId,
+            ref: 'User'
+        },
+        updatedBy: {
+            type: mongoose.Schema.Types.ObjectId,
+            ref: 'User'
         }
-    ]
-}, {
-    timestamps: true
-});
-
-const LevyContract = mongoose.model('LevyContract', levyContractSchema);
+    },
+    {
+        timestamps: true,
+    }
+);
 
-module.exports = LevyContract;
+module.exports = {
+    schema: LevyContractSchema,
+    name: 'LevyContract'
+};