payservedb 9.2.8 → 9.3.0

package/src/models/power_prepaid_orders.js

@@ -1,79 +1,79 @@
-const mongoose = require('mongoose');
-
-const PowerPrepaidOrderSchema = new mongoose.Schema({
-    orderNo: {
-        type: String,
-        required: true,
-        unique: true
-    },
-    energy_charge: {
-        type: String,
-        required: true
-    },
-    fuel_cost_charge: {
-        type: String,
-        required: true
-    },
-    forex_adjustment_charge: {
-        type: String,
-        required: true
-    },
-    inflation_adjustment_charge: {
-        type: String,
-        required: true
-    },
-    warma_levy_charge: {
-        type: String,
-        required: true
-    },
-    erc_levy_charge: {
-        type: String,
-        required: true
-    },
-    rep_levy_charge: {
-        type: String,
-        required: true
-    },
-    power_factor_surchage: {
-        type: Number,
-        default: 0
-    },
-    vat: {
-        type: String,
-        required: true
-    },
-    total_amount: {
-        type: Number,
-        required: true
-    },
-    year_month: {
-        type: String,
-        required: true
-    },
-    added_on: {
-        type: String,
-        required: true
-    },
-    time: {
-        type: String,
-        required: true
-    },
-    customer_type: {
-        type: String,
-        required: true
-    },
-    units: {
-        type: Number,
-        required: true
-    },
-    tenant_id: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'Customer',
-    }
-}, {
-    timestamps: true
-});
-
-const PowerPrepaidOrder = mongoose.model('PowerPrepaidOrder', PowerPrepaidOrderSchema);
-
+const mongoose = require('mongoose');
+
+const PowerPrepaidOrderSchema = new mongoose.Schema({
+    orderNo: {
+        type: String,
+        required: true,
+        unique: true
+    },
+    energy_charge: {
+        type: String,
+        required: true
+    },
+    fuel_cost_charge: {
+        type: String,
+        required: true
+    },
+    forex_adjustment_charge: {
+        type: String,
+        required: true
+    },
+    inflation_adjustment_charge: {
+        type: String,
+        required: true
+    },
+    warma_levy_charge: {
+        type: String,
+        required: true
+    },
+    erc_levy_charge: {
+        type: String,
+        required: true
+    },
+    rep_levy_charge: {
+        type: String,
+        required: true
+    },
+    power_factor_surchage: {
+        type: Number,
+        default: 0
+    },
+    vat: {
+        type: String,
+        required: true
+    },
+    total_amount: {
+        type: Number,
+        required: true
+    },
+    year_month: {
+        type: String,
+        required: true
+    },
+    added_on: {
+        type: String,
+        required: true
+    },
+    time: {
+        type: String,
+        required: true
+    },
+    customer_type: {
+        type: String,
+        required: true
+    },
+    units: {
+        type: Number,
+        required: true
+    },
+    tenant_id: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Customer',
+    }
+}, {
+    timestamps: true
+});
+
+const PowerPrepaidOrder = mongoose.model('PowerPrepaidOrder', PowerPrepaidOrderSchema);
+
 module.exports = PowerPrepaidOrder;

package/src/models/power_sms_notification.js

@@ -1,27 +1,27 @@
-const mongoose = require('mongoose');
-
-const PowerNotificationSchema = new mongoose.Schema({
-    accountId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'PowerMeterAccount',
-        required: true
-    },
-    currentRange: {
-        type: String,
-        required: true
-    },
-    lastNotificationDate: {
-        type: Date,
-        default: Date.now
-    },
-    balance: {
-        type: Number,
-        required: true
-    }
-}, {
-    timestamps: true
-});
-
-const PowerNotification = mongoose.model('PowerNotification', PowerNotificationSchema)
-
+const mongoose = require('mongoose');
+
+const PowerNotificationSchema = new mongoose.Schema({
+    accountId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'PowerMeterAccount',
+        required: true
+    },
+    currentRange: {
+        type: String,
+        required: true
+    },
+    lastNotificationDate: {
+        type: Date,
+        default: Date.now
+    },
+    balance: {
+        type: Number,
+        required: true
+    }
+}, {
+    timestamps: true
+});
+
+const PowerNotification = mongoose.model('PowerNotification', PowerNotificationSchema)
+
 module.exports = PowerNotification;

package/src/models/privacy_policy.js

@@ -1,20 +1,20 @@
-const mongoose = require('mongoose');
-
-const privacyPolicySchema = new mongoose.Schema({
-    title: {
-      type: String,
-      default: "Privacy Policy",
-    },
-    content: {
-      type: String,
-      required: true,
-    },
-  },
-{
-    timestamps: true,
-}
-);
-
-const PrivacyPolicy = mongoose.model('PrivacyPolicy', privacyPolicySchema);
-
+const mongoose = require('mongoose');
+
+const privacyPolicySchema = new mongoose.Schema({
+    title: {
+      type: String,
+      default: "Privacy Policy",
+    },
+    content: {
+      type: String,
+      required: true,
+    },
+  },
+{
+    timestamps: true,
+}
+);
+
+const PrivacyPolicy = mongoose.model('PrivacyPolicy', privacyPolicySchema);
+
 module.exports = PrivacyPolicy;

package/src/models/propertyManagementSettings.js

@@ -0,0 +1,60 @@
+const mongoose = require('mongoose');
+
+const feeRuleSchema = new mongoose.Schema(
+    {
+        type: {
+            type: String,
+            enum: ['percentage', 'amount'],
+            default: 'percentage'
+        },
+        value: {
+            type: Number,
+            default: 0,
+            min: [0, 'Fee value cannot be negative']
+        }
+    },
+    { _id: false }
+);
+
+// Per-facility property management revenue settings.
+// Booking commission is configured in the booking module (BookingConfig /
+// BookingProperty), so only lease fee and rent commission live here.
+const propertyManagementSettingsSchema = new mongoose.Schema(
+    {
+        facility: {
+            type: mongoose.Schema.Types.ObjectId,
+            ref: 'Facility',
+            required: true,
+            unique: true
+        },
+        // One-time fee earned when the first rent payment lands on a managed unit
+        leaseFee: {
+            type: feeRuleSchema,
+            default: () => ({ type: 'percentage', value: 0 })
+        },
+        // Commission earned on every rent payment collected on a managed unit
+        rentCommission: {
+            type: feeRuleSchema,
+            default: () => ({ type: 'percentage', value: 0 })
+        },
+        updatedBy: {
+            type: mongoose.Schema.Types.ObjectId,
+            ref: 'User'
+        }
+    },
+    { timestamps: true }
+);
+
+propertyManagementSettingsSchema.pre('validate', function (next) {
+    const rules = [this.leaseFee, this.rentCommission];
+    for (const rule of rules) {
+        if (rule && rule.type === 'percentage' && rule.value > 100) {
+            return next(new Error('Percentage fee cannot exceed 100%'));
+        }
+    }
+    next();
+});
+
+const PropertyManagementSettings = mongoose.model('PropertyManagementSettings', propertyManagementSettingsSchema);
+
+module.exports = PropertyManagementSettings;