payservedb 6.0.9 → 6.1.0

package/package.json

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

package/src/models/powerMeterPowerCharges.js

@@ -6,45 +6,44 @@ const powerMeterPowerChargeSchema = new mongoose.Schema({
         ref: 'Facility',
         required: true
     },
-    meterSerialNumber: {
-        type: String,
+    // KPLC Power Charges
+    fuelCostCharge: {
+        type: Number,
         required: true
     },
-    deviceId: {
+    forexAdjustment: {
         type: Number,
-        required: false
-
+        required: true
     },
-    gatewayId: {
-        type: String,
+    inflationAdjustment: {
+        type: Number,
         required: true
-
     },
-    meterReading: {
+    waterResourceManagementLevy: {
         type: Number,
-        required: true,
-
+        required: true
     },
-    lastUpdated: {
-        type: Date,
+    energyRegulatoryLevy: {
+        type: Number,
         required: true
-
     },
-    manufacturer: {
-        type: String,
+    ruralElectrificationLevy: {
+        type: Number,
         required: true
     },
-    type: {
-        type: String,
-        required: true,
-        enum: ['2 phase', '3 phase'],
-        default: '2 phase'
-
+    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/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;