payservedb 8.7.0 → 8.7.2

package/src/models/handover.js

@@ -1,258 +1,258 @@
-const mongoose = require('mongoose');
-
-const handoverItemSchema = new mongoose.Schema({
-  name: {
-    type: String,
-    required: true,
-    trim: true
-  },
-  category: {
-    type: String,
-    required: true,
-    trim: true,
-    enum: ['Furniture', 'Appliance', 'Electronics', 'Fixture', 'Utility', 'Other']
-  },
-  description: {
-    type: String,
-    trim: true
-  },
-  condition: {
-    type: String,
-    required: true,
-    enum: ['Excellent', 'Good', 'Fair', 'Poor', 'Damaged', 'Non-functional']
-  },
-  quantity: {
-    type: Number,
-    required: true,
-    default: 1,
-    min: [1, 'Quantity must be at least 1']
-  },
-  serialNumber: {
-    type: String,
-    trim: true
-  },
-  images: [{
-    type: String,  // URLs to stored images
-    trim: true
-  }],
-  notes: {
-    type: String,
-    trim: true
-  }
-}, { _id: true });
-
-// Define the main Handover schema
-const handoverSchema = new mongoose.Schema({
-  // References
-  facilityId: {
-    type: mongoose.Schema.Types.ObjectId,
-    ref: 'Facility',
-    required: true
-  },
-  unitId: {
-    type: mongoose.Schema.Types.ObjectId,
-    ref: 'Unit',
-    required: true
-  },
-  // IMPORTANT: For Customer, we don't specify 'ref' since it's in a different database
-  // This avoids the cross-database population errors
-  customerId: {
-    type: mongoose.Schema.Types.ObjectId,
-    required: true
-  },
-  
-  // Handover details
-  handoverType: {
-    type: String,
-    required: true,
-    enum: ['MoveIn', 'MoveOut'],
-    trim: true
-  },
-  handoverDate: {
-    type: Date,
-    required: true,
-    default: Date.now
-  },
-  status: {
-    type: String,
-    required: true,
-    enum: ['Draft', 'Completed', 'Disputed', 'Resolved'],
-    default: 'Draft'
-  },
-  
-  // If this is a move-out handover, reference the original move-in handover
-  relatedHandoverId: {
-    type: mongoose.Schema.Types.ObjectId,
-    ref: 'Handover',
-    default: null  // Only populated for move-out handovers
-  },
-  
-  // Items included in the handover
-  items: [handoverItemSchema],
-  
-  // Additional information
-  meterReadings: {
-    electricity: {
-      reading: Number,
-      imageUrl: String
-    },
-    water: {
-      reading: Number,
-      imageUrl: String
-    },
-    gas: {
-      reading: Number,
-      imageUrl: String
-    }
-  },
-  
-  // Key handover confirmation
-  keysHandedOver: {
-    type: Number,
-    default: 0,
-    min: 0
-  },
-  
-  // Security deposit info (for move-out)
-  securityDeposit: {
-    amount: {
-      type: Number,
-      default: 0
-    },
-    deductions: [{
-      reason: {
-        type: String,
-        trim: true
-      },
-      amount: {
-        type: Number,
-        min: 0
-      },
-      description: String,
-      currencyId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'Currency',
-        default: null
-      },
-      currency: {
-        type: mongoose.Schema.Types.Mixed,
-        default: null
-      },
-      invoiceId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'Invoice',
-        default: null
-      }
-    }],
-    refundAmount: {
-      type: Number,
-      default: 0
-    }
-  },
-  
-  // Signature and agreement info
-  signatures: {
-    propertyManager: {
-      signature: String,  // URL to stored signature image or digital signature data
-      date: Date
-    },
-    customer: {
-      signature: String,  // URL to stored signature image or digital signature data
-      date: Date,
-      agreement: {
-        type: Boolean,
-        default: false
-      }
-    }
-  },
-  
-  // General notes
-  notes: {
-    type: String,
-    trim: true
-  },
-  
-  // Any attached documents
-  attachments: [{
-    name: String, // Custom descriptive name (e.g., "Chair Image 23")
-    fileName: String, // Original file name
-    fileUrl: String,
-    uploadDate: {
-      type: Date,
-      default: Date.now
-    }
-  }]
-}, {
-  timestamps: true,
-  toJSON: { virtuals: true }, // Enable virtuals when converting to JSON
-  toObject: { virtuals: true } // Enable virtuals when converting to object
-});
-
-// Add indexes for common queries
-handoverSchema.index({ facilityId: 1, unitId: 1, handoverType: 1 });
-handoverSchema.index({ customerId: 1, handoverType: 1 });
-handoverSchema.index({ handoverDate: -1 });
-
-// Virtual for calculating total deductions
-handoverSchema.virtual('totalDeductions').get(function() {
-  if (!this.securityDeposit.deductions || this.securityDeposit.deductions.length === 0) {
-    return 0;
-  }
-  return this.securityDeposit.deductions.reduce((total, deduction) => total + (deduction.amount || 0), 0);
-});
-
-// Add method to compare move-in and move-out states
-handoverSchema.methods.compareWithMoveIn = async function() {
-  if (this.handoverType !== 'MoveOut' || !this.relatedHandoverId) {
-    throw new Error('This method can only be called on a move-out handover with a related move-in handover');
-  }
-  
-  // Find the related move-in handover
-  const MoveInHandover = mongoose.model('Handover');
-  const moveInHandover = await MoveInHandover.findById(this.relatedHandoverId);
-  
-  if (!moveInHandover) {
-    throw new Error('Related move-in handover not found');
-  }
-  
-  // Compare items and return differences
-  const differences = {
-    missing: [],
-    damaged: [],
-    changed: []
-  };
-  
-  // Check for missing or damaged items
-  moveInHandover.items.forEach(moveInItem => {
-    const moveOutItem = this.items.find(item => 
-      item.name === moveInItem.name && 
-      item.category === moveInItem.category
-    );
-    
-    if (!moveOutItem) {
-      differences.missing.push(moveInItem);
-    } else if (moveOutItem.condition !== moveInItem.condition) {
-      if (['Poor', 'Damaged', 'Non-functional'].includes(moveOutItem.condition)) {
-        differences.damaged.push({
-          item: moveOutItem,
-          originalCondition: moveInItem.condition,
-          currentCondition: moveOutItem.condition
-        });
-      } else {
-        differences.changed.push({
-          item: moveOutItem,
-          originalCondition: moveInItem.condition,
-          currentCondition: moveOutItem.condition
-        });
-      }
-    }
-  });
-  
-  return differences;
-};
-
-// Create and export the model with the standard pattern
-const Handover = mongoose.model('Handover', handoverSchema);
-
-module.exports = Handover;
-
+const mongoose = require('mongoose');
+
+const handoverItemSchema = new mongoose.Schema({
+  name: {
+    type: String,
+    required: true,
+    trim: true
+  },
+  category: {
+    type: String,
+    required: true,
+    trim: true,
+    enum: ['Furniture', 'Appliance', 'Electronics', 'Fixture', 'Utility', 'Other']
+  },
+  description: {
+    type: String,
+    trim: true
+  },
+  condition: {
+    type: String,
+    required: true,
+    enum: ['Excellent', 'Good', 'Fair', 'Poor', 'Damaged', 'Non-functional']
+  },
+  quantity: {
+    type: Number,
+    required: true,
+    default: 1,
+    min: [1, 'Quantity must be at least 1']
+  },
+  serialNumber: {
+    type: String,
+    trim: true
+  },
+  images: [{
+    type: String,  // URLs to stored images
+    trim: true
+  }],
+  notes: {
+    type: String,
+    trim: true
+  }
+}, { _id: true });
+
+// Define the main Handover schema
+const handoverSchema = new mongoose.Schema({
+  // References
+  facilityId: {
+    type: mongoose.Schema.Types.ObjectId,
+    ref: 'Facility',
+    required: true
+  },
+  unitId: {
+    type: mongoose.Schema.Types.ObjectId,
+    ref: 'Unit',
+    required: true
+  },
+  // IMPORTANT: For Customer, we don't specify 'ref' since it's in a different database
+  // This avoids the cross-database population errors
+  customerId: {
+    type: mongoose.Schema.Types.ObjectId,
+    required: true
+  },
+  
+  // Handover details
+  handoverType: {
+    type: String,
+    required: true,
+    enum: ['MoveIn', 'MoveOut'],
+    trim: true
+  },
+  handoverDate: {
+    type: Date,
+    required: true,
+    default: Date.now
+  },
+  status: {
+    type: String,
+    required: true,
+    enum: ['Draft', 'Completed', 'Disputed', 'Resolved'],
+    default: 'Draft'
+  },
+  
+  // If this is a move-out handover, reference the original move-in handover
+  relatedHandoverId: {
+    type: mongoose.Schema.Types.ObjectId,
+    ref: 'Handover',
+    default: null  // Only populated for move-out handovers
+  },
+  
+  // Items included in the handover
+  items: [handoverItemSchema],
+  
+  // Additional information
+  meterReadings: {
+    electricity: {
+      reading: Number,
+      imageUrl: String
+    },
+    water: {
+      reading: Number,
+      imageUrl: String
+    },
+    gas: {
+      reading: Number,
+      imageUrl: String
+    }
+  },
+  
+  // Key handover confirmation
+  keysHandedOver: {
+    type: Number,
+    default: 0,
+    min: 0
+  },
+  
+  // Security deposit info (for move-out)
+  securityDeposit: {
+    amount: {
+      type: Number,
+      default: 0
+    },
+    deductions: [{
+      reason: {
+        type: String,
+        trim: true
+      },
+      amount: {
+        type: Number,
+        min: 0
+      },
+      description: String,
+      currencyId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Currency',
+        default: null
+      },
+      currency: {
+        type: mongoose.Schema.Types.Mixed,
+        default: null
+      },
+      invoiceId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Invoice',
+        default: null
+      }
+    }],
+    refundAmount: {
+      type: Number,
+      default: 0
+    }
+  },
+  
+  // Signature and agreement info
+  signatures: {
+    propertyManager: {
+      signature: String,  // URL to stored signature image or digital signature data
+      date: Date
+    },
+    customer: {
+      signature: String,  // URL to stored signature image or digital signature data
+      date: Date,
+      agreement: {
+        type: Boolean,
+        default: false
+      }
+    }
+  },
+  
+  // General notes
+  notes: {
+    type: String,
+    trim: true
+  },
+  
+  // Any attached documents
+  attachments: [{
+    name: String, // Custom descriptive name (e.g., "Chair Image 23")
+    fileName: String, // Original file name
+    fileUrl: String,
+    uploadDate: {
+      type: Date,
+      default: Date.now
+    }
+  }]
+}, {
+  timestamps: true,
+  toJSON: { virtuals: true }, // Enable virtuals when converting to JSON
+  toObject: { virtuals: true } // Enable virtuals when converting to object
+});
+
+// Add indexes for common queries
+handoverSchema.index({ facilityId: 1, unitId: 1, handoverType: 1 });
+handoverSchema.index({ customerId: 1, handoverType: 1 });
+handoverSchema.index({ handoverDate: -1 });
+
+// Virtual for calculating total deductions
+handoverSchema.virtual('totalDeductions').get(function() {
+  if (!this.securityDeposit.deductions || this.securityDeposit.deductions.length === 0) {
+    return 0;
+  }
+  return this.securityDeposit.deductions.reduce((total, deduction) => total + (deduction.amount || 0), 0);
+});
+
+// Add method to compare move-in and move-out states
+handoverSchema.methods.compareWithMoveIn = async function() {
+  if (this.handoverType !== 'MoveOut' || !this.relatedHandoverId) {
+    throw new Error('This method can only be called on a move-out handover with a related move-in handover');
+  }
+  
+  // Find the related move-in handover
+  const MoveInHandover = mongoose.model('Handover');
+  const moveInHandover = await MoveInHandover.findById(this.relatedHandoverId);
+  
+  if (!moveInHandover) {
+    throw new Error('Related move-in handover not found');
+  }
+  
+  // Compare items and return differences
+  const differences = {
+    missing: [],
+    damaged: [],
+    changed: []
+  };
+  
+  // Check for missing or damaged items
+  moveInHandover.items.forEach(moveInItem => {
+    const moveOutItem = this.items.find(item => 
+      item.name === moveInItem.name && 
+      item.category === moveInItem.category
+    );
+    
+    if (!moveOutItem) {
+      differences.missing.push(moveInItem);
+    } else if (moveOutItem.condition !== moveInItem.condition) {
+      if (['Poor', 'Damaged', 'Non-functional'].includes(moveOutItem.condition)) {
+        differences.damaged.push({
+          item: moveOutItem,
+          originalCondition: moveInItem.condition,
+          currentCondition: moveOutItem.condition
+        });
+      } else {
+        differences.changed.push({
+          item: moveOutItem,
+          originalCondition: moveInItem.condition,
+          currentCondition: moveOutItem.condition
+        });
+      }
+    }
+  });
+  
+  return differences;
+};
+
+// Create and export the model with the standard pattern
+const Handover = mongoose.model('Handover', handoverSchema);
+
+module.exports = Handover;
+

package/src/models/inspection_category.js

@@ -1,38 +1,38 @@
-const mongoose = require('mongoose');
-
-// Define the schema for inspection categories
-const inspectionCategorySchema = new mongoose.Schema({
-  name: {
-    type: String,
-    required: [true, 'Category name is required'],
-    trim: true,
-    unique: false  // Unique per facility, not globally
-  },
-  description: {
-    type: String,
-    trim: true,
-    default: ''
-  },
-  active: {
-    type: Boolean,
-    default: true
-  },
-  facilityId: {
-    type: mongoose.Schema.Types.ObjectId,
-    ref: 'Facility',
-    required: true
-  }
-}, {
-  timestamps: true
-});
-
-// Add compound index to ensure unique category names per facility
-inspectionCategorySchema.index({ facilityId: 1, name: 1 }, { unique: true });
-
-// Add index for common queries
-inspectionCategorySchema.index({ facilityId: 1 });
-
-// Create InspectionCategory model
-const InspectionCategory = mongoose.model('InspectionCategory', inspectionCategorySchema);
-
-module.exports = InspectionCategory;
+const mongoose = require('mongoose');
+
+// Define the schema for inspection categories
+const inspectionCategorySchema = new mongoose.Schema({
+  name: {
+    type: String,
+    required: [true, 'Category name is required'],
+    trim: true,
+    unique: false  // Unique per facility, not globally
+  },
+  description: {
+    type: String,
+    trim: true,
+    default: ''
+  },
+  active: {
+    type: Boolean,
+    default: true
+  },
+  facilityId: {
+    type: mongoose.Schema.Types.ObjectId,
+    ref: 'Facility',
+    required: true
+  }
+}, {
+  timestamps: true
+});
+
+// Add compound index to ensure unique category names per facility
+inspectionCategorySchema.index({ facilityId: 1, name: 1 }, { unique: true });
+
+// Add index for common queries
+inspectionCategorySchema.index({ facilityId: 1 });
+
+// Create InspectionCategory model
+const InspectionCategory = mongoose.model('InspectionCategory', inspectionCategorySchema);
+
+module.exports = InspectionCategory;