payservedb 7.0.4 → 7.0.7

package/package.json

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

package/src/models/facilityInvoiceRecipient.js

@@ -24,13 +24,10 @@ const RecipientSchema = new mongoose.Schema(
     }
 );
 
-
+// Create the model
 const Recipient = mongoose.model("Recipient", RecipientSchema);
 
-
-module.exports = Recipient
-
-
-module.exports = {
-    RecipientSchema
-}
+// Export the model as default and the schema as a named export
+module.exports = Recipient;
+module.exports.RecipientSchema = RecipientSchema;
+module.exports.schema = RecipientSchema; // For compatibility with getModel if needed

package/src/models/powerMeterDailyReading.js

@@ -19,7 +19,7 @@ const powerMeterDailyReadingSchema = new mongoose.Schema({
        },
        status: {
            type: String,
-           enum: ['On', '0ff', 'Maintenance', 'Faulty'],
+           enum: ['On', 'Off', 'Maintenance', 'Faulty'],
            default: 'On',
        }
 }, {

package/src/models/powerMeterSingleDayReading.js

@@ -17,7 +17,7 @@ const powerMeterSingleDayReadingSchema = new mongoose.Schema({
     },
     status: {
         type: String,
-        enum: ['On', '0ff', 'Maintenance', 'Faulty'],
+        enum: ['On', 'Off', 'Maintenance', 'Faulty'],
         default: 'On',
     },
     time: {

package/src/models/powerMeters.js

@@ -81,13 +81,13 @@ const powerMeterSchema = new mongoose.Schema({
     },
     liveStatus: {
         type: String,
-        enum: ['on', 'off', 'maintenance', 'faulty'],
-        default: 'on'
+        enum: ['Off', 'On', 'Maintenance', 'Faulty'],
+        default: 'On'
     },
     gatewayLiveStatus: {
         type: String,
-        enum: ['ON', 'OFF'],
-        default: 'OFF'
+        enum: ['on', 'off'],
+        default: 'off'
     },
     meterStatus: {
         type: String,

package/src/models/power_meter_command_queue.js

@@ -0,0 +1,33 @@
+const mongoose = require('mongoose');
+
+const powerCommandQueueSchema = new mongoose.Schema({
+    deviceId: {
+        type: String,
+        required: true
+    },
+    gatewayId: {
+        type: String,
+        required: true
+    },
+    commandType: {
+        type: String,
+        enum: ['On', 'Off', 'Read'],
+        required: true
+    },
+    status: {
+        type: String,
+        enum: ['pending', 'sent', 'acknowledged', 'failed'],
+        default: 'pending'
+    },
+    retryCount: {
+        type: Number,
+        default: 0
+    },
+    sentAt: {
+        type: Date
+    }
+}, { timestamps: true });
+
+const PowerCommandQueue = mongoose.model('PowerCommandQueue', powerCommandQueueSchema);
+
+module.exports = PowerCommandQueue;

package/src/models/power_meter_negative_balance.js

@@ -0,0 +1,44 @@
+const mongoose = require('mongoose');
+
+const powerNegativeBalanceSchema = new mongoose.Schema({
+    customerId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Customer',
+        required: true
+    },
+    accountId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'PowerMeterCustomerAccount',
+        required: true
+    },
+    customerName: {
+        type: String,
+        required: true,
+        trim: true
+    },
+    meterNumber: {
+        type: String,
+        required: true,
+        trim: true
+    },
+    amount: {
+        type: Number,
+        required: true
+    },
+    type: {  
+        type: String,
+        enum: ['Credit', 'Debit'],
+        required: true
+    },
+    dateRecorded: {
+        type: Date,
+        required: true,
+        default: Date.now
+    }
+}, {
+    timestamps: true
+});
+
+const PowerNegativeBalance = mongoose.model('PowerNegativeBalance', powerNegativeBalanceSchema);
+
+module.exports = PowerNegativeBalance;

package/src/models/power_prepaid_credits.js

@@ -0,0 +1,47 @@
+const mongoose = require('mongoose');
+
+const powerPrepaidCreditSchema = new mongoose.Schema({
+    accountId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'PowerMeterCustomerAccount',
+        required: true,
+    },
+    meterId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'PowerMeters',
+        required: true,
+    },
+    ref: {
+        type: String,
+        required: true,
+    },
+    amount: {
+        type: Number,
+        required: true,
+        default: 0
+    },
+    time: {
+        type: String,
+        required: true,
+    },
+    addedOn: {
+        type: String,
+        required: true,
+    },
+    reason: {
+        type: String,
+        required: true,
+    },
+    type: {
+        type: String,
+        enum: ['Mobile Money', 'Bank', 'Manual'],
+        required: true
+    },
+
+}, {
+    timestamps: true
+});
+
+const PowerPrepaidCredit = mongoose.model('PowerPrepaidCredit', powerPrepaidCreditSchema);
+
+module.exports = PowerPrepaidCredit;

package/src/models/power_prepaid_debits.js

@@ -0,0 +1,50 @@
+const mongoose = require('mongoose');
+
+const powerPrepaidDebitSchema = new mongoose.Schema({
+    accountId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'PowerMeterCustomerAccount',
+        required: true,
+    },
+    meterId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'PowerMeters',
+        required: true,
+    },
+    prev_reading: {
+        type: Number,
+        required: true,
+    },
+    current_reading: {
+        type: Number,
+        required: true,
+        default: 0
+    },
+    consumption: {
+        type: Number,
+        required: true,
+    },
+    rate: {
+        type: String,
+        required: true,
+    },
+    totalAmount: {
+        type: Number,
+        required: true,
+    },
+    date: {
+        type: String,
+        required: true
+    },
+    time: {
+        type: String,
+        required: true
+    },
+
+}, {
+    timestamps: true
+});
+
+const PowerPrepaidDebit = mongoose.model('PowerPrepaidDebit', powerPrepaidDebitSchema);
+
+module.exports = PowerPrepaidDebit;

package/src/models/water_meter_communication_logs.js

@@ -17,14 +17,24 @@ const meterLogSchema = new mongoose.Schema({
         required: true,
         trim: true
     },
+    reason: {
+        type: String,
+        required: true,
+        trim: true
+    },
+    actionBy: {
+        type: String,
+        required: true,
+        trim: true
+    },
     timestamp: {
         type: Date,
         default: Date.now
     }
 }, {
-    timestamps: true 
+    timestamps: true
 });
 
 const MeterLog = mongoose.model('MeterLog', meterLogSchema);
 
-module.exports = MeterLog;
+module.exports = MeterLog;

package/src/models/water_meter_high_risk.js

@@ -0,0 +1,37 @@
+const mongoose = require('mongoose');
+
+const highRiskMeterSchema = new mongoose.Schema({
+    meterNumber: {
+        type: String,
+        required: true,
+        unique: true,
+        trim: true,
+        index: true
+    },
+    concentratorSerialNumber: {
+        type: String,
+        required: true,
+        trim: true
+    },
+    customerName: {
+        type: String,
+        required: true,
+        trim: true
+    },
+    facilityName: {
+        type: String,
+        required: true,
+        trim: true
+    },
+    unitName: {
+        type: String,
+        required: true,
+        trim: true
+    }
+}, {
+    timestamps: true
+});
+
+const HighRiskMeter = mongoose.model('HighRiskMeter', highRiskMeterSchema);
+
+module.exports = HighRiskMeter;

package/src/models/water_meter_negative_amounts.js

@@ -25,6 +25,11 @@ const negativeBalanceSchema = new mongoose.Schema({
         type: Number,
         required: true
     },
+    type: {  
+        type: String,
+        enum: ['Credit', 'Debit'],
+        required: true
+    },
     dateRecorded: {
         type: Date,
         required: true,
@@ -36,4 +41,4 @@ const negativeBalanceSchema = new mongoose.Schema({
 
 const NegativeBalance = mongoose.model('NegativeBalance', negativeBalanceSchema);
 
-module.exports = NegativeBalance;
+module.exports = NegativeBalance;