payservedb 5.9.6 → 5.9.7

package/src/models/goodsReceivedNotes.js

@@ -1,61 +1,106 @@
-const mongoose = require('mongoose');
-
-const goodsReceivedNoteSchema = new mongoose.Schema({
-    facilityId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'Facility',
-        required: true,
-        index: true
-    },
-    poNumber: {
-        type: String,
-        required: true,
-        trim: true,
-        index: true
-    },
-    poId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'PurchaseOrder',
-        required: true,
-        index: true
-    },
-    quantityReceived: {
-        type: Number,
-        required: true,
-        min: 0
-    },
-    receivedBy: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'User',
-        required: true
-    },
-    receivedDate: {
-        type: Date,
-        required: true,
-        default: Date.now
-    },
-    description: {
-        type: String,
-        trim: true
-    },
-    files: [{
-        fileName: {
-            type: String,
-            required: true
-        },
-        fileType: {
-            type: String,
-            required: true
-        },
-        fileUrl: {
-            type: String,
-            required: true
-        }
-    }]
-}, {
-    timestamps: true
-});
-
-const GoodsReceivedNote = mongoose.model('GoodsReceivedNote', goodsReceivedNoteSchema);
-
-module.exports = GoodsReceivedNote;
+const mongoose = require('mongoose');
+
+const goodsReceivedNoteSchema = new mongoose.Schema({
+    facilityId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Facility',
+        required: true,
+        index: true
+    },
+    poNumber: {
+        type: String,
+        required: true,
+        trim: true,
+        index: true
+    },
+    poId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'PurchaseOrder',
+        required: true,
+        index: true
+    },
+    quantityReceived: {
+        type: Number,
+        required: true,
+        min: 0
+    },
+    receivedBy: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'User',
+        required: true
+    },
+    receivedDate: {
+        type: Date,
+        required: true,
+        default: Date.now
+    },
+    description: {
+        type: String,
+        trim: true
+    },
+    files: [{
+        fileName: {
+            type: String,
+            required: true
+        },
+        fileType: {
+            type: String,
+            required: true
+        },
+        fileUrl: {
+            type: String,
+            required: true
+        }
+    }],
+    approvalWorkflowId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'ApprovalWorkflow',
+        required: true
+      },
+      approvalStatus: {
+        type: String,
+        enum: ['pending', 'in_progress', 'approved', 'rejected'],
+        default: 'pending',
+        index: true
+      },
+      currentStep: {
+        type: Number,
+        default: 1,
+        min: 1
+      },
+      approvals: [{
+        stepNumber: {
+          type: Number,
+          required: true
+        },
+        stepName: {
+          type: String,
+          required: true
+        },
+        approvers: [{
+          userId: {
+            type: mongoose.Schema.Types.ObjectId,
+            ref: 'User',
+            required: true
+          },
+          status: {
+            type: String,
+            enum: ['pending', 'approved', 'rejected'],
+            default: 'pending'
+          },
+          actionDate: {
+            type: Date
+          },
+          comments: {
+            type: String,
+            trim: true
+          }
+        }]
+      }]
+}, {
+    timestamps: true
+});
+
+const GoodsReceivedNote = mongoose.model('GoodsReceivedNote', goodsReceivedNoteSchema);
+
+module.exports = GoodsReceivedNote;

package/src/models/guard.js

@@ -1,47 +1,47 @@
-const mongoose = require('mongoose');
-
-// Define the schema for guards
-const guardSchema = new mongoose.Schema({
-    firstName: {
-        type: String,
-        required: true
-    },
-    lastName: {
-        type: String,
-        required: true
-    },
-    phoneNumber: {
-        type: String,
-        required: true
-    },
-    email:{
-        type:String,
-        required:false
-    },
-    entryPoints: [],
-    startTime: {
-        type: String,
-        required: true
-    },
-    endTime: {
-        type: String,
-        required: true
-    },
-    status: {
-        type: String,
-        required: true,
-        enum: ["On Duty", "Off Duty", "On Break", "Absent", "Sick Leave", "Suspended"]
-    },
-    facilityId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'Facility',
-        required: true // Assuming facilityId is required
-    }
-}, {
-    timestamps: true // Automatically adds createdAt and updatedAt fields
-});
-
-// Compile the model from the schema
-const Guard = mongoose.model('Guard', guardSchema);
-
-module.exports = Guard;
+const mongoose = require('mongoose');
+
+// Define the schema for guards
+const guardSchema = new mongoose.Schema({
+    firstName: {
+        type: String,
+        required: true
+    },
+    lastName: {
+        type: String,
+        required: true
+    },
+    phoneNumber: {
+        type: String,
+        required: true
+    },
+    email:{
+        type:String,
+        required:false
+    },
+    entryPoints: [],
+    startTime: {
+        type: String,
+        required: true
+    },
+    endTime: {
+        type: String,
+        required: true
+    },
+    status: {
+        type: String,
+        required: true,
+        enum: ["On Duty", "Off Duty", "On Break", "Absent", "Sick Leave", "Suspended"]
+    },
+    facilityId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Facility',
+        required: true // Assuming facilityId is required
+    }
+}, {
+    timestamps: true // Automatically adds createdAt and updatedAt fields
+});
+
+// Compile the model from the schema
+const Guard = mongoose.model('Guard', guardSchema);
+
+module.exports = Guard;