payservedb 4.4.7 → 4.4.8

package/src/models/levycontract.js

@@ -1,66 +1,66 @@
-const mongoose = require('mongoose');
-
-// Define the schema for LevyContract
-const levyContractSchema = new mongoose.Schema({
-    contractName: {
-        type: String,
-        required: true,
-        trim: true
-    },
-    levyId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'Levy',
-        required: true
-    },
-    customerId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'Customer',
-        required: true
-    },
-    unitId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'Unit',
-        required: true
-    },
-    amount: {
-        type: Number,
-        required: true,
-        min: [0, 'Amount must be a positive number']
-    },
-    startDate: {
-        type: Date,
-        required: true
-    },
-    endDate: {
-        type: Date,
-        required: true
-    },
-    status: {
-        type: String,
-        required: true,
-        enum: ['Active', 'Inactive']
-    },
-    // We keep paymentFrequency in the schema for backward compatibility
-    // But it will now be populated from the levy's collectionFrequency
-    paymentFrequency: {
-        type: String,
-        required: true,
-        trim: true
-    },
-    // New field for balance brought forward
-    balanceBroughtForward: {
-        type: Number,
-        default: 0,
-    },
-    facilityId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'Facility',
-        required: true
-    }
-}, {
-    timestamps: true
-});
-
-const LevyContract = mongoose.model('LevyContract', levyContractSchema);
-
+const mongoose = require('mongoose');
+
+// Define the schema for LevyContract
+const levyContractSchema = new mongoose.Schema({
+    contractName: {
+        type: String,
+        required: true,
+        trim: true
+    },
+    levyId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Levy',
+        required: true
+    },
+    customerId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Customer',
+        required: true
+    },
+    unitId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Unit',
+        required: true
+    },
+    amount: {
+        type: Number,
+        required: true,
+        min: [0, 'Amount must be a positive number']
+    },
+    startDate: {
+        type: Date,
+        required: true
+    },
+    endDate: {
+        type: Date,
+        required: true
+    },
+    status: {
+        type: String,
+        required: true,
+        enum: ['Active', 'Inactive']
+    },
+    // We keep paymentFrequency in the schema for backward compatibility
+    // But it will now be populated from the levy's collectionFrequency
+    paymentFrequency: {
+        type: String,
+        required: true,
+        trim: true
+    },
+    // New field for balance brought forward
+    balanceBroughtForward: {
+        type: Number,
+        default: 0,
+    },
+    facilityId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Facility',
+        required: true
+    }
+}, {
+    timestamps: true
+});
+
+const LevyContract = mongoose.model('LevyContract', levyContractSchema);
+
 module.exports = LevyContract;

package/src/models/levytype.js

@@ -1,23 +1,23 @@
-const mongoose = require('mongoose');
-
-// Define the schema for LevyType
-const levyTypeSchema = new mongoose.Schema({
-    name: {
-        type: String,
-        required: true,
-        trim: true,
-        minlength: [1, 'Levy type name must be at least 1 character long']
-    },
-    facilityId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'Facility',
-        required: [true, 'Facility ID is required']
-    }
-}, {
-    timestamps: true // Automatically add createdAt and updatedAt fields
-});
-
-// Compile the model from the schema
-const LevyType = mongoose.model('LevyType', levyTypeSchema);
-
-module.exports = LevyType;
+const mongoose = require('mongoose');
+
+// Define the schema for LevyType
+const levyTypeSchema = new mongoose.Schema({
+    name: {
+        type: String,
+        required: true,
+        trim: true,
+        minlength: [1, 'Levy type name must be at least 1 character long']
+    },
+    facilityId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Facility',
+        required: [true, 'Facility ID is required']
+    }
+}, {
+    timestamps: true // Automatically add createdAt and updatedAt fields
+});
+
+// Compile the model from the schema
+const LevyType = mongoose.model('LevyType', levyTypeSchema);
+
+module.exports = LevyType;

package/src/models/maintenance_service_vendor.js

@@ -1,38 +1,38 @@
-const mongoose = require('mongoose');
-
-const serviceVendorSchema = new mongoose.Schema({
-    name: {
-        type: String,
-        required: true,
-    },
-    service: {
-        type: String,
-        required: true,
-    },
-    agreement: {
-        type: String,
-    },
-    dates: {
-        type: [Date], 
-    },
-    assignedAssets: [{
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'Asset', 
-    }],
-    facilityId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'Facility', 
-        required: true, 
-    },
-    phone: {
-        type: String,
-        required: true,
-    },
-    email: {
-        type: String,
-    },
-}, {
-    timestamps: true, 
-});
-
-module.exports = mongoose.model('ServiceVendor', serviceVendorSchema);
+const mongoose = require('mongoose');
+
+const serviceVendorSchema = new mongoose.Schema({
+    name: {
+        type: String,
+        required: true,
+    },
+    service: {
+        type: String,
+        required: true,
+    },
+    agreement: {
+        type: String,
+    },
+    dates: {
+        type: [Date], 
+    },
+    assignedAssets: [{
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Asset', 
+    }],
+    facilityId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Facility', 
+        required: true, 
+    },
+    phone: {
+        type: String,
+        required: true,
+    },
+    email: {
+        type: String,
+    },
+}, {
+    timestamps: true, 
+});
+
+module.exports = mongoose.model('ServiceVendor', serviceVendorSchema);

package/src/models/maintenance_services.js

@@ -1,17 +1,17 @@
-const mongoose = require('mongoose');
-
-const maintenanceServicesSchema = new mongoose.Schema({
-    name: {
-        type: String,
-        required: true,
-    },
-    facilityId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'Facility', 
-        required: true,
-    },
-}, {
-    timestamps: true, 
-});
-
-module.exports = mongoose.model('MaintenanceServices', maintenanceServicesSchema);
+const mongoose = require('mongoose');
+
+const maintenanceServicesSchema = new mongoose.Schema({
+    name: {
+        type: String,
+        required: true,
+    },
+    facilityId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Facility', 
+        required: true,
+    },
+}, {
+    timestamps: true, 
+});
+
+module.exports = mongoose.model('MaintenanceServices', maintenanceServicesSchema);

package/src/models/maintenancerequisition.js

@@ -1,31 +1,31 @@
-const mongoose = require('mongoose');
-
-const requisitionSchema = new mongoose.Schema({
-    facilityId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'Facility',
-        required: [true, 'Facility ID is required']
-    },
-    stockId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'Stocksandspare',
-        required: [true, 'stock ID is required']
-    },
-    workId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'WorkOrder'
-    },
-    description: {
-        type: String,
-        required: true,
-    },
-    quantity: {
-        type: Number,
-        required: true,
-        min: 1, 
-    }
-}, {
-    timestamps: true, 
-});
-
-module.exports = mongoose.model('StockRequisition', requisitionSchema);
+const mongoose = require('mongoose');
+
+const requisitionSchema = new mongoose.Schema({
+    facilityId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Facility',
+        required: [true, 'Facility ID is required']
+    },
+    stockId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Stocksandspare',
+        required: [true, 'stock ID is required']
+    },
+    workId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'WorkOrder'
+    },
+    description: {
+        type: String,
+        required: true,
+    },
+    quantity: {
+        type: Number,
+        required: true,
+        min: 1, 
+    }
+}, {
+    timestamps: true, 
+});
+
+module.exports = mongoose.model('StockRequisition', requisitionSchema);

package/src/models/message.js

@@ -1,39 +1,39 @@
-const mongoose = require('mongoose');
-const MessageSchema = mongoose.Schema({
-    type: {
-        type: String,
-        required: true
-    },
-    recipient: {
-        type: String,
-        required: true,
-    },
-    subject: {
-        type: String,
-        required: false
-    },
-    body: {
-        type: String,
-        required: true
-    },
-    sentOn: {
-        type: Date,
-        required: false
-    },
-    createdOn:{
-        type:Date,
-        required:true
-    },
-    status: {
-        type: String,
-        required: true,
-        enum: ['Not Sent', 'In Queue', 'Sent']
-    },
-    messageId: {
-        type: String,
-        required: false
-    }
-
-})
-const Message = mongoose.model('Message', MessageSchema);
+const mongoose = require('mongoose');
+const MessageSchema = mongoose.Schema({
+    type: {
+        type: String,
+        required: true
+    },
+    recipient: {
+        type: String,
+        required: true,
+    },
+    subject: {
+        type: String,
+        required: false
+    },
+    body: {
+        type: String,
+        required: true
+    },
+    sentOn: {
+        type: Date,
+        required: false
+    },
+    createdOn:{
+        type:Date,
+        required:true
+    },
+    status: {
+        type: String,
+        required: true,
+        enum: ['Not Sent', 'In Queue', 'Sent']
+    },
+    messageId: {
+        type: String,
+        required: false
+    }
+
+})
+const Message = mongoose.model('Message', MessageSchema);
 module.exports = Message

package/src/models/module.js

@@ -1,21 +1,21 @@
-const mongoose = require('mongoose');
-
-// Define the schema for modules
-const moduleSchema = new mongoose.Schema({
-    name: {
-        type: String,
-        required: [true, 'Module name is required'],
-        trim: true,
-        unique: true // Ensure module name is unique
-    }
-}, {
-    timestamps: true // Automatically add createdAt and updatedAt fields
-});
-
-// Indexes for improved performance
-moduleSchema.index({ name: 1 });
-
-// Compile the model from the schema
-const Module = mongoose.model('Module', moduleSchema);
-
-module.exports = Module;
+const mongoose = require('mongoose');
+
+// Define the schema for modules
+const moduleSchema = new mongoose.Schema({
+    name: {
+        type: String,
+        required: [true, 'Module name is required'],
+        trim: true,
+        unique: true // Ensure module name is unique
+    }
+}, {
+    timestamps: true // Automatically add createdAt and updatedAt fields
+});
+
+// Indexes for improved performance
+moduleSchema.index({ name: 1 });
+
+// Compile the model from the schema
+const Module = mongoose.model('Module', moduleSchema);
+
+module.exports = Module;

package/src/models/notification.js

@@ -1,24 +1,24 @@
-const mongoose = require('mongoose');
-
-// Define the schema for Notifications
-const notificationSchema = new mongoose.Schema({
-    userId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'User',
-        required: true
-    },
-    message: {
-        type: String,
-        required: true
-    },
-    dateSent: {
-        type: Date,
-        required: true
-    }
-}, {
-    timestamps: true
-});
-
-const Notification = mongoose.model('Notification', notificationSchema);
-
-module.exports = Notification;
+const mongoose = require('mongoose');
+
+// Define the schema for Notifications
+const notificationSchema = new mongoose.Schema({
+    userId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'User',
+        required: true
+    },
+    message: {
+        type: String,
+        required: true
+    },
+    dateSent: {
+        type: Date,
+        required: true
+    }
+}, {
+    timestamps: true
+});
+
+const Notification = mongoose.model('Notification', notificationSchema);
+
+module.exports = Notification;

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;