payservedb 5.8.0 → 5.8.2

package/index.js

@@ -180,7 +180,8 @@ const models = {
   AssetAssignment: require("./src/models/assetsAssignment"),
   Wallet: require("./src/models/wallet"),
   WalletTransaction: require("./src/models/wallet_transactions"),
-  GoodsReceivedNote: require("./src/models/goodsReceivedNotes")
+  GoodsReceivedNote: require("./src/models/goodsReceivedNotes"),
+  MeterCommandQueue: require("./src/models/water_meter_Command_Queue")
 };
 
 // Function to get models dynamically from a specific database connection

package/package.json

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

package/src/models/cashpayment.js

@@ -161,8 +161,11 @@ const cashPaymentSchema = new mongoose.Schema(
                 fileId: mongoose.Schema.Types.ObjectId,
                 fileName: String,
                 fileType: String,
+                filePath: String,
                 uploadDate: Date,
-                uploadedBy: mongoose.Schema.Types.ObjectId
+                uploadedBy: mongoose.Schema.Types.ObjectId,
+                size: Number,
+                originalName: String
             }
         ],
         metadata: {
@@ -202,11 +205,10 @@ cashPaymentSchema.index({ 'paymentMethod': 1 });
 cashPaymentSchema.index({ 'paymentDate': -1, 'approvalStatus': 1 });
 cashPaymentSchema.index({ 'client.clientId': 1, 'approvalStatus': 1 });
 
-// Add virtual properties
-cashPaymentSchema.virtual('clientFullName').get(function () {
-    return `${this.client.firstName} ${this.client.lastName}`;
-});
-
+// // Add virtual properties
+// cashPaymentSchema.virtual('clientFullName').get(function () {
+//     return ${ this.client.firstName } ${ this.client.lastName };
+// });
 // Add instance methods
 cashPaymentSchema.methods.convertCurrency = function (targetCurrencyCode, exchangeRate) {
     if (this.currency.code === targetCurrencyCode) {

package/src/models/water_meter_Command_Queue.js

@@ -0,0 +1,34 @@
+const mongoose = require('mongoose');
+
+const meterCommandQueueSchema = new mongoose.Schema({
+    meterId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'WaterMeter',
+        required: true
+    },
+    concentratorSerialNumber: {
+        type: String,
+        required: true
+    },
+    commandType: {
+        type: String,
+        enum: ['open', 'close', 'read'],
+        required: true
+    },
+    status: {
+        type: String,
+        enum: ['pending', 'sent', 'acknowledged', 'failed'],
+        default: 'pending'
+    },
+    retryCount: {
+        type: Number,
+        default: 0
+    },
+    sentAt: {
+        type: Date
+    }
+}, { timestamps: true });
+
+const MeterCommandQueue = mongoose.model('MeterCommandQueue', meterCommandQueueSchema);
+
+module.exports = MeterCommandQueue;