payservedb 6.6.5 → 6.6.7

package/package.json

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

package/src/models/levycontract.js

@@ -65,6 +65,35 @@ const LevyContractSchema = new Schema(
         updatedBy: {
             type: mongoose.Schema.Types.ObjectId,
             ref: 'User'
+        },
+        // New termination-specific fields
+        terminationDate: {
+            type: Date
+        },
+        terminationReason: {
+            type: String
+        },
+        terminatedBy: {
+            type: mongoose.Schema.Types.ObjectId,
+            ref: 'User'
+        },
+        // Disable/reactivation tracking
+        disabledDate: {
+            type: Date
+        },
+        disabledBy: {
+            type: mongoose.Schema.Types.ObjectId,
+            ref: 'User'
+        },
+        disabledReason: {
+            type: String
+        },
+        reactivatedDate: {
+            type: Date
+        },
+        reactivatedBy: {
+            type: mongoose.Schema.Types.ObjectId,
+            ref: 'User'
         }
     },
     {
@@ -107,10 +136,32 @@ LevyContractSchema.pre('save', function (next) {
     }
 });
 
+// Pre-save middleware to handle termination and disable date logic
+LevyContractSchema.pre('save', function (next) {
+    // Set termination date when status changes to Terminated
+    if (this.status === 'Terminated' && !this.terminationDate) {
+        this.terminationDate = new Date();
+    }
+
+    // Set disabled date when status changes to Inactive
+    if (this.status === 'Inactive' && !this.disabledDate && this.isModified('status')) {
+        this.disabledDate = new Date();
+    }
+
+    // Set reactivated date when status changes from Inactive to Active
+    if (this.status === 'Active' && this.isModified('status') && this.disabledDate) {
+        this.reactivatedDate = new Date();
+    }
+
+    next();
+});
+
 // Index for efficient queries
 LevyContractSchema.index({ levyId: 1, unitId: 1, status: 1 });
 LevyContractSchema.index({ facilityId: 1 });
 LevyContractSchema.index({ customerId: 1 });
+LevyContractSchema.index({ status: 1 });
+LevyContractSchema.index({ terminationDate: 1 });
 
 module.exports = {
     schema: LevyContractSchema,

package/src/models/visitLog.js

@@ -15,12 +15,16 @@ const visitLogSchema = new mongoose.Schema({
         type: String,
         required: false
     },
+    phoneNumber: {
+        type: String,
+        trim: true
+    },
     residentId: {
         type: mongoose.Schema.Types.ObjectId,
     },
-    qrCode:{
-        type:Boolean,
-        required:false
+    qrCode: {
+        type: Boolean,
+        required: false
     },
     houseNumber: {
         type: String,
@@ -34,26 +38,26 @@ const visitLogSchema = new mongoose.Schema({
         type: Date, // Changed to Date for better handling of time
         required: false
     },
-    days:{
-        type:Number,
-        required:false
+    days: {
+        type: Number,
+        required: false
     },
-    division:{
-        type:String,
-        required:false
+    division: {
+        type: String,
+        required: false
     },
-    entryPoint:{
-        type:String,
-        required:false
+    entryPoint: {
+        type: String,
+        required: false
     },
-    exitPoint:{
-        type:String,
-        required:false
+    exitPoint: {
+        type: String,
+        required: false
     },
     status: {
         type: String,
         required: true,
-        enum: ['Visit Confirmation', 'Scheduled', 'Checked In','Checked Out', 'Cancelled'] // Define valid statuses
+        enum: ['Visit Confirmation', 'Scheduled', 'Checked In', 'Checked Out', 'Cancelled'] // Define valid statuses
         // Define valid statuses
     },
     vehicle: {
@@ -66,10 +70,10 @@ const visitLogSchema = new mongoose.Schema({
         type: Number,
         required: false
     },
-    requestedBy:{
-        type:mongoose.Schema.Types.ObjectId,
-        ref:"User",
-        required:false
+    requestedBy: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: "User",
+        required: false
     },
     facilityId: {
         type: mongoose.Schema.Types.ObjectId,