payservedb 6.0.9 → 6.1.1

package/package.json

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

package/src/models/powerMeterPowerCharges.js

@@ -6,45 +6,48 @@ const powerMeterPowerChargeSchema = new mongoose.Schema({
         ref: 'Facility',
         required: true
     },
-    meterSerialNumber: {
+    yearMonth: {
         type: String,
         required: true
     },
-    deviceId: {
+    // KPLC Power Charges
+    fuelCostCharge: {
         type: Number,
-        required: false
-
+        required: true
     },
-    gatewayId: {
-        type: String,
+    forexAdjustment: {
+        type: Number,
         required: true
-
     },
-    meterReading: {
+    inflationAdjustment: {
         type: Number,
-        required: true,
-
+        required: true
     },
-    lastUpdated: {
-        type: Date,
+    waterResourceManagementLevy: {
+        type: Number,
         required: true
-
     },
-    manufacturer: {
-        type: String,
+    energyRegulatoryLevy: {
+        type: Number,
         required: true
     },
-    type: {
-        type: String,
-        required: true,
-        enum: ['2 phase', '3 phase'],
-        default: '2 phase'
-
+    ruralElectrificationLevy: {
+        type: Number,
+        required: true
+    },
+    valueAddedTax: {
+        type: Number,
+        required: true
+    },
+    totalCharge: {
+        type: Number,
+        required: true
     }
+
 }, {
     timestamps: true
 });
 
 const PowerMeterPowerCharge = mongoose.model('PowerMeterPowerCharge', powerMeterPowerChargeSchema);
 
-module.exports = PowerMeterPowerCharge;
+module.exports = PowerMeterPowerCharge;

package/src/models/powerMeters.js

@@ -40,6 +40,10 @@ const powerMeterSchema = new mongoose.Schema({
         enum: ['2 phase', '3 phase'],
         default: '2 phase'
 
+    },
+    status: {
+        type: String,
+        required: true
     }
 }, {
     timestamps: true

package/src/models/propertyManagerContract.js

@@ -67,6 +67,10 @@ const PropertyManagerContractSchema = new Schema(
             type: Boolean, 
             default: false 
         },
+        balanceBroughtForward: {
+            type: Number,
+            default: 0
+        },
         // Management fee
         managementFee: {
             type: {
@@ -90,7 +94,7 @@ const PropertyManagerContractSchema = new Schema(
                 }
             }
         },
-        // GL Account configurations
+        // GL Account configurations - updated to match sample data structure
         invoiceDoubleEntryAccount: {
             type: mongoose.Schema.Types.ObjectId,
             ref: 'GLAccountDoubleEntries'
@@ -130,10 +134,26 @@ const PropertyManagerContractSchema = new Schema(
         createdBy: {
             type: mongoose.Schema.Types.ObjectId,
             ref: 'User' // References global User collection
+        },
+        // Additional fields for contract lifecycle management
+        suspensionReason: {
+            type: String
+        },
+        terminationReason: {
+            type: String
+        },
+        terminationDate: {
+            type: Date
+        },
+        completionDate: {
+            type: Date
         }
     },
     {
-        timestamps: true
+        timestamps: true,
+        // Ensure virtual fields are included in JSON output
+        toJSON: { virtuals: true },
+        toObject: { virtuals: true }
     }
 );
 
@@ -202,10 +222,11 @@ PropertyManagerContractSchema.pre('save', function (next) {
 PropertyManagerContractSchema.methods.syncWithLeaseData = async function(leaseData) {
     if (!leaseData) return;
     
-    // Update contract fields from lease data (removed balanceBroughtForward)
+    // Update contract fields from lease data
     this.startDate = leaseData.leaseTerms?.startDate || this.startDate;
     this.endDate = leaseData.leaseTerms?.endDate || this.endDate;
     this.paymentDueDate = leaseData.financialTerms?.paymentDueDate || this.paymentDueDate;
+    this.balanceBroughtForward = leaseData.financialTerms?.balanceBroughtForward || this.balanceBroughtForward;
     this.frequency = leaseData.billingCycle?.frequency || this.frequency;
     this.autoSend = leaseData.billingCycle?.autoSend !== undefined ? leaseData.billingCycle.autoSend : this.autoSend;
     this.nextInvoiceDate = leaseData.billingCycle?.nextInvoiceDate || this.nextInvoiceDate;
@@ -241,6 +262,7 @@ PropertyManagerContractSchema.virtual('durationInDays').get(function() {
     const diffTime = Math.abs(this.endDate - this.startDate);
     return Math.ceil(diffTime / (1000 * 60 * 60 * 24));
 });
+
 // Virtual for contract remaining days
 PropertyManagerContractSchema.virtual('remainingDays').get(function() {
     if (!this.endDate) return null;
@@ -250,6 +272,17 @@ PropertyManagerContractSchema.virtual('remainingDays').get(function() {
     return Math.ceil(diffTime / (1000 * 60 * 60 * 24));
 });
 
+// Virtual for management fee display
+PropertyManagerContractSchema.virtual('managementFeeDisplay').get(function() {
+    if (!this.managementFee) return null;
+    
+    if (this.managementFee.type === 'percentage') {
+        return `${this.managementFee.value}%`;
+    } else {
+        return `$${this.managementFee.value.toLocaleString()}`;
+    }
+});
+
 // Indexes for better query performance
 PropertyManagerContractSchema.index({ customerId: 1, status: 1 });
 PropertyManagerContractSchema.index({ facilityId: 1, status: 1 });
@@ -330,6 +363,32 @@ PropertyManagerContractSchema.statics.findContractsRequiringInvoicing = function
       .populate('customerId', 'firstName lastName email');
 };
 
+PropertyManagerContractSchema.statics.findContractsByFeeType = function(facilityId, feeType) {
+    return this.find({
+        facilityId: facilityId,
+        'managementFee.type': feeType
+    }).populate('propertyManager', 'fullName email')
+      .populate('units', 'name unitType')
+      .populate('customerId', 'firstName lastName email')
+      .sort({ 'managementFee.value': -1 });
+};
+
+PropertyManagerContractSchema.statics.getContractStatistics = function(facilityId) {
+    return this.aggregate([
+        {
+            $match: { facilityId: mongoose.Types.ObjectId(facilityId) }
+        },
+        {
+            $group: {
+                _id: '$status',
+                count: { $sum: 1 },
+                totalFeeValue: { $sum: '$managementFee.value' },
+                avgFeeValue: { $avg: '$managementFee.value' }
+            }
+        }
+    ]);
+};
+
 // Instance methods for contract management
 PropertyManagerContractSchema.methods.calculateNextInvoiceDate = function() {
     if (!this.lastInvoiceDate && !this.startDate) return null;
@@ -401,6 +460,32 @@ PropertyManagerContractSchema.methods.completeContract = async function() {
     return this.save();
 };
 
+// Method to calculate management fee for a given amount
+PropertyManagerContractSchema.methods.calculateManagementFee = function(baseAmount) {
+    if (!this.managementFee) return 0;
+    
+    if (this.managementFee.type === 'percentage') {
+        return (baseAmount * this.managementFee.value) / 100;
+    } else {
+        return this.managementFee.value;
+    }
+};
+
+// Method to get contract summary
+PropertyManagerContractSchema.methods.getContractSummary = function() {
+    return {
+        id: this._id,
+        contractName: this.contractName,
+        status: this.status,
+        duration: this.durationInDays,
+        remainingDays: this.remainingDays,
+        managementFee: this.managementFeeDisplay,
+        frequency: this.frequency,
+        nextInvoiceDate: this.nextInvoiceDate,
+        isComplete: this.isComplete
+    };
+};
+
 // Pre-findOneAndUpdate middleware to maintain data integrity
 PropertyManagerContractSchema.pre(['findOneAndUpdate', 'updateOne', 'updateMany'], function() {
     const update = this.getUpdate();
@@ -431,6 +516,11 @@ PropertyManagerContractSchema.post('save', function(doc) {
         console.log(`Contract status changed to: ${doc.status}`);
         // Add notification logic here
     }
+    
+    // Log invoice date updates
+    if (this.isModified('nextInvoiceDate') || this.isModified('lastInvoiceDate')) {
+        console.log(`Invoice dates updated for contract: ${doc.contractName}`);
+    }
 });
 
 // Error handling for validation errors
@@ -453,6 +543,8 @@ PropertyManagerContractSchema.methods.toJSON = function() {
     contract.missingRequiredFields = this.getMissingRequiredFields();
     contract.durationInDays = this.durationInDays;
     contract.remainingDays = this.remainingDays;
+    contract.managementFeeDisplay = this.managementFeeDisplay;
+    contract.contractSummary = this.getContractSummary();
     
     return contract;
 };
@@ -461,4 +553,4 @@ PropertyManagerContractSchema.methods.toJSON = function() {
 module.exports = {
     schema: PropertyManagerContractSchema,
     name: 'PropertyManagerContract'
-};
+};

package/src/models/propertyManagerRevenue.js

@@ -10,12 +10,14 @@ const propertyManagerRevenue = new mongoose.Schema({
     calculationDate: {
         type: Date,
         required: true,
-        index: true
+        index: true,
+        default: Date.now
     },
     dateRange: {
         startDate: Date,
         endDate: Date
     },
+    // Direct revenue amounts - no calculations needed
     totalRevenue: {
         type: Number,
         required: true,
@@ -23,14 +25,14 @@ const propertyManagerRevenue = new mongoose.Schema({
     },
     totalOwnerAmount: {
         type: Number,
-        required: true,
-        default: 0
+        default: 0  // Usually 0 for direct PM invoices
     },
     totalPaidAmount: {
         type: Number,
         required: true,
         default: 0
     },
+    // Processing statistics
     unitsProcessed: {
         type: Number,
         default: 0
@@ -39,63 +41,156 @@ const propertyManagerRevenue = new mongoose.Schema({
         type: Number,
         default: 0
     },
+    contractsProcessed: {
+        type: Number,
+        default: 0
+    },
+    // CRITICAL: Track processed invoice numbers to prevent duplicates
+    processedInvoiceNumbers: [{
+        type: String,
+        required: false
+    }],
+    // Unit breakdown - simplified
     unitBreakdown: [{
         unit: {
             type: mongoose.Schema.Types.ObjectId,
             ref: 'Unit',
             required: true
         },
-        unitName: String, // Denormalized for easier access
-        propertyManagementFee: Number,
-        totalPaid: Number,
-        managerRevenue: Number,
-        ownerAmount: Number,
-        invoiceCount: Number,
+        unitName: String,
+        contractId: {
+            type: mongoose.Schema.Types.ObjectId,
+            ref: 'PropertyManagerContract'
+        },
+        contractName: String,
+        propertyManager: {
+            id: {
+                type: mongoose.Schema.Types.ObjectId,
+                ref: 'User'
+            },
+            fullName: String,
+            email: String,
+            phoneNumber: String
+        },
+        // Revenue amounts for this unit
+        totalPaid: {
+            type: Number,
+            default: 0
+        },
+        managerRevenue: {
+            type: Number,
+            default: 0
+        },
+        ownerAmount: {
+            type: Number,
+            default: 0
+        },
+        invoiceCount: {
+            type: Number,
+            default: 0
+        },
+        // Invoice details
         invoices: [{
             invoice: {
                 type: mongoose.Schema.Types.ObjectId,
                 ref: 'Invoice',
                 required: true
             },
-            invoiceNumber: String, // Denormalized for easier access
+            invoiceNumber: {
+                type: String,
+                required: true,
+                index: true
+            },
             invoiceType: String,
             totalAmount: Number,
             paidAmount: Number,
             managerCommission: Number,
             ownerAmount: Number,
             paymentDate: Date,
-            managementFeePercent: Number
+            contractId: {
+                type: mongoose.Schema.Types.ObjectId,
+                ref: 'PropertyManagerContract'
+            },
+            contractName: String,
+            revenueSource: {
+                type: String,
+                enum: ['DirectPropertyManagerInvoice', 'CalculatedFromTenantInvoice', 'PropertyManagementInvoice'],
+                default: 'PropertyManagementInvoice'
+            }
         }]
     }],
     summary: {
         totalUnits: Number,
         totalInvoicesProcessed: Number,
-        includesHistoricalRevenue: Boolean,
+        contractsProcessed: Number,
         calculationNote: String
     },
     status: {
         type: String,
-        enum: ['calculated', 'paid', 'partially_paid', 'cancelled'],
+        enum: ['calculated', 'paid', 'cancelled'],
         default: 'calculated'
     },
     notes: String,
     createdBy: {
         type: mongoose.Schema.Types.ObjectId,
-        ref: 'User' // Reference to User who created this record
+        ref: 'User'
     },
-    createdAt: {
-        type: Date,
-        default: Date.now,
-        index: true
-    },
-    updatedAt: {
-        type: Date,
-        default: Date.now
+    calculationType: {
+        type: String,
+        enum: [
+            'direct_revenue', 
+            'bulk_direct_revenue', 
+            'retroactive_direct',
+            'revenue_extraction',
+            'bulk_revenue_extraction'
+        ],
+        default: 'direct_revenue'
     }
 }, {
     timestamps: true
 });
 
+// Enhanced indexes for better performance and duplicate prevention
+propertyManagerRevenue.index({ facility: 1, calculationDate: -1 });
+propertyManagerRevenue.index({ facility: 1, 'unitBreakdown.unit': 1 });
+propertyManagerRevenue.index({ facility: 1, calculationType: 1 });
+propertyManagerRevenue.index({ createdAt: -1 });
+
+// CRITICAL: Compound index for fast duplicate checking by invoice number
+propertyManagerRevenue.index({ 
+    facility: 1, 
+    'unitBreakdown.invoices.invoiceNumber': 1 
+});
+
+// CRITICAL: Index for processed invoice numbers array
+propertyManagerRevenue.index({ 
+    facility: 1, 
+    processedInvoiceNumbers: 1 
+});
+
+// Simple pre-save middleware to auto-populate processedInvoiceNumbers
+propertyManagerRevenue.pre('save', function(next) {
+    try {
+        // Auto-populate processedInvoiceNumbers from unitBreakdown if not set
+        if (!this.processedInvoiceNumbers || this.processedInvoiceNumbers.length === 0) {
+            const invoiceNumbers = [];
+            this.unitBreakdown.forEach(unit => {
+                if (unit.invoices && Array.isArray(unit.invoices)) {
+                    unit.invoices.forEach(invoice => {
+                        if (invoice.invoiceNumber) {
+                            invoiceNumbers.push(invoice.invoiceNumber);
+                        }
+                    });
+                }
+            });
+            this.processedInvoiceNumbers = [...new Set(invoiceNumbers)];
+        }
+        next();
+    } catch (error) {
+        next(error);
+    }
+});
+
 const PropertyManagerRevenue = mongoose.model('PropertyManagerRevenue', propertyManagerRevenue);
 
 module.exports = PropertyManagerRevenue;