payservedb 2.7.4 → 2.7.6

package/index.js

@@ -4,18 +4,29 @@ require('dotenv').config()
 
 // Maintain a record of open connections for each database
 const connections = {};
-const url = '127.0.0.1:27017';
-const source = '?authSource=admin'
+
 
 // Utility function to connect to MongoDB
-async function connectToMongoDB(dbName) {
+async function connectToMongoDB(dbName, secured, username, password, url, port) {
     try {
-       
-        const connectionString = `mongodb://${url}/${dbName}${source}`;
-        await mongoose.connect(connectionString, {
-            useNewUrlParser: true,
-        });
-        console.log('Connected to MongoDB');
+        if (!secured) {
+            const url_ = url + ":" + port;
+            const connectionString = `mongodb://${url_}/${dbName}`;
+            await mongoose.connect(connectionString, {
+                useNewUrlParser: true,
+            });
+            console.log('Connected to MongoDB');
+        }
+        else {
+            const url_ = `${username}:${password}${url}${port}`;
+            const source = '?authSource=admin'
+            const connectionString = `mongodb://${url_}/${dbName}${source}`;
+            await mongoose.connect(connectionString, {
+                useNewUrlParser: true,
+            });
+            console.log('Connected to MongoDB');
+        }
+
     } catch (err) {
         console.error('Error connecting to MongoDB:', err);
         throw err;
@@ -89,7 +100,11 @@ const models = {
     Requisition:require('./src/models/maintenancerequisition'),
     LeaseAgreement:require('./src/models/leaseagreement'),
     WorkOrder:require('./src/models/workorder'),
-    ServiceInvoice:require('./src/models/service_invoice')
+    ServiceInvoice:require('./src/models/service_invoice'),
+    ValueAddedService:require('./src/models/valueaddedservices'),
+    VasInvoice:require('./src/models/vasinvoice'),
+    VasVendor:require('./src/models/vasvendor'),
+    ServiceRequest:require('./src/models/servicerequest')
     
 };
 

package/package.json

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

package/src/models/penalty.js

@@ -22,7 +22,6 @@ const penaltySchema = new mongoose.Schema(
     },
     amount: {
       type: Number,
-      required: true,
       min: [0, "Amount must be a positive number"],
     },
     module: {

package/src/models/servicerequest.js

@@ -0,0 +1,55 @@
+const mongoose = require('mongoose');
+
+// Define the schema for ServiceRequests
+const serviceRequestSchema = new mongoose.Schema({
+    facilityId: {
+        type: Number,
+        required: true
+    },
+    date: {
+        type: Date,
+        required: true
+    },
+    time: {
+        type: String,
+        required: true
+    },
+    serviceId: {
+        type: Number,
+        required: true
+    },
+    status: {
+        type: String,
+        required: true,
+        enum: ['Pending', 'In Progress', 'Completed', 'Cancelled'], 
+    },
+    customerId: {
+        type: Number,
+        required: true
+    },
+    // Fields for commission-related services (appears when isCommissionSelected is true)
+    frequency: {
+        type: String,
+        enum: ['Daily', 'Weekly', 'Monthly'],  
+        required: function () {
+            return this.isCommissionSelected;  
+        }
+    },
+    percentage: {
+        type: Number,
+        required: function () {
+            return this.isCommissionSelected;  
+        }
+    },
+    // Fields for non-commission-related services
+    isCommissionSelected: {
+        type: Boolean,
+        default: false  
+    }
+}, {
+    timestamps: true 
+});
+
+const ServiceRequest = mongoose.model('ServiceRequest', serviceRequestSchema);
+
+module.exports = ServiceRequest;

package/src/models/tickets.js

@@ -44,6 +44,37 @@ const ticketSchema = new mongoose.Schema({
   ticketNumber: {
     type: Number, 
   },
+  needsFix: {
+    type: String,
+    required: true,
+  },
+  byWho: {
+    type: String,
+    required: false,
+  },
+  selectedEmployee: {
+    type: String,
+    required: false,
+  },
+  selectedVendor: {
+    type: String,
+    required: false,
+  },
+  assessImage: {
+    type: String,
+  },
+  reviewText: {
+    type: String,
+    required: false,
+  },
+  amount: {
+    type: Number,
+    required: false,
+  },
+  payer: {
+    type: String,
+    required: false,
+  },
 }, {
   timestamps: true, 
 });

package/src/models/valueaddedservices.js

@@ -0,0 +1,21 @@
+const mongoose = require('mongoose');
+
+// Define the schema for ValueAddedServices
+const valueAddedServiceSchema = new mongoose.Schema({
+    facilityId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Facility',  
+        required: true
+    },
+    serviceName: {
+        type: String,
+        required: true,
+        trim: true
+    }
+}, {
+    timestamps: true  
+});
+
+const ValueAddedService = mongoose.model('ValueAddedService', valueAddedServiceSchema);
+
+module.exports = ValueAddedService;

package/src/models/vasinvoice.js

@@ -0,0 +1,42 @@
+const mongoose = require('mongoose');
+
+// Define the schema for VasInvoices
+const vasInvoiceSchema = new mongoose.Schema({
+    facilityId: {
+        type: Number,
+        required: true
+    },
+    serviceId: {
+        type: Number,
+        required: true
+    },
+    serviceVendorId: {
+        type: Number
+    },
+    customerId: {
+        type: Number,
+        required: true
+    },
+    status: {
+        type: String,
+        required: true,
+        enum: ['Pending', 'Paid', 'Cancelled', 'Overdue'],  // Example of possible statuses, can be adjusted as needed
+    },
+    time: {
+        type: String,
+        required: true
+    },
+    date: {
+        type: Date,
+        required: true
+    },
+    amount: {
+        type: Number
+    }
+}, {
+    timestamps: true  
+});
+
+const VasInvoice = mongoose.model('VasInvoice', vasInvoiceSchema);
+
+module.exports = VasInvoice;

package/src/models/vasvendor.js

@@ -0,0 +1,53 @@
+const mongoose = require('mongoose');
+
+// Define the schema for VasVendor
+const vasVendorSchema = new mongoose.Schema({
+    name: {
+        type: String,
+        required: true,
+        trim: true
+    },
+    location: {
+        type: String,
+        required: true,
+        trim: true
+    },
+    jobDescription: {
+        type: String,
+        required: true,
+        trim: true
+    },
+    offers: [{
+        serviceId: {
+            type: mongoose.Schema.Types.ObjectId,
+            ref: 'Service',  // Reference to the Service model
+            required: true
+        },
+        amount: {
+            type: Number,
+            required: true,
+            min: [0, 'Amount must be a positive number']
+        }
+    }],
+    contactDetails: {
+        name: {
+            type: String,
+            required: true
+        },
+        phone: {
+            type: String,
+            required: true
+        },
+        email: {
+            type: String,
+            required: true,
+            match: [/.+\@.+\..+/, 'Please provide a valid email address']
+        }
+    }
+}, {
+    timestamps: true  // This will automatically add createdAt and updatedAt fields
+});
+
+const VasVendor = mongoose.model('VasVendor', vasVendorSchema);
+
+module.exports = VasVendor;