payservedb 8.9.2 → 8.9.3

package/src/models/short_urls.js

@@ -1,21 +1,21 @@
-const mongoose = require('mongoose');
-
-const shortUrlSchema = new mongoose.Schema({
-    shortCode: {
-        type: String,
-        required: true,
-        unique: true,
-        trim: true
-    },
-    originalUrl: {
-        type: String,
-        required: true,
-        trim: true
-    }
-}, {
-    timestamps: true 
-});
-
-const ShortUrl = mongoose.model('ShortUrl', shortUrlSchema);
-
-module.exports = ShortUrl;
+const mongoose = require('mongoose');
+
+const shortUrlSchema = new mongoose.Schema({
+    shortCode: {
+        type: String,
+        required: true,
+        unique: true,
+        trim: true
+    },
+    originalUrl: {
+        type: String,
+        required: true,
+        trim: true
+    }
+}, {
+    timestamps: true 
+});
+
+const ShortUrl = mongoose.model('ShortUrl', shortUrlSchema);
+
+module.exports = ShortUrl;

package/src/models/smart_meter_daily_consumption.js

@@ -1,45 +1,45 @@
-const mongoose = require('mongoose');
- 
-const dailyConsumptionSchema = new mongoose.Schema({
-  meterId: {
-    type: mongoose.Schema.Types.ObjectId,
-    ref: 'Meter',
-    required: true,
-  },
-  date: {
-    type: Date,
-    required: true,
-  },
-  totalConsumption: {
-    type: Number,
-    default: 0,
-  },
-  
-  updates: [{
-    timestamp: { 
-      type: Date, 
-      default: Date.now 
-    },
-    previousReading: { 
-      type: Number, 
-      required: true 
-    },
-    currentReading: { 
-      type: Number, 
-      required: true 
-    },
-    // Delta can be computed as (currentReading - previousReading)
-    delta: { 
-      type: Number, 
-      required: true 
-    },
-  }],
-}, {
-  timestamps: true,
-});
-
-dailyConsumptionSchema.index({ meterId: 1, date: 1 }, { unique: true });
-
-const DailyConsumption = mongoose.model('DailyConsumption', dailyConsumptionSchema);
-
+const mongoose = require('mongoose');
+ 
+const dailyConsumptionSchema = new mongoose.Schema({
+  meterId: {
+    type: mongoose.Schema.Types.ObjectId,
+    ref: 'Meter',
+    required: true,
+  },
+  date: {
+    type: Date,
+    required: true,
+  },
+  totalConsumption: {
+    type: Number,
+    default: 0,
+  },
+  
+  updates: [{
+    timestamp: { 
+      type: Date, 
+      default: Date.now 
+    },
+    previousReading: { 
+      type: Number, 
+      required: true 
+    },
+    currentReading: { 
+      type: Number, 
+      required: true 
+    },
+    // Delta can be computed as (currentReading - previousReading)
+    delta: { 
+      type: Number, 
+      required: true 
+    },
+  }],
+}, {
+  timestamps: true,
+});
+
+dailyConsumptionSchema.index({ meterId: 1, date: 1 }, { unique: true });
+
+const DailyConsumption = mongoose.model('DailyConsumption', dailyConsumptionSchema);
+
 module.exports = DailyConsumption;

package/src/models/sms_africastalking.js

@@ -1,21 +1,21 @@
-const mongoose = require('mongoose');
-const SMSAfricastalkingSchema = mongoose.Schema({
-    user: {
-        type: String,
-        required: true
-    },
-    senderId: {
-        type: String,
-        required: true
-    },
-    userName: {
-        type: String,
-        required: true,
-    },
-    apiKey: {
-        type: String,
-        required: true
-    }
-})
-const SMSAfricastalking = mongoose.model('SMSAfricastalking', SMSAfricastalkingSchema);
+const mongoose = require('mongoose');
+const SMSAfricastalkingSchema = mongoose.Schema({
+    user: {
+        type: String,
+        required: true
+    },
+    senderId: {
+        type: String,
+        required: true
+    },
+    userName: {
+        type: String,
+        required: true,
+    },
+    apiKey: {
+        type: String,
+        required: true
+    }
+})
+const SMSAfricastalking = mongoose.model('SMSAfricastalking', SMSAfricastalkingSchema);
 module.exports = SMSAfricastalking

package/src/models/sms_balance_notification.js

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

package/src/models/sms_meliora.js

@@ -1,21 +1,21 @@
-const mongoose = require('mongoose');
-const SMSMelioraSchema = mongoose.Schema({
-    user: {
-        type: String,
-        required: true
-    },
-    facilityId: {
-        type: mongoose.Schema.Types.ObjectId,
-        required: true
-    },
-    senderId: {
-        type: String,
-        required: true
-    },
-    apiKey: {
-        type: String,
-        required: true
-    }
-})
-const SMSMeliora = mongoose.model('SMSMeliora', SMSMelioraSchema);
+const mongoose = require('mongoose');
+const SMSMelioraSchema = mongoose.Schema({
+    user: {
+        type: String,
+        required: true
+    },
+    facilityId: {
+        type: mongoose.Schema.Types.ObjectId,
+        required: true
+    },
+    senderId: {
+        type: String,
+        required: true
+    },
+    apiKey: {
+        type: String,
+        required: true
+    }
+})
+const SMSMeliora = mongoose.model('SMSMeliora', SMSMelioraSchema);
 module.exports = SMSMeliora

package/src/models/staff.js

@@ -1,36 +1,36 @@
-const mongoose = require("mongoose");
-
-// Define the Staff schema
-const staffSchema = new mongoose.Schema(
-  {
-    facilityId: {
-      type: mongoose.Schema.Types.ObjectId,
-      ref: 'Facility',
-      required: true,
-    },
-    name: {
-      type: String,
-      required: true,
-    },
-    contact: {
-      type: String,
-      required: true,
-    },
-    phoneNumber: {
-      type: String,
-      required: true,
-    },
-    service: [{
-      type: mongoose.Schema.Types.ObjectId,
-      ref: 'ValueAddedService',
-      required: true,
-    }],
-  },
-  {
-    timestamps: true,
-  }
-);
-
-const Staff = mongoose.model('Staff', staffSchema);
-
-module.exports = Staff;
+const mongoose = require("mongoose");
+
+// Define the Staff schema
+const staffSchema = new mongoose.Schema(
+  {
+    facilityId: {
+      type: mongoose.Schema.Types.ObjectId,
+      ref: 'Facility',
+      required: true,
+    },
+    name: {
+      type: String,
+      required: true,
+    },
+    contact: {
+      type: String,
+      required: true,
+    },
+    phoneNumber: {
+      type: String,
+      required: true,
+    },
+    service: [{
+      type: mongoose.Schema.Types.ObjectId,
+      ref: 'ValueAddedService',
+      required: true,
+    }],
+  },
+  {
+    timestamps: true,
+  }
+);
+
+const Staff = mongoose.model('Staff', staffSchema);
+
+module.exports = Staff;

package/src/models/stocksandspare.js

@@ -1,161 +1,161 @@
-const mongoose = require("mongoose");
-
-// Metadata subdocument schema for tracking stock changes
-const stockMetadataSchema = new mongoose.Schema(
-  {
-    timestamp: {
-      type: Date,
-      default: Date.now,
-      required: true,
-    },
-    description: {
-      type: String,
-      required: true,
-      trim: true,
-    },
-    changeType: {
-      type: String,
-      enum: ["increment", "decrement", "adjustment", "initial", "edit"],
-      required: true,
-    },
-    previousQuantity: {
-      type: Number,
-      min: 0,
-    },
-    newQuantity: {
-      type: Number,
-      min: 0,
-      required: true,
-    },
-    quantityChanged: {
-      type: Number,
-      required: true,
-    },
-    userId: {
-      type: mongoose.Schema.Types.ObjectId,
-      ref: "User", // assuming you have a User model
-    },
-  },
-  { _id: false },
-); // _id: false to prevent auto-generation of _id for subdocuments
-
-const stockAndSparesSchema = new mongoose.Schema(
-  {
-    facilityId: {
-      type: mongoose.Schema.Types.ObjectId,
-      ref: "Facility",
-      required: true,
-    },
-    name: {
-      type: String,
-      required: true,
-    },
-    description: {
-      type: String,
-    },
-    skuDetails: {
-      type: String,
-      required: true,
-    },
-    quantityInStock: {
-      type: Number,
-      required: true,
-      min: 0,
-    },
-    reOrderLevel: {
-      type: Number,
-      required: true,
-      min: 0,
-    },
-    // New metadata field to track all stock changes
-    metadata: [stockMetadataSchema],
-  },
-  {
-    timestamps: true,
-  },
-);
-
-// Pre-save middleware to automatically add metadata entry when quantity changes
-stockAndSparesSchema.pre("save", function (next) {
-  if (this.isModified("quantityInStock") && !this.isNew) {
-    // Get the original document to compare quantities
-    const originalDoc = this.constructor.findById(this._id);
-    originalDoc.then((original) => {
-      if (original && original.quantityInStock !== this.quantityInStock) {
-        const quantityChanged = this.quantityInStock - original.quantityInStock;
-        const changeType =
-          quantityChanged > 0
-            ? "increment"
-            : quantityChanged < 0
-              ? "decrement"
-              : "adjustment";
-
-        // Add metadata entry (you can set description and userId from your controller)
-        this.metadata.push({
-          previousQuantity: original.quantityInStock,
-          newQuantity: this.quantityInStock,
-          quantityChanged: quantityChanged,
-          changeType: changeType,
-          description:
-            this._metadataDescription ||
-            `Stock ${changeType}: ${Math.abs(quantityChanged)} units`,
-          userId: this._userId || null,
-        });
-      }
-    });
-  }
-  next();
-});
-
-// Instance method to add stock with metadata
-stockAndSparesSchema.methods.addStock = function (
-  quantity,
-  description,
-  userId,
-) {
-  const previousQuantity = this.quantityInStock;
-  this.quantityInStock += quantity;
-
-  this.metadata.push({
-    previousQuantity: previousQuantity,
-    newQuantity: this.quantityInStock,
-    quantityChanged: quantity,
-    changeType: "increment",
-    description: description || `Added ${quantity} units to stock`,
-    userId: userId,
-  });
-
-  return this.save();
-};
-
-// Instance method to reduce stock with metadata
-stockAndSparesSchema.methods.reduceStock = function (
-  quantity,
-  description,
-  userId,
-) {
-  if (this.quantityInStock < quantity) {
-    throw new Error("Insufficient stock quantity");
-  }
-
-  const previousQuantity = this.quantityInStock;
-  this.quantityInStock -= quantity;
-
-  this.metadata.push({
-    previousQuantity: previousQuantity,
-    newQuantity: this.quantityInStock,
-    quantityChanged: -quantity,
-    changeType: "decrement",
-    description: description || `Removed ${quantity} units from stock`,
-    userId: userId,
-  });
-
-  return this.save();
-};
-
-// Instance method to get stock history
-stockAndSparesSchema.methods.getStockHistory = function () {
-  return this.metadata.sort((a, b) => b.timestamp - a.timestamp);
-};
-
-module.exports = mongoose.model("Stocksandspare", stockAndSparesSchema);
+const mongoose = require("mongoose");
+
+// Metadata subdocument schema for tracking stock changes
+const stockMetadataSchema = new mongoose.Schema(
+  {
+    timestamp: {
+      type: Date,
+      default: Date.now,
+      required: true,
+    },
+    description: {
+      type: String,
+      required: true,
+      trim: true,
+    },
+    changeType: {
+      type: String,
+      enum: ["increment", "decrement", "adjustment", "initial", "edit"],
+      required: true,
+    },
+    previousQuantity: {
+      type: Number,
+      min: 0,
+    },
+    newQuantity: {
+      type: Number,
+      min: 0,
+      required: true,
+    },
+    quantityChanged: {
+      type: Number,
+      required: true,
+    },
+    userId: {
+      type: mongoose.Schema.Types.ObjectId,
+      ref: "User", // assuming you have a User model
+    },
+  },
+  { _id: false },
+); // _id: false to prevent auto-generation of _id for subdocuments
+
+const stockAndSparesSchema = new mongoose.Schema(
+  {
+    facilityId: {
+      type: mongoose.Schema.Types.ObjectId,
+      ref: "Facility",
+      required: true,
+    },
+    name: {
+      type: String,
+      required: true,
+    },
+    description: {
+      type: String,
+    },
+    skuDetails: {
+      type: String,
+      required: true,
+    },
+    quantityInStock: {
+      type: Number,
+      required: true,
+      min: 0,
+    },
+    reOrderLevel: {
+      type: Number,
+      required: true,
+      min: 0,
+    },
+    // New metadata field to track all stock changes
+    metadata: [stockMetadataSchema],
+  },
+  {
+    timestamps: true,
+  },
+);
+
+// Pre-save middleware to automatically add metadata entry when quantity changes
+stockAndSparesSchema.pre("save", function (next) {
+  if (this.isModified("quantityInStock") && !this.isNew) {
+    // Get the original document to compare quantities
+    const originalDoc = this.constructor.findById(this._id);
+    originalDoc.then((original) => {
+      if (original && original.quantityInStock !== this.quantityInStock) {
+        const quantityChanged = this.quantityInStock - original.quantityInStock;
+        const changeType =
+          quantityChanged > 0
+            ? "increment"
+            : quantityChanged < 0
+              ? "decrement"
+              : "adjustment";
+
+        // Add metadata entry (you can set description and userId from your controller)
+        this.metadata.push({
+          previousQuantity: original.quantityInStock,
+          newQuantity: this.quantityInStock,
+          quantityChanged: quantityChanged,
+          changeType: changeType,
+          description:
+            this._metadataDescription ||
+            `Stock ${changeType}: ${Math.abs(quantityChanged)} units`,
+          userId: this._userId || null,
+        });
+      }
+    });
+  }
+  next();
+});
+
+// Instance method to add stock with metadata
+stockAndSparesSchema.methods.addStock = function (
+  quantity,
+  description,
+  userId,
+) {
+  const previousQuantity = this.quantityInStock;
+  this.quantityInStock += quantity;
+
+  this.metadata.push({
+    previousQuantity: previousQuantity,
+    newQuantity: this.quantityInStock,
+    quantityChanged: quantity,
+    changeType: "increment",
+    description: description || `Added ${quantity} units to stock`,
+    userId: userId,
+  });
+
+  return this.save();
+};
+
+// Instance method to reduce stock with metadata
+stockAndSparesSchema.methods.reduceStock = function (
+  quantity,
+  description,
+  userId,
+) {
+  if (this.quantityInStock < quantity) {
+    throw new Error("Insufficient stock quantity");
+  }
+
+  const previousQuantity = this.quantityInStock;
+  this.quantityInStock -= quantity;
+
+  this.metadata.push({
+    previousQuantity: previousQuantity,
+    newQuantity: this.quantityInStock,
+    quantityChanged: -quantity,
+    changeType: "decrement",
+    description: description || `Removed ${quantity} units from stock`,
+    userId: userId,
+  });
+
+  return this.save();
+};
+
+// Instance method to get stock history
+stockAndSparesSchema.methods.getStockHistory = function () {
+  return this.metadata.sort((a, b) => b.timestamp - a.timestamp);
+};
+
+module.exports = mongoose.model("Stocksandspare", stockAndSparesSchema);