payservedb 6.1.5 → 6.1.7

package/index.js

@@ -196,7 +196,7 @@ const models = {
   PowerMeterSingleDayReading: require("./src/models/powerMeterSingleDayReading"),
   PowerMeterManufacturer: require("./src/models/powerMetersManufacturer"),
   PowerMeterMonthlyReading: require("./src/models/powerMeterMonthlyReading"),
-  PowerMeterTariffs: require("./src/models/powerMeterTariffs"),
+  PowerMeterSettings: require("./src/models/powerMeterSettings"),
 };
 
 // Function to get models dynamically from a specific database connection

package/package.json

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

package/src/models/powerMeterSettings.js

@@ -0,0 +1,139 @@
+const mongoose = require('mongoose');
+
+const powerMeterSettingsSchema = new mongoose.Schema({
+    facilityId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Facility',
+        required: true,
+        unique: true // Ensure one settings record per facility
+    },
+    
+    // Billing Amounts
+    minAmount: {
+        type: Number,
+        default: 0,
+        min: 0
+    },
+    maxAmount: {
+        type: Number,
+        default: 50000,
+        min: 0
+    },
+    
+    // Suspicious Meter Reading Thresholds
+    lowThreshold: {
+        type: Number,
+        default: 0,
+        min: 0
+    },
+    highThreshold: {
+        type: Number,
+        default: 0,
+        min: 0
+    },
+    
+    // Billing Schedule
+    gracePeriod: {
+        type: Number,
+        default: 10,
+        min: 0
+    },
+    invoiceDay: {
+        type: Number,
+        default: 3,
+        min: 0,
+        max: 30
+    },
+    
+    // Payment Enforcement
+    enforcePayment: {
+        type: String,
+        enum: ['yes', 'no', ''],
+        default: ''
+    },
+    minimumPaymentAmount: {
+        type: Number,
+        default: 0,
+        min: 0
+    },
+    
+    // Tariff Settings
+    tariff: {
+        type: String,
+        enum: ['yes', 'no', ''],
+        default: ''
+    },
+    tariffAmount: {
+        type: Number,
+        default: 0,
+        min: 0
+    },
+    fixedTariffAmount: {
+        type: Number,
+        default: 0,
+        min: 0
+    },
+    meterLoan: {
+        type: Number,
+        default: 0,
+        min: 0
+    },
+    
+    // GL Account Configuration (following your sample pattern)
+    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,
+            }
+        }
+    },
+    
+    // Other Charges
+    otherCharges: {
+        type: String,
+        enum: ['yes', 'no', ''],
+        default: ''
+    },
+    // Notifications
+    notifications: {
+        type: Boolean,
+        default: false
+    },
+    dailyNotifications: {
+        type: Boolean,
+        default: false
+    },
+    weeklyNotifications: {
+        type: Boolean,
+        default: false
+    },
+    allNotifications: {
+        type: Boolean,
+        default: false
+    }
+}, {
+    timestamps: true
+});
+
+const PowerMeterSettings = mongoose.model('PowerMeterSettings', powerMeterSettingsSchema);
+
+module.exports = PowerMeterSettings;

package/src/models/powerMeters.js

@@ -23,17 +23,29 @@ const powerMeterSchema = new mongoose.Schema({
     meterReading: {
         type: Number,
         required: true,
-
+        default: 0,
+    },
+    currentMeterReading: {
+        type: Number,
+        default: 0,
     },
     lastUpdated: {
         type: Date,
         required: true
-
     },
     manufacturer: {
         type: String,
         required: true
     },
+    unitId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Unit',
+        trim: true
+    },
+    unitName: {
+        type: String,
+        trim: true
+    },
     type: {
         type: String,
         required: true,

package/src/models/user.js

@@ -22,11 +22,11 @@ const userSchema = new mongoose.Schema({
         type: String,
         required: false
     },
-    type: {
+    type: [{
         type: String,
         required: [true, 'Type is required'],
         enum: ['Company', 'Project Manager', 'Universal', 'Core', 'Resident', 'Landlord', 'Supplier'],
-    },
+    }],
     department: {
         type: mongoose.Schema.Types.ObjectId,
         ref: 'FacilityDepartment',

package/src/models/powerMeterTariffs.js

@@ -1,50 +0,0 @@
-const mongoose = require('mongoose');
-
-const powerMeterTariffsSchema = new mongoose.Schema({
-    facilityId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'Facility',
-        required: true
-    },
-    meterSerialNumber: {
-        type: String,
-        required: true
-    },
-    deviceId: {
-        type: Number,
-        required: false
-
-    },
-    gatewayId: {
-        type: String,
-        required: true
-
-    },
-    meterReading: {
-        type: Number,
-        required: true,
-
-    },
-    lastUpdated: {
-        type: Date,
-        required: true
-
-    },
-    manufacturer: {
-        type: String,
-        required: true
-    },
-    type: {
-        type: String,
-        required: true,
-        enum: ['2 phase', '3 phase'],
-        default: '2 phase'
-
-    }
-}, {
-    timestamps: true
-});
-
-const PowerMeterTariffs = mongoose.model('PowerMeterTariffs', powerMeterTariffsSchema);
-
-module.exports = PowerMeterTariffs;