payservedb 6.6.1 → 6.6.2

package/package.json

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

package/src/models/auditTrail.js

@@ -40,7 +40,7 @@ const userDetailsSchema = new mongoose.Schema(
       required: false,
     },
   },
-  { _id: false }
+  { _id: false },
 );
 
 // Main audit trail schema
@@ -125,6 +125,14 @@ const auditTrailSchema = new mongoose.Schema(
       required: true,
     },
 
+    // response status
+    response_status: {
+      type: String,
+      required: true,
+      enum: ["success", "error", "unknown"],
+      default: "unknown",
+    },
+
     // Method-specific data
     previous_data: {
       type: mongoose.Schema.Types.Mixed,
@@ -149,7 +157,7 @@ const auditTrailSchema = new mongoose.Schema(
   },
   {
     timestamps: true,
-  }
+  },
 );
 
 // Pre-save middleware for data validation and cleanup
@@ -202,7 +210,11 @@ auditTrailSchema.statics.findByActivity = function (activity, limit = 100) {
     .limit(limit);
 };
 
-auditTrailSchema.statics.findByFacility = function (facilityId, startDate, endDate) {
+auditTrailSchema.statics.findByFacility = function (
+  facilityId,
+  startDate,
+  endDate,
+) {
   const query = { "route_params.facilityId": facilityId };
   if (startDate || endDate) {
     query.timestamp = {};
@@ -252,10 +264,12 @@ auditTrailSchema.methods.getActivityType = function () {
 };
 
 auditTrailSchema.methods.isSuccessful = function () {
-  return this.activity.includes("Success") || 
-         (!this.activity.includes("Failed") && 
-          !this.activity.includes("Error") && 
-          !this.activity.includes("Not Found"));
+  return (
+    this.activity.includes("Success") ||
+    (!this.activity.includes("Failed") &&
+      !this.activity.includes("Error") &&
+      !this.activity.includes("Not Found"))
+  );
 };
 
 auditTrailSchema.methods.hasDataChanges = function () {
@@ -277,9 +291,21 @@ auditTrailSchema.index({ device_type: 1, timestamp: -1 }); // Device type querie
 auditTrailSchema.index({ browser: 1, timestamp: -1 }); // Browser-based queries
 
 // Compound indexes for common query patterns
-auditTrailSchema.index({ "user_details.userId": 1, activity: 1, timestamp: -1 }); // User + activity
-auditTrailSchema.index({ "route_params.facilityId": 1, method: 1, timestamp: -1 }); // Facility + method
-auditTrailSchema.index({ ip_address: 1, "user_details.userId": 1, timestamp: -1 }); // IP + user correlation
+auditTrailSchema.index({
+  "user_details.userId": 1,
+  activity: 1,
+  timestamp: -1,
+}); // User + activity
+auditTrailSchema.index({
+  "route_params.facilityId": 1,
+  method: 1,
+  timestamp: -1,
+}); // Facility + method
+auditTrailSchema.index({
+  ip_address: 1,
+  "user_details.userId": 1,
+  timestamp: -1,
+}); // IP + user correlation
 
 // Text search index for searching activities and user details
 auditTrailSchema.index({
@@ -292,7 +318,7 @@ auditTrailSchema.index({
 // Activity type constants
 auditTrailSchema.statics.ACTIVITY_TYPES = {
   CREATE: "CREATE",
-  UPDATE: "UPDATE", 
+  UPDATE: "UPDATE",
   DELETE: "DELETE",
   AUTH: "AUTH",
   OTHER: "OTHER",
@@ -317,4 +343,4 @@ auditTrailSchema.statics.DEVICE_TYPES = {
   UNKNOWN: "unknown",
 };
 
-module.exports = mongoose.model("AuditTrail", auditTrailSchema);
+module.exports = mongoose.model("AuditTrail", auditTrailSchema);

package/src/models/auditlog.js

@@ -1,83 +0,0 @@
-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;