payservedb 2.7.8 → 2.7.10

package/index.js

@@ -9,7 +9,7 @@ const connections = {};
 // Utility function to connect to MongoDB
 async function connectToMongoDB(dbName, secured, username, password, url, port) {
     try {
-        if (!secured) {
+        if (secured === false) {
             const url_ = url + ":" + port;
             const connectionString = `mongodb://${url_}/${dbName}`;
             await mongoose.connect(connectionString, {
@@ -97,7 +97,7 @@ const models = {
     Ticket:require('./src/models/tickets'),
     Stocksandspare:require('./src/models/stocksandspare'),
     ServiceVendor:require('./src/models/servicevendor'),
-    MaintenanceService:require('./src/models/maintenanceservice'),
+    MaintenanceServices:require('./src/models/maintenance_services'),
     Requisition:require('./src/models/maintenancerequisition'),
     LeaseAgreement:require('./src/models/leaseagreement'),
     WorkOrder:require('./src/models/workorder'),

package/package.json

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

package/src/models/leaseagreement.js

@@ -19,7 +19,7 @@ const leaseAgreementSchema = new mongoose.Schema({
     },
     landlord: {
         type: mongoose.Schema.Types.ObjectId,
-        ref: 'User',
+        ref: 'Customer',
         required: true
     },
     leaseTerms: {
@@ -85,4 +85,4 @@ const leaseAgreementSchema = new mongoose.Schema({
 
 const LeaseAgreement = mongoose.model('LeaseAgreement', leaseAgreementSchema);
 
-module.exports = LeaseAgreement;
+module.exports = LeaseAgreement;

package/src/models/{maintenanceservice.js → maintenance_services.js}

@@ -1,6 +1,6 @@
 const mongoose = require('mongoose');
 
-const maintenanceServiceSchema = new mongoose.Schema({
+const maintenanceServicesSchema = new mongoose.Schema({
     name: {
         type: String,
         required: true,
@@ -14,4 +14,4 @@ const maintenanceServiceSchema = new mongoose.Schema({
     timestamps: true, 
 });
 
-module.exports = mongoose.model('MaintenanceService', maintenanceServiceSchema);
+module.exports = mongoose.model('MaintenanceServices', maintenanceServicesSchema);

package/src/models/workorder.js

@@ -6,35 +6,40 @@ const workOrderSchema = new mongoose.Schema({
     ref: 'Facility',
     required: true,
   },
-    workDescription: {
-      type: String,
-      required: true,
-      trim: true,
-    },
-    assignedTo: {
-      type: String,
-      required: true,
-      trim: true,
-    },
-    status: {
-      type: String,
-      enum: ['in progress', 'completed', 'suspended', 'pending' , 'cancelled'],
-      default: 'pending',
-    },
-    orderNumber: {
-      type: Number,
-      unique: true, 
-      required: true
-    },
-    payment: {
-      type: Number,
-      required: true,
-      min: 0,
-    },
-  }, {
-    timestamps: true, 
-  });
-  
-  const WorkOrder = mongoose.model('WorkOrder', workOrderSchema);
-  
-  module.exports = WorkOrder;
+  requester: {
+    type: mongoose.Schema.Types.ObjectId,
+    ref: 'User', 
+    required: true,
+  },
+  description: {
+    type: String,
+    required: true,
+    trim: true,
+  },
+  pricing: {
+    type: Number,
+    required: true,
+    min: 0,
+  },
+  status: {
+    type: String,
+    enum: ['in progress', 'completed', 'suspended', 'pending', 'cancelled'],
+    default: 'pending',
+  },
+  type: {
+    type: String,
+    enum: ['scheduled', 'unscheduled'],
+    required: true,
+  },
+  orderNumber: {
+    type: Number,
+    unique: true,
+    required: true,
+  },
+}, {
+  timestamps: true, 
+});
+
+const WorkOrder = mongoose.model('WorkOrder', workOrderSchema);
+
+module.exports = WorkOrder;