payservedb 7.8.8 → 7.9.0

package/index.js

@@ -203,8 +203,8 @@ const models = {
     PowerPrepaidCredit: require("./src/models/power_prepaid_credits"),
     PowerNegativeBalance: require("./src/models/power_meter_negative_balance"),
     PowerCommandQueue: require("./src/models/power_meter_command_queue"),
+    PowerNotification: require("./src/models/power_sms_notification"),
     FacilityWalletTransactionsMetadata: require("./src/models/facilityWalletTransactionsMetadata"),
-    SmsNotification: require("./src/models/sms_balance_notification"),
     NegativeBalance: require("./src/models/water_meter_negative_amounts"),
     MasterWorkplan: require("./src/models/master_workplan"),
     MasterWorkplanChild: require("./src/models/master_workplan_child"),

package/package.json

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

package/src/models/powerMeterPowerCharges.js

@@ -10,7 +10,6 @@ const powerMeterPowerChargeSchema = new mongoose.Schema({
         type: String,
         required: true
     },
-    // KPLC Power Charges
     fuelCostCharge: {
         type: Number,
         required: true
@@ -42,12 +41,46 @@ const powerMeterPowerChargeSchema = new mongoose.Schema({
     totalCharge: {
         type: Number,
         required: true
+    },
+    energyCharge: {
+        type: Number,
+        default: 0
+    },
+    powerFactorSurcharge: {
+        type: Number,
+        default: 0
+    },
+    tariff: {
+        type: String,
+        enum: [
+            'Domestic Lifeline',
+            'Domestic Ordinary 1',
+            'Domestic Ordinary 2',
+            'Commercial Low Voltage',
+            'Commercial Medium Voltage',
+            'Industrial Low Voltage',
+            'Industrial Medium Voltage',
+            'Industrial High Voltage'
+        ]
+    },
+    assumedConsumedUnit: {
+        type: Number,
+        default: 0
+    },
+    repPercentage: {
+        type: Number,
+        default: 5
+    },
+    vatPercentage: {
+        type: Number,
+        default: 16
     }
-
 }, {
     timestamps: true
 });
 
+powerMeterPowerChargeSchema.index({ facilityId: 1, yearMonth: 1 }, { unique: true });
+
 const PowerMeterPowerCharge = mongoose.model('PowerMeterPowerCharge', powerMeterPowerChargeSchema);
 
-module.exports = PowerMeterPowerCharge;
+module.exports = PowerMeterPowerCharge;

package/src/models/power_sms_notification.js

@@ -0,0 +1,27 @@
+const mongoose = require('mongoose');
+
+const PowerNotificationSchema = new mongoose.Schema({
+    accountId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'PowerMeterAccount',
+        required: true
+    },
+    currentRange: {
+        type: String,
+        required: true
+    },
+    lastNotificationDate: {
+        type: Date,
+        default: Date.now
+    },
+    balance: {
+        type: Number,
+        required: true
+    }
+}, {
+    timestamps: true
+});
+
+const PowerNotification = mongoose.model('PowerNotification', PowerNotificationSchema)
+
+module.exports = PowerNotification;