payservedb 8.7.3 → 8.7.5

package/package.json

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

package/src/models/servicerequest.js

@@ -43,10 +43,11 @@ const serviceRequestSchema = new mongoose.Schema({
     percentage: {
         type: Number,
     },
-    isCommissionSelected: {
-        type: Boolean,
-        default: false
-    }
+    raisedBy: {
+        type: String,
+        enum: ['ADMIN', 'RESIDENT'],
+        default: 'ADMIN'
+    },
 }, {
     timestamps: true
 });

package/src/models/vasvendor.js

@@ -1,39 +1,33 @@
 const mongoose = require('mongoose');
 
-// Define the schema for VasVendor
 const vasVendorSchema = new mongoose.Schema({
     facilityId: {
         type: mongoose.Schema.Types.ObjectId,
         ref: 'Facility',
-        required: true,
+        required: true
     },
     name: {
         type: String,
         required: true,
         trim: true
     },
-    location: {
-        type: String,
-        required: true,
-        trim: true
-    },
-    jobDescription: {
+    address: {
         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']
+    offers: [
+        {
+            serviceId: {
+                type: mongoose.Schema.Types.ObjectId,
+                ref: 'ValueAddedService',
+                required: true
+            },
+            amount: {
+                type: Number,
+                min: 0
+            }
         }
-    }],
+    ],
     contactDetails: {
         name: {
             type: String,
@@ -45,12 +39,17 @@ const vasVendorSchema = new mongoose.Schema({
         },
         email: {
             type: String,
-            required: true,
-            match: [/.+\@.+\..+/, 'Please provide a valid email address']
+            match: [/.+\@.+\..+/, 'Please provide a valid email']
         }
-    }
+    },
+    status: {
+        type: String,
+        enum: ["ACTIVE", "INACTIVE"],
+        default: "ACTIVE"
+    },
+    notes: String
 }, {
-    timestamps: true  // This will automatically add createdAt and updatedAt fields
+    timestamps: true
 });
 
 const VasVendor = mongoose.model('VasVendor', vasVendorSchema);