payservedb 6.1.6 → 6.1.8

package/src/models/auditlog.js

@@ -1,83 +1,83 @@
-const mongoose = require('mongoose');
-
-const auditLogSchema = new mongoose.Schema({
-    action: {
-        type: String,
-        required: true,
-        trim: true
-    },
-    page: {
-        type: String,
-        required: true,
-        trim: true
-    },
-    userId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'Company',
-        required: true
-    },
-    userInfo: {
-        type: mongoose.Schema.Types.Mixed,
-        required: true
-    },
-    projectId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'Project',
-        required: true
-    },
-    projectInfo: {
-        type: mongoose.Schema.Types.Mixed,
-        required: true
-    },
-    computerName: {
-        type: String,
-        required: true,
-        trim: true
-    },
-    browser: {
-        type: String,
-        required: true,
-        trim: true
-    },
-    ipAddress: {
-        type: String,
-        required: true,
-        trim: true
-    },
-    time: {
-        type: String,
-        required: true,
-        trim: true
-    },
-    date: {
-        type: String,
-        required: true,
-        trim: true
-    },
-    createdOn: {
-        type: Date,
-        default: Date.now,
-        required: true
-    },
-    oldData: {
-        type: mongoose.Schema.Types.Mixed,
-        default: {}
-    },
-    newData: {
-        type: mongoose.Schema.Types.Mixed,
-        default: {}
-    },
-    deletedData: {
-        type: mongoose.Schema.Types.Mixed,
-        default: {}
-    }
-}, {
-    timestamps: true 
-});
-
-auditLogSchema.index({ userId: 1, projectId: 1, createdOn: -1 });
-auditLogSchema.index({ action: 1 });
-auditLogSchema.index({ page: 1 });
-const AuditLog = mongoose.model('AuditLog', auditLogSchema);
-
-module.exports = AuditLog;
+const mongoose = require('mongoose');
+
+const auditLogSchema = new mongoose.Schema({
+    action: {
+        type: String,
+        required: true,
+        trim: true
+    },
+    page: {
+        type: String,
+        required: true,
+        trim: true
+    },
+    userId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Company',
+        required: true
+    },
+    userInfo: {
+        type: mongoose.Schema.Types.Mixed,
+        required: true
+    },
+    projectId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Project',
+        required: true
+    },
+    projectInfo: {
+        type: mongoose.Schema.Types.Mixed,
+        required: true
+    },
+    computerName: {
+        type: String,
+        required: true,
+        trim: true
+    },
+    browser: {
+        type: String,
+        required: true,
+        trim: true
+    },
+    ipAddress: {
+        type: String,
+        required: true,
+        trim: true
+    },
+    time: {
+        type: String,
+        required: true,
+        trim: true
+    },
+    date: {
+        type: String,
+        required: true,
+        trim: true
+    },
+    createdOn: {
+        type: Date,
+        default: Date.now,
+        required: true
+    },
+    oldData: {
+        type: mongoose.Schema.Types.Mixed,
+        default: {}
+    },
+    newData: {
+        type: mongoose.Schema.Types.Mixed,
+        default: {}
+    },
+    deletedData: {
+        type: mongoose.Schema.Types.Mixed,
+        default: {}
+    }
+}, {
+    timestamps: true 
+});
+
+auditLogSchema.index({ userId: 1, projectId: 1, createdOn: -1 });
+auditLogSchema.index({ action: 1 });
+auditLogSchema.index({ page: 1 });
+const AuditLog = mongoose.model('AuditLog', auditLogSchema);
+
+module.exports = AuditLog;

package/src/models/bankdetails.js

@@ -1,40 +1,40 @@
-const mongoose = require('mongoose');
-
-const BankDetailsSchema = new mongoose.Schema({
-    accountName: {
-        type: String,
-        required: true
-    },
-    accountNumber: {
-        type: String,
-        required: true,
-    },
-    bankName: {
-        type: String,
-        required: true,
-    },
-    branchName: {
-        type: String,
-        required: true,
-    },
-    branchCode: {
-        type: String,
-        required: false,
-    },
-    bankCode: {
-        type: String,
-        required: false,
-    },
-    isDefault: {
-        type: Boolean,
-        default: false
-    },
-    facilityId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'Facility'
-    },
-});
-
-const BankDetails = mongoose.model('BankDetails', BankDetailsSchema);
-
-module.exports = BankDetails;
+const mongoose = require('mongoose');
+
+const BankDetailsSchema = new mongoose.Schema({
+    accountName: {
+        type: String,
+        required: true
+    },
+    accountNumber: {
+        type: String,
+        required: true,
+    },
+    bankName: {
+        type: String,
+        required: true,
+    },
+    branchName: {
+        type: String,
+        required: true,
+    },
+    branchCode: {
+        type: String,
+        required: false,
+    },
+    bankCode: {
+        type: String,
+        required: false,
+    },
+    isDefault: {
+        type: Boolean,
+        default: false
+    },
+    facilityId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Facility'
+    },
+});
+
+const BankDetails = mongoose.model('BankDetails', BankDetailsSchema);
+
+module.exports = BankDetails;

package/src/models/billerAddress.js

@@ -1,120 +1,120 @@
-const mongoose = require("mongoose");
-
-// Define the schema for Biller Address
-const billerAddressSchema = new mongoose.Schema(
-  {
-    name: {
-      type: String,
-      required: [true, "Address name is required"],
-      trim: true,
-      minlength: [1, "Address name must be at least 1 character long"],
-    },
-    companyName: {
-      type: String,
-      required: [true, "Company name is required"],
-      trim: true,
-    },
-    website: {
-      type: String,
-      trim: true,
-      validate: {
-        validator: function (v) {
-          // If website is empty or null, it's valid (optional field)
-          if (!v || v.trim() === '') return true;
-
-          // Updated regex pattern that's more flexible for various URL formats
-          return /^(https?:\/\/)?(www\.)?[-a-zA-Z0-9@:%.\+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b([-a-zA-Z0-9()@:%\+.~#?&//=]*)$/.test(v);
-        },
-        message: "Please enter a valid website URL (e.g., https://example.com, www.example.com, or example.com)"
-      }
-    },
-    email: {
-      type: String,
-      required: [true, "Email is required"],
-      trim: true,
-      lowercase: true,
-      validate: {
-        validator: function (v) {
-          return /^\w+([\.-]?\w+)@\w+([\.-]?\w+)(\.\w{2,3})+$/.test(v);
-        },
-        message: "Please enter a valid email address"
-      }
-    },
-    phone: {
-      type: String,
-      trim: true,
-    },
-    address: {
-      type: String,
-      required: [true, "Address is required"],
-      trim: true,
-    },
-    city: {
-      type: String,
-      required: [true, "City is required"],
-      trim: true,
-    },
-    state: {
-      type: String,
-      trim: true,
-    },
-    country: {
-      type: String,
-      required: [true, "Country is required"],
-      trim: true,
-      default: "Kenya"
-    },
-    postalCode: {
-      type: String,
-      trim: true,
-    },
-    logo: {
-      type: String, // Will store the file path/URL of the uploaded logo
-      required: false,
-    },
-    isDefault: {
-      type: Boolean,
-      default: false,
-    },
-    facilityId: {
-      type: mongoose.Schema.Types.ObjectId,
-      ref: "Facility",
-      required: true,
-    },
-    createdBy: {
-      type: mongoose.Schema.Types.ObjectId,
-      ref: "User",
-    },
-    updatedBy: {
-      type: mongoose.Schema.Types.ObjectId,
-      ref: "User",
-    }
-  },
-  {
-    timestamps: true,
-  }
-);
-
-// Index for efficient queries
-billerAddressSchema.index({ facilityId: 1 });
-billerAddressSchema.index({ facilityId: 1, isDefault: 1 });
-
-// Pre-save middleware to ensure only one default address per facility
-billerAddressSchema.pre('save', async function (next) {
-  if (this.isDefault && this.isModified('isDefault')) {
-    // If this address is being set as default, unset all other defaults for this facility
-    await this.constructor.updateMany(
-      {
-        facilityId: this.facilityId,
-        _id: { $ne: this._id }
-      },
-      { $set: { isDefault: false } }
-    );
-  }
-  next();
-});
-
-// Compile the model from the schema
-const BillerAddress = mongoose.model("BillerAddress", billerAddressSchema);
-
+const mongoose = require("mongoose");
+
+// Define the schema for Biller Address
+const billerAddressSchema = new mongoose.Schema(
+  {
+    name: {
+      type: String,
+      required: [true, "Address name is required"],
+      trim: true,
+      minlength: [1, "Address name must be at least 1 character long"],
+    },
+    companyName: {
+      type: String,
+      required: [true, "Company name is required"],
+      trim: true,
+    },
+    website: {
+      type: String,
+      trim: true,
+      validate: {
+        validator: function (v) {
+          // If website is empty or null, it's valid (optional field)
+          if (!v || v.trim() === '') return true;
+
+          // Updated regex pattern that's more flexible for various URL formats
+          return /^(https?:\/\/)?(www\.)?[-a-zA-Z0-9@:%.\+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b([-a-zA-Z0-9()@:%\+.~#?&//=]*)$/.test(v);
+        },
+        message: "Please enter a valid website URL (e.g., https://example.com, www.example.com, or example.com)"
+      }
+    },
+    email: {
+      type: String,
+      required: [true, "Email is required"],
+      trim: true,
+      lowercase: true,
+      validate: {
+        validator: function (v) {
+          return /^\w+([\.-]?\w+)@\w+([\.-]?\w+)(\.\w{2,3})+$/.test(v);
+        },
+        message: "Please enter a valid email address"
+      }
+    },
+    phone: {
+      type: String,
+      trim: true,
+    },
+    address: {
+      type: String,
+      required: [true, "Address is required"],
+      trim: true,
+    },
+    city: {
+      type: String,
+      required: [true, "City is required"],
+      trim: true,
+    },
+    state: {
+      type: String,
+      trim: true,
+    },
+    country: {
+      type: String,
+      required: [true, "Country is required"],
+      trim: true,
+      default: "Kenya"
+    },
+    postalCode: {
+      type: String,
+      trim: true,
+    },
+    logo: {
+      type: String, // Will store the file path/URL of the uploaded logo
+      required: false,
+    },
+    isDefault: {
+      type: Boolean,
+      default: false,
+    },
+    facilityId: {
+      type: mongoose.Schema.Types.ObjectId,
+      ref: "Facility",
+      required: true,
+    },
+    createdBy: {
+      type: mongoose.Schema.Types.ObjectId,
+      ref: "User",
+    },
+    updatedBy: {
+      type: mongoose.Schema.Types.ObjectId,
+      ref: "User",
+    }
+  },
+  {
+    timestamps: true,
+  }
+);
+
+// Index for efficient queries
+billerAddressSchema.index({ facilityId: 1 });
+billerAddressSchema.index({ facilityId: 1, isDefault: 1 });
+
+// Pre-save middleware to ensure only one default address per facility
+billerAddressSchema.pre('save', async function (next) {
+  if (this.isDefault && this.isModified('isDefault')) {
+    // If this address is being set as default, unset all other defaults for this facility
+    await this.constructor.updateMany(
+      {
+        facilityId: this.facilityId,
+        _id: { $ne: this._id }
+      },
+      { $set: { isDefault: false } }
+    );
+  }
+  next();
+});
+
+// Compile the model from the schema
+const BillerAddress = mongoose.model("BillerAddress", billerAddressSchema);
+
 module.exports = BillerAddress;