payservedb 5.5.8 → 5.6.0

package/index.js

@@ -170,7 +170,8 @@ const models = {
     GLEntry: require('./src/models/gl_entries'),
     GLAccountDoubleEntries: require('./src/models/gl_account_double_entries'),
     PendingCredential: require('./src/models/pendingCredentials'),
-    UnitManagementTemplate: require('./src/models/unitManagementTemplate')
+    UnitManagementTemplate: require('./src/models/unitManagementTemplate'),
+    PropertyManagerRevenue: require('./src/models/propertyManagerRevenue')
 };
 
 // Function to get models dynamically from a specific database connection

package/package.json

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

package/src/models/facility.js

@@ -23,6 +23,7 @@ const facilitySchema = new mongoose.Schema({
         visitor: { type: Boolean, },
         levy: { type: Boolean, },
         maintenance: { type: Boolean, },
+        propertyManagement: { type: Boolean, },
         lease: { type: Boolean, },
         vas: { type: Boolean, },
         tickets: { type: Boolean, },
@@ -58,4 +59,4 @@ facilitySchema.index({ dbName: 1 });
 // Compile the model from the schema
 const Facility = mongoose.model('Facility', facilitySchema);
 
-module.exports = Facility;
+module.exports = Facility;

package/src/models/propertyManagerRevenue.js

@@ -0,0 +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);
+
+module.exports = PropertyManagerRevenue;

package/src/models/units.js

@@ -42,16 +42,27 @@ const unitSchema = new mongoose.Schema({
         type: mongoose.Schema.Types.ObjectId,
         ref: 'Facility',
     },
-
     homeOwnerId: {
         type: mongoose.Schema.Types.ObjectId,
         ref: 'Customer',
     },
+    isManagedByPropertyManager: {
+        type: Boolean,
+        default: false
+    },
+    propertyManagementFee: {
+        type: Number,
+        required: function () {
+            return this.isManagedByPropertyManager === true;
+        },
+        min: [0, "Property management fee must be at least 0"],
+        max: [100, "Property management fee cannot exceed 100%"]
+    },
     occupants: [
         {
             customerId: { type: mongoose.Schema.Types.ObjectId, ref: 'Customer' },
             customerType: { type: String, enum: ['home owner', 'tenant'] },
-            residentType: { type: String, enum: [ 'resident'] },
+            residentType: { type: String, enum: ['resident'] },
             moveInDate: { type: Date },
             moveOutDate: { type: Date, default: null }
         }
@@ -80,16 +91,23 @@ const unitSchema = new mongoose.Schema({
         type: mongoose.Schema.Types.ObjectId,
         ref: 'Customer',
     }
-
-
 }, {
     timestamps: true // Automatically add createdAt and updatedAt fields
 });
 
+// Add pre-save middleware to handle propertyManagementFee
+unitSchema.pre('save', function (next) {
+    // Clear propertyManagementFee if not managed by property manager
+    if (!this.isManagedByPropertyManager) {
+        this.propertyManagementFee = null;
+    }
+    next();
+});
+
 // Indexes for improved performance
 unitSchema.index({ name: 1 });
 
 // Compile the model from the schema
 const Unit = mongoose.model('Unit', unitSchema);
 
-module.exports = Unit;
+module.exports = Unit;

package/src/models/water_invoice.js

@@ -103,6 +103,7 @@ const waterInvoiceSchema = new mongoose.Schema(
       type: Number,
       default: 0
     },
+    imageUrl: { type: String, trim: true },
 
     // Invoice Note & Status
     invoiceNote: {