payservedb 6.1.9 → 6.2.2

package/src/models/paymentTermsMarks.js

@@ -1,19 +1,19 @@
-const mongoose = require('mongoose');
-
-const paymentTermMarkSchema = new mongoose.Schema({
-    paymentTerm: {
-        type: String,
-        required: true,
-        trim: true
-    },
-    marks: {
-        type: Number,
-        required: true
-    }
-}, {
-    timestamps: true
-});
-
-const PaymentTermMark = mongoose.model('PaymentTermMark', paymentTermMarkSchema);
-
-module.exports = PaymentTermMark;
+const mongoose = require('mongoose');
+
+const paymentTermMarkSchema = new mongoose.Schema({
+    paymentTerm: {
+        type: String,
+        required: true,
+        trim: true
+    },
+    marks: {
+        type: Number,
+        required: true
+    }
+}, {
+    timestamps: true
+});
+
+const PaymentTermMark = mongoose.model('PaymentTermMark', paymentTermMarkSchema);
+
+module.exports = PaymentTermMark;

package/src/models/penalty.js

@@ -1,77 +1,77 @@
-const mongoose = require("mongoose");
-
-const penaltySchema = new mongoose.Schema(
-  {
-    name: {
-      type: String,
-      required: true,
-    },
-    type: {
-      type: String,
-      required: true,
-      enum: ['percentage', 'fixed']
-    },
-    effectDays: {
-      type: Number,
-      required: true,
-      min: [1, "Effect days must be at least 1"]
-    },
-    percentage: {
-      type: Number,
-      required: function () {
-        return this.type === 'percentage';
-      },
-      min: [0, "Percentage must be at least 0"]
-    },
-    amount: {
-      type: Number,
-      required: function () {
-        return this.type === 'fixed';
-      },
-      min: [0, "Amount must be a positive number"]
-    },
-    module: {
-      type: String,
-      required: true,
-      enum: ['levy', 'lease', 'utility']
-    },
-    moduleId: {
-      type: mongoose.Schema.Types.ObjectId,
-      required: true,
-      refPath: 'module'
-    },
-    isActive: {
-      type: Boolean,
-      default: true,
-    },
-    facilityId: {
-      type: mongoose.Schema.Types.ObjectId,
-      ref: "Facility",
-      required: true,
-      index: true
-    }
-  },
-  {
-    timestamps: true,
-    indexes: [
-      { facilityId: 1, isActive: 1 },
-      { moduleId: 1, module: 1 },
-      { name: 1, facilityId: 1 }
-    ]
-  }
-);
-
-// Add any custom methods or middleware here if needed
-penaltySchema.pre('save', function (next) {
-  // Clear the irrelevant field based on penalty type
-  if (this.type === 'percentage') {
-    this.amount = null;
-  } else if (this.type === 'fixed') {
-    this.percentage = null;
-  }
-  next();
-});
-
-const Penalty = mongoose.model("Penalty", penaltySchema);
-
+const mongoose = require("mongoose");
+
+const penaltySchema = new mongoose.Schema(
+  {
+    name: {
+      type: String,
+      required: true,
+    },
+    type: {
+      type: String,
+      required: true,
+      enum: ['percentage', 'fixed']
+    },
+    effectDays: {
+      type: Number,
+      required: true,
+      min: [1, "Effect days must be at least 1"]
+    },
+    percentage: {
+      type: Number,
+      required: function () {
+        return this.type === 'percentage';
+      },
+      min: [0, "Percentage must be at least 0"]
+    },
+    amount: {
+      type: Number,
+      required: function () {
+        return this.type === 'fixed';
+      },
+      min: [0, "Amount must be a positive number"]
+    },
+    module: {
+      type: String,
+      required: true,
+      enum: ['levy', 'lease', 'utility']
+    },
+    moduleId: {
+      type: mongoose.Schema.Types.ObjectId,
+      required: true,
+      refPath: 'module'
+    },
+    isActive: {
+      type: Boolean,
+      default: true,
+    },
+    facilityId: {
+      type: mongoose.Schema.Types.ObjectId,
+      ref: "Facility",
+      required: true,
+      index: true
+    }
+  },
+  {
+    timestamps: true,
+    indexes: [
+      { facilityId: 1, isActive: 1 },
+      { moduleId: 1, module: 1 },
+      { name: 1, facilityId: 1 }
+    ]
+  }
+);
+
+// Add any custom methods or middleware here if needed
+penaltySchema.pre('save', function (next) {
+  // Clear the irrelevant field based on penalty type
+  if (this.type === 'percentage') {
+    this.amount = null;
+  } else if (this.type === 'fixed') {
+    this.percentage = null;
+  }
+  next();
+});
+
+const Penalty = mongoose.model("Penalty", penaltySchema);
+
 module.exports = Penalty;

package/src/models/pendingCredentials.js

@@ -1,33 +1,33 @@
-const mongoose = require("mongoose");
-
-const pendingCredentialSchema = new mongoose.Schema({
-    userId: {
-      type: mongoose.Schema.Types.ObjectId,
-      ref: 'User',
-      required: true
-    },
-    email: String,
-    phoneNumber: String,
-    fullName: String,
-    userType: String,
-    password: String, // Temporary storage of plain password for sending
-    facilityId: mongoose.Schema.Types.ObjectId,
-    status: {
-      type: String,
-      enum: ['pending', 'sent', 'failed'],
-      default: 'pending'
-    },
-    retryCount: {
-      type: Number,
-      default: 0
-    },
-    createdAt: {
-      type: Date,
-      default: Date.now,
-      expires: '7d' // Auto-delete after 7 days
-    }
-  });
-
-  const PendingCredential = mongoose.model("PendingCredential", pendingCredentialSchema);
-  
+const mongoose = require("mongoose");
+
+const pendingCredentialSchema = new mongoose.Schema({
+    userId: {
+      type: mongoose.Schema.Types.ObjectId,
+      ref: 'User',
+      required: true
+    },
+    email: String,
+    phoneNumber: String,
+    fullName: String,
+    userType: String,
+    password: String, // Temporary storage of plain password for sending
+    facilityId: mongoose.Schema.Types.ObjectId,
+    status: {
+      type: String,
+      enum: ['pending', 'sent', 'failed'],
+      default: 'pending'
+    },
+    retryCount: {
+      type: Number,
+      default: 0
+    },
+    createdAt: {
+      type: Date,
+      default: Date.now,
+      expires: '7d' // Auto-delete after 7 days
+    }
+  });
+
+  const PendingCredential = mongoose.model("PendingCredential", pendingCredentialSchema);
+  
   module.exports = PendingCredential;

package/src/models/powerMeterCustomerAccount.js

@@ -0,0 +1,78 @@
+const mongoose = require('mongoose');
+
+const waterMeterCustomerAccountSchema = new mongoose.Schema({
+    facilityId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Facility',
+        required: true,
+    },
+    account_no: {
+        type: String,
+        required: true,
+        trim: true
+    },
+    customerId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Customer',
+    },
+    customerName: {
+        type: String,
+        required: true,
+        trim: true
+    },
+    phoneNumber: {
+        type: String,
+        required: true,
+        trim: true
+    },
+    email: {
+        type: String,
+        required: true,
+        trim: true
+    },
+    serialNumber: {
+        type: String,
+        required: true,
+        unique: true,
+        trim: true
+    },
+    unitId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Unit',
+    },
+    payment_type: {
+        type: String,
+        required: true,
+        enum: ['Postpaid', 'Prepaid']
+    },
+    previousReading: {
+        type: Number,
+        required: true,
+        default: 0
+    },
+    currentReading: {
+        type: Number,
+        required: true
+    },
+    status: {
+        type: String,
+        required: true,
+        enum: ['on', 'off'],
+        default: 'on'
+    },
+    created_on: {
+        type: Date,
+        required: true,
+        default: Date.now
+    },
+    meter_id: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'PowerMeter',
+    }
+}, {
+    timestamps: true
+});
+
+const PowerMeterCustomerAccount = mongoose.model('PowerMeterCustomerAccount', waterMeterCustomerAccountSchema);
+
+module.exports = PowerMeterCustomerAccount;

package/src/models/powerMeterCustomerBand.js

@@ -1,14 +1,14 @@
-const mongoose = require('mongoose');
-
-const powerMeterCustomerBandSchema = new mongoose.Schema({
-    name: {
-        type: String,
-        required: true
-    }
-}, {
-    timestamps: true
-});
-
-const PowerMeterCustomerBand = mongoose.model('PowerMeterCustomerBand', powerMeterCustomerBandSchema);
-
-module.exports = PowerMeterCustomerBand;
+const mongoose = require('mongoose');
+
+const powerMeterCustomerBandSchema = new mongoose.Schema({
+    name: {
+        type: String,
+        required: true
+    }
+}, {
+    timestamps: true
+});
+
+const PowerMeterCustomerBand = mongoose.model('PowerMeterCustomerBand', powerMeterCustomerBandSchema);
+
+module.exports = PowerMeterCustomerBand;

package/src/models/powerMeterDailyReading.js

@@ -1,50 +1,31 @@
-const mongoose = require('mongoose');
-
-const powerMeterDailyReadingSchema = 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 PowerMeterDailyReading = mongoose.model('PowerMeter', powerMeterDailyReadingSchema);
-
+const mongoose = require('mongoose');
+
+const powerMeterDailyReadingSchema = new mongoose.Schema({
+    meterId: {
+           type: mongoose.Schema.Types.ObjectId,
+           ref: 'WaterMeter',
+           required: true,
+           index: true
+       },
+       date: {
+           type: Date,
+           required: true,
+           index: true
+       },
+       reading: {
+           type: Number,
+           required: true,
+           min: 0
+       },
+       status: {
+           type: String,
+           enum: ['on', 'off', 'maintenance', 'faulty'],
+           default: 'on',
+       }
+}, {
+    timestamps: true
+});
+
+const PowerMeterDailyReading = mongoose.model('PowerMeter', powerMeterDailyReadingSchema);
+
 module.exports = PowerMeterDailyReading;

package/src/models/powerMeterMonthlyReading.js

@@ -1,50 +1,35 @@
-const mongoose = require('mongoose');
-
-const powerMeterMonthlyReadingSchema = 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 PowerMeterMonthlyReading = mongoose.model('PowerMeterMonthlyReading', powerMeterMonthlyReadingSchema);
-
+const mongoose = require('mongoose');
+
+const powerMeterMonthlyReadingSchema = new mongoose.Schema({
+    meterId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'PowerMeter',
+        required: true
+    },
+    yearMonth: {
+        type: String,
+        required: true
+    },
+    initialReading: {
+        type: Number,
+        required: true,
+        min: 0
+    },
+    finalReading: {
+        type: Number,
+        required: true,
+        min: 0
+    },
+    consumption: {
+        type: Number,
+        default: function() {
+            return this.finalReading - this.initialReading;
+        }
+    }
+}, {
+    timestamps: true
+});
+
+const PowerMeterMonthlyReading = mongoose.model('PowerMeterMonthlyReading', powerMeterMonthlyReadingSchema);
+
 module.exports = PowerMeterMonthlyReading;

package/src/models/powerMeterPowerCharges.js

@@ -1,53 +1,53 @@
-const mongoose = require('mongoose');
-
-const powerMeterPowerChargeSchema = new mongoose.Schema({
-    facilityId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'Facility',
-        required: true
-    },
-    yearMonth: {
-        type: String,
-        required: true
-    },
-    // KPLC Power Charges
-    fuelCostCharge: {
-        type: Number,
-        required: true
-    },
-    forexAdjustment: {
-        type: Number,
-        required: true
-    },
-    inflationAdjustment: {
-        type: Number,
-        required: true
-    },
-    waterResourceManagementLevy: {
-        type: Number,
-        required: true
-    },
-    energyRegulatoryLevy: {
-        type: Number,
-        required: true
-    },
-    ruralElectrificationLevy: {
-        type: Number,
-        required: true
-    },
-    valueAddedTax: {
-        type: Number,
-        required: true
-    },
-    totalCharge: {
-        type: Number,
-        required: true
-    }
-
-}, {
-    timestamps: true
-});
-
-const PowerMeterPowerCharge = mongoose.model('PowerMeterPowerCharge', powerMeterPowerChargeSchema);
-
-module.exports = PowerMeterPowerCharge;
+const mongoose = require('mongoose');
+
+const powerMeterPowerChargeSchema = new mongoose.Schema({
+    facilityId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Facility',
+        required: true
+    },
+    yearMonth: {
+        type: String,
+        required: true
+    },
+    // KPLC Power Charges
+    fuelCostCharge: {
+        type: Number,
+        required: true
+    },
+    forexAdjustment: {
+        type: Number,
+        required: true
+    },
+    inflationAdjustment: {
+        type: Number,
+        required: true
+    },
+    waterResourceManagementLevy: {
+        type: Number,
+        required: true
+    },
+    energyRegulatoryLevy: {
+        type: Number,
+        required: true
+    },
+    ruralElectrificationLevy: {
+        type: Number,
+        required: true
+    },
+    valueAddedTax: {
+        type: Number,
+        required: true
+    },
+    totalCharge: {
+        type: Number,
+        required: true
+    }
+
+}, {
+    timestamps: true
+});
+
+const PowerMeterPowerCharge = mongoose.model('PowerMeterPowerCharge', powerMeterPowerChargeSchema);
+
+module.exports = PowerMeterPowerCharge;