payservedb 2.5.5 → 2.5.7

package/index.js

@@ -83,8 +83,11 @@ const models = {
     Lease:require('./src/models/lease'),
     LeaseTemplate:require('./src/models/leasetemplate'),
     Report:require('./src/models/report'),
-    Ticket:require('./src/models/ticket'),
-    Stocksandspare:require('./src/models/stocksandspare')
+    Ticket:require('./src/models/tickets'),
+    Stocksandspare:require('./src/models/stocksandspare'),
+    ServiceVendor:require('./src/models/servicevendor'),
+    MaintenanceService:require('./src/models/maintenanceservice'),
+    Requisition:require('./src/models/maintenancerequisition')
     
 };
 

package/package.json

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

package/src/models/asset.js

@@ -19,10 +19,6 @@ const assetSchema = new mongoose.Schema({
     type: String, // Year or full date, e.g., '2023' or '2023-01-01'
     required: true,
   },
-  // assignedTo: {
-  //   type: String, // Name of the person or department the asset is assigned to 
-  //   default: 'Unassigned', // Default if not yet assigned
-  // }, Commented out, moved to the vendor schema
   insuranceStatus: {
     type: String,
     enum: ['Insured', 'Not Insured', 'Expired'], 

package/src/models/maintenancerequisition.js

@@ -0,0 +1,39 @@
+const mongoose = require('mongoose');
+
+const requisitionSchema = new mongoose.Schema({
+    facilityId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Facility', 
+        required: true,
+    },
+    spareOrStockId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Stocksandspare', 
+        required: true,
+    },
+    vendorId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'ServiceVendor', 
+        required: true,
+    },
+    date: {
+        type: Date, 
+        required: true,
+        default: Date.now,
+    },
+    quantity: {
+        type: Number, 
+        required: true,
+        min: 1, 
+    },
+    status: {
+        type: String,
+        enum: ['Pending', 'Approved', 'Rejected', 'Completed'], 
+        required: true,
+        default: 'Pending',
+    },
+}, {
+    timestamps: true, 
+});
+
+module.exports = mongoose.model('Requisition', requisitionSchema);

package/src/models/maintenanceservice.js

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

package/src/models/servicevendor.js

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

package/src/models/stocksandspare.js

@@ -20,25 +20,6 @@ const stockAndSparesSchema = new mongoose.Schema({
     required: true,
     min: 0,
   },
-  requisitions: [
-    {
-      date: {
-        type: Date, 
-        required: true,
-        default: Date.now,
-      },
-      quantity: {
-        type: Number, 
-        required: true,
-        min: 1, // Minimum requisition is 1
-      },
-      status: {
-        type: String,
-        enum: ['Pending', 'Approved', 'Rejected', 'Completed'], 
-        required: true,
-      },
-    },
-  ],
 }, {
   timestamps: true,
 });