payservedb 5.7.9 → 5.8.1

package/src/models/propertyManagerRevenue.js

@@ -1,101 +1,101 @@
-const mongoose = require('mongoose');
-
-const propertyManagerRevenue = new mongoose.Schema({
-    facility: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'Facility',
-        required: true,
-        index: true
-    },
-    calculationDate: {
-        type: Date,
-        required: true,
-        index: true
-    },
-    dateRange: {
-        startDate: Date,
-        endDate: Date
-    },
-    totalRevenue: {
-        type: Number,
-        required: true,
-        default: 0
-    },
-    totalOwnerAmount: {
-        type: Number,
-        required: true,
-        default: 0
-    },
-    totalPaidAmount: {
-        type: Number,
-        required: true,
-        default: 0
-    },
-    unitsProcessed: {
-        type: Number,
-        default: 0
-    },
-    invoicesProcessed: {
-        type: Number,
-        default: 0
-    },
-    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,
-        invoices: [{
-            invoice: {
-                type: mongoose.Schema.Types.ObjectId,
-                ref: 'Invoice',
-                required: true
-            },
-            invoiceNumber: String, // Denormalized for easier access
-            invoiceType: String,
-            totalAmount: Number,
-            paidAmount: Number,
-            managerCommission: Number,
-            ownerAmount: Number,
-            paymentDate: Date,
-            managementFeePercent: Number
-        }]
-    }],
-    summary: {
-        totalUnits: Number,
-        totalInvoicesProcessed: Number,
-        includesHistoricalRevenue: Boolean,
-        calculationNote: String
-    },
-    status: {
-        type: String,
-        enum: ['calculated', 'paid', 'partially_paid', 'cancelled'],
-        default: 'calculated'
-    },
-    notes: String,
-    createdBy: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'User' // Reference to User who created this record
-    },
-    createdAt: {
-        type: Date,
-        default: Date.now,
-        index: true
-    },
-    updatedAt: {
-        type: Date,
-        default: Date.now
-    }
-}, {
-    timestamps: true
-});
-
-const PropertyManagerRevenue = mongoose.model('PropertyManagerRevenue', propertyManagerRevenue);
-
+const mongoose = require('mongoose');
+
+const propertyManagerRevenue = new mongoose.Schema({
+    facility: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Facility',
+        required: true,
+        index: true
+    },
+    calculationDate: {
+        type: Date,
+        required: true,
+        index: true
+    },
+    dateRange: {
+        startDate: Date,
+        endDate: Date
+    },
+    totalRevenue: {
+        type: Number,
+        required: true,
+        default: 0
+    },
+    totalOwnerAmount: {
+        type: Number,
+        required: true,
+        default: 0
+    },
+    totalPaidAmount: {
+        type: Number,
+        required: true,
+        default: 0
+    },
+    unitsProcessed: {
+        type: Number,
+        default: 0
+    },
+    invoicesProcessed: {
+        type: Number,
+        default: 0
+    },
+    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,
+        invoices: [{
+            invoice: {
+                type: mongoose.Schema.Types.ObjectId,
+                ref: 'Invoice',
+                required: true
+            },
+            invoiceNumber: String, // Denormalized for easier access
+            invoiceType: String,
+            totalAmount: Number,
+            paidAmount: Number,
+            managerCommission: Number,
+            ownerAmount: Number,
+            paymentDate: Date,
+            managementFeePercent: Number
+        }]
+    }],
+    summary: {
+        totalUnits: Number,
+        totalInvoicesProcessed: Number,
+        includesHistoricalRevenue: Boolean,
+        calculationNote: String
+    },
+    status: {
+        type: String,
+        enum: ['calculated', 'paid', 'partially_paid', 'cancelled'],
+        default: 'calculated'
+    },
+    notes: String,
+    createdBy: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'User' // Reference to User who created this record
+    },
+    createdAt: {
+        type: Date,
+        default: Date.now,
+        index: true
+    },
+    updatedAt: {
+        type: Date,
+        default: Date.now
+    }
+}, {
+    timestamps: true
+});
+
+const PropertyManagerRevenue = mongoose.model('PropertyManagerRevenue', propertyManagerRevenue);
+
 module.exports = PropertyManagerRevenue;

package/src/models/purchase_order.js

@@ -1,203 +1,203 @@
-const mongoose = require('mongoose');
-
-const purchaseOrderSchema = new mongoose.Schema({
-    // Main Purchase Order Information
-    facilityId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'Facility',
-        required: true,
-        index: true
-    },
-    poNumber: {
-        type: String,
-        required: true,
-        unique: true,
-        trim: true,
-        index: true
-    },
-    prNumber: {
-        type: String,
-        trim: true,
-        index: true,
-        ref: 'PurchaseRequest'
-    },
-    rfqNumber: {
-        type: String,
-        trim: true,
-        index: true,
-        ref: 'RFQDetails'
-    },
-    supplier: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'Supplier',
-        required: true
-    },
-    department: {
-        type: String,
-        required: true,
-        trim: true
-    },
-    currency: {
-        type: String,
-        required: true,
-        trim: true,
-        default: 'KES'
-    },
-    date: {
-        type: Date,
-        required: true,
-        default: Date.now
-    },
-    internalNotes: {
-        type: String,
-        trim: true
-    },
-    supplierNotes: {
-        type: String,
-        trim: true
-    },
-    budget: {
-        type: String,
-        trim: true,
-        index: true,
-        ref: 'Budget'
-    },
-    status: {
-        type: String,
-        enum: ['pending approval', 'approved', 'rejected', 'sent', 'received', 'completed', 'canceled'],
-        default: 'pending approval',
-        index: true
-    },
-
-    // Items Details
-    items: [{
-        itemDescription: {
-            type: String,
-            required: true,
-            trim: true
-        },
-        quantity: {
-            type: Number,
-            required: true
-        },
-        unitOfMeasure: {
-            type: String,
-            required: true,
-            trim: true
-        },
-        unitPrice: {
-            type: Number,
-            required: true
-        },
-        taxRate: {
-            type: Number,
-            default: 0
-        },
-        totalPrice: {
-            type: Number,
-            required: true
-        }
-    }],
-
-    // Calculated Totals
-    subtotal: {
-        type: Number,
-        required: true
-    },
-    taxTotal: {
-        type: Number,
-        required: true,
-        default: 0
-    },
-    grandTotal: {
-        type: Number,
-        required: true
-    },
-    // Document attachments
-    attachments: [{
-        name: {
-            type: String,
-            required: true
-        },
-        fileType: {
-            type: String,
-            required: true
-        },
-        filePath: {
-            type: String,
-            required: true
-        },
-        uploadDate: {
-            type: Date,
-            default: Date.now
-        }
-    }],
-    approvalWorkflowId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'ApprovalWorkflow',
-        required: true
-    },
-    approvalStatus: {
-        type: String,
-        enum: ['pending', 'in_progress', 'approved', 'rejected'],
-        default: 'pending',
-        index: true
-    },
-    currentStep: {
-        type: Number,
-        default: 1,
-        min: 1
-    },
-    approvals: [{
-        stepNumber: {
-            type: Number,
-            required: true
-        },
-        stepName: {
-            type: String,
-            required: true
-        },
-        approvers: [{
-            userId: {
-                type: mongoose.Schema.Types.ObjectId,
-                ref: 'User',
-                required: true
-            },
-            status: {
-                type: String,
-                enum: ['pending', 'approved', 'rejected'],
-                default: 'pending'
-            },
-            actionDate: {
-                type: Date
-            },
-            comments: {
-                type: String,
-                trim: true
-            }
-        }]
-    }]
-}, {
-    timestamps: true
-});
-
-// Pre-save middleware to calculate totals
-purchaseOrderSchema.pre('save', function (next) {
-    // Calculate subtotal
-    this.subtotal = this.items.reduce((sum, item) => sum + (item.unitPrice * item.quantity), 0);
-
-    // Calculate tax total
-    this.taxTotal = this.items.reduce((sum, item) => {
-        const itemTax = (item.unitPrice * item.quantity) * (item.taxRate / 100);
-        return sum + itemTax;
-    }, 0);
-
-    // Calculate grand total
-    this.grandTotal = this.subtotal + this.taxTotal;
-
-    next();
-});
-
-const PurchaseOrder = mongoose.model('PurchaseOrder', purchaseOrderSchema);
-
+const mongoose = require('mongoose');
+
+const purchaseOrderSchema = new mongoose.Schema({
+    // Main Purchase Order Information
+    facilityId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Facility',
+        required: true,
+        index: true
+    },
+    poNumber: {
+        type: String,
+        required: true,
+        unique: true,
+        trim: true,
+        index: true
+    },
+    prNumber: {
+        type: String,
+        trim: true,
+        index: true,
+        ref: 'PurchaseRequest'
+    },
+    rfqNumber: {
+        type: String,
+        trim: true,
+        index: true,
+        ref: 'RFQDetails'
+    },
+    supplier: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Supplier',
+        required: true
+    },
+    department: {
+        type: String,
+        required: true,
+        trim: true
+    },
+    currency: {
+        type: String,
+        required: true,
+        trim: true,
+        default: 'KES'
+    },
+    date: {
+        type: Date,
+        required: true,
+        default: Date.now
+    },
+    internalNotes: {
+        type: String,
+        trim: true
+    },
+    supplierNotes: {
+        type: String,
+        trim: true
+    },
+    budget: {
+        type: String,
+        trim: true,
+        index: true,
+        ref: 'Budget'
+    },
+    status: {
+        type: String,
+        enum: ['pending approval', 'approved', 'rejected', 'sent', 'received', 'completed', 'canceled'],
+        default: 'pending approval',
+        index: true
+    },
+
+    // Items Details
+    items: [{
+        itemDescription: {
+            type: String,
+            required: true,
+            trim: true
+        },
+        quantity: {
+            type: Number,
+            required: true
+        },
+        unitOfMeasure: {
+            type: String,
+            required: true,
+            trim: true
+        },
+        unitPrice: {
+            type: Number,
+            required: true
+        },
+        taxRate: {
+            type: Number,
+            default: 0
+        },
+        totalPrice: {
+            type: Number,
+            required: true
+        }
+    }],
+
+    // Calculated Totals
+    subtotal: {
+        type: Number,
+        required: true
+    },
+    taxTotal: {
+        type: Number,
+        required: true,
+        default: 0
+    },
+    grandTotal: {
+        type: Number,
+        required: true
+    },
+    // Document attachments
+    attachments: [{
+        name: {
+            type: String,
+            required: true
+        },
+        fileType: {
+            type: String,
+            required: true
+        },
+        filePath: {
+            type: String,
+            required: true
+        },
+        uploadDate: {
+            type: Date,
+            default: Date.now
+        }
+    }],
+    approvalWorkflowId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'ApprovalWorkflow',
+        required: true
+    },
+    approvalStatus: {
+        type: String,
+        enum: ['pending', 'in_progress', 'approved', 'rejected'],
+        default: 'pending',
+        index: true
+    },
+    currentStep: {
+        type: Number,
+        default: 1,
+        min: 1
+    },
+    approvals: [{
+        stepNumber: {
+            type: Number,
+            required: true
+        },
+        stepName: {
+            type: String,
+            required: true
+        },
+        approvers: [{
+            userId: {
+                type: mongoose.Schema.Types.ObjectId,
+                ref: 'User',
+                required: true
+            },
+            status: {
+                type: String,
+                enum: ['pending', 'approved', 'rejected'],
+                default: 'pending'
+            },
+            actionDate: {
+                type: Date
+            },
+            comments: {
+                type: String,
+                trim: true
+            }
+        }]
+    }]
+}, {
+    timestamps: true
+});
+
+// Pre-save middleware to calculate totals
+purchaseOrderSchema.pre('save', function (next) {
+    // Calculate subtotal
+    this.subtotal = this.items.reduce((sum, item) => sum + (item.unitPrice * item.quantity), 0);
+
+    // Calculate tax total
+    this.taxTotal = this.items.reduce((sum, item) => {
+        const itemTax = (item.unitPrice * item.quantity) * (item.taxRate / 100);
+        return sum + itemTax;
+    }, 0);
+
+    // Calculate grand total
+    this.grandTotal = this.subtotal + this.taxTotal;
+
+    next();
+});
+
+const PurchaseOrder = mongoose.model('PurchaseOrder', purchaseOrderSchema);
+
 module.exports = PurchaseOrder;