payservedb 9.1.8 → 9.1.9

package/index.js

@@ -94,11 +94,10 @@ const models = {
   Levy: require("./src/models/levy"),
   LevyType: require("./src/models/levytype"),
   LevyContract: require("./src/models/levycontract"),
-  DepositSchema: require("./src/models/levy_deposits"),
   Invoice: require("./src/models/invoice"),
-  InvoiceEditLog: require("./src/models/invoice_edit_log"),
   CombinedInvoice: require("./src/models/combined_invoice"),
   InvoiceGeneration: require("./src/models/invoice_generation_approval"),
+  InvoiceEditLog: require("./src/models/invoice_edit_log"),
   ShortUrl: require("./src/models/short_urls"),
   InvoicingSchedule: require("./src/models/invoicing_schedule"),
   Reminder: require("./src/models/reminder"),
@@ -111,8 +110,8 @@ const models = {
   Report: require("./src/models/report"),
   Ticket: require("./src/models/tickets"),
   Rating: require("./src/models/facility_rating"),
-  FacilityEtimsConfig: require("./src/models/facility_etims_config"),
   Stocksandspare: require("./src/models/stocksandspare"),
+  FacilityEtimsConfig: require("./src/models/facility_etims_config"),
   ServiceVendor: require("./src/models/maintenance_service_vendor"),
   MaintenanceServices: require("./src/models/maintenance_services"),
   StockRequisition: require("./src/models/maintenancerequisition"),
@@ -199,7 +198,6 @@ const models = {
   FacilityDepartment: require("./src/models/facility_departements"),
   EmailSmsQueue: require("./src/models/email_sms_queue"),
   PurchaseOrderInvoice: require("./src/models/purchaseOrderInvoice"),
-  PowerInvoice: require("./src/models/power_invoice"),
   PowerMeterCustomerBand: require("./src/models/powerMeterCustomerBand"),
   PowerMeterCommunicationProtocol: require("./src/models/powerMeterCommunicationProtocol"),
   PowerMeterDailyReading: require("./src/models/powerMeterDailyReading"),
@@ -211,6 +209,7 @@ const models = {
   PowerMeterLog: require("./src/models/power_meter_command_logs"),
   PowerMeterManufacturer: require("./src/models/powerMetersManufacturer"),
   PowerMeterMonthlyReading: require("./src/models/powerMeterMonthlyReading"),
+  PowerInvoice: require("./src/models/power_invoice"),
   PowerMeterSettings: require("./src/models/powerMeterSettings"),
   PowerPrepaidDebit: require("./src/models/power_prepaid_debits"),
   PowerPrepaidCredit: require("./src/models/power_prepaid_credits"),
@@ -253,85 +252,21 @@ const models = {
   PrivacyPolicy: require("./src/models/privacy_policy"),
   TermsAndConditions: require("./src/models/terms_and_conditions"),
   CommunityGuidelines: require("./src/models/community_guidelines"),
-  WhatsappConversation: require("./src/models/whatsapp_conversation"),
+  WhatsappConversation : require("./src/models/whatsapp_conversation"),
   CustomerPreference: require("./src/models/customer_preference"),
   MoveinApplication: require("./src/models/movein_application"),
   EmailThread: require("./src/models/email_thread"),
   MoveinLandlord: require("./src/models/movein_landlord"),
   MoveinUser: require("./src/models/movein_user"),
-  InvoiceWithholdingTax: require("./src/models/InvoiceWithholdingTax"),
-  InvoiceCreditAdjustment: require("./src/models/invoiceCreditAdjustment"),
-  // Customer Obsession admin-managed config
+  // Customer Obsession admin-managed config (PR3/4/5)
   EmailCcConfig: require("./src/models/email_cc_config"),
   AutoReplyRule: require("./src/models/auto_reply_rule"),
   RecipientGroup: require("./src/models/recipient_group"),
   RecipientGroupMember: require("./src/models/recipient_group_member"),
+  InvoiceWithholdingTax: require("./src/models/InvoiceWithholdingTax"),
+  InvoiceCreditAdjustment: require("./src/models/invoiceCreditAdjustment"),
 };
 
-// ── Move-In platform model schema sources (keyed by model name) ─────────────
-const moveInModelDefs = {
-  MoveInUser:         { file: "./src/models/movein_user",         name: "MoveInUser" },
-  MoveInUnit:         { file: "./src/models/movein_unit",         name: "MoveInUnit" },
-  MoveInLandlord:     { file: "./src/models/movein_landlord",     name: "MoveInLandlord" },
-  MoveInApplication:  { file: "./src/models/movein_application",  name: "MoveInApplication" },
-  CustomerPreference: { file: "./src/models/customer_preference", name: "CustomerPreference" },
-  MoveInViewingSlot:  { file: "./src/models/movein_viewing_slot", name: "MoveInViewingSlot" },
-  MoveInBooking:      { file: "./src/models/movein_booking",      name: "MoveInBooking" },
-  MoveInReservation:  { file: "./src/models/movein_reservation",  name: "MoveInReservation" },
-  MoveInPayment:      { file: "./src/models/movein_payment",      name: "MoveInPayment" },
-  MoveInDeal:         { file: "./src/models/movein_deal",         name: "MoveInDeal" },
-  MoveInCommission:   { file: "./src/models/movein_commission",   name: "MoveInCommission" },
-  MoveInNotification: { file: "./src/models/movein_notification", name: "MoveInNotification" },
-  MoveInAuditLog:     { file: "./src/models/movein_audit_log",    name: "MoveInAuditLog" },
-  MoveInOtp:          { file: "./src/models/movein_otp",          name: "MoveInOtp" },
-  MoveInConversation: { file: "./src/models/movein_conversation", name: "MoveInConversation" },
-  MoveInMessage:      { file: "./src/models/movein_message",      name: "MoveInMessage" },
-  MoveInLandlordUser: { file: "./src/models/movein_landlord_user", name: "MoveInLandlordUser" },
-  MoveInHandoffToken: { file: "./src/models/movein_handoff_token", name: "MoveInHandoffToken" },
-  MoveInReminder:     { file: "./src/models/movein_reminder",     name: "MoveInReminder" },
-};
-
-// Initial moveIn namespace — models on default connection (payserve_property).
-// connectToMoveInDB replaces these with models bound to payserve_movein.
-const moveInModels = {};
-for (const [key, def] of Object.entries(moveInModelDefs)) {
-  moveInModels[key] = require(def.file);
-}
-
-// Opens a dedicated connection to payserve_movein and re-registers all
-// Move-In models on that connection so queries hit the correct database.
-async function connectToMoveInDB(dbName, secured, username, password, url, port) {
-  try {
-    let connectionString;
-    if (secured === false) {
-      connectionString = `mongodb://${url}:${port}/${dbName}`;
-    } else {
-      const source = "?authSource=admin";
-      connectionString = `mongodb://${username}:${password}@${url}:${port}/${dbName}${source}`;
-    }
-
-    const conn = await mongoose.createConnection(connectionString, {
-      useNewUrlParser: true,
-    });
-
-    console.log(`Connected to Move-In DB: ${dbName}`);
-
-    for (const [key, def] of Object.entries(moveInModelDefs)) {
-      const baseModel = require(def.file);
-      const schema = baseModel.schema;
-      moveInModels[key] = conn.models[def.name]
-        ? conn.models[def.name]
-        : conn.model(def.name, schema);
-    }
-
-    module.exports.moveInConnection = conn;
-    return conn;
-  } catch (err) {
-    console.error("Error connecting to Move-In DB:", err);
-    throw err;
-  }
-}
-
 // Function to get models dynamically from a specific database connection
 async function getModelFromDB(dbConnection, modelName, schema) {
   if (!dbConnection.models[modelName]) {
@@ -392,6 +327,82 @@ function initializeService(modelNames = []) {
   };
 }
 
+// Move-In platform model schema sources (keyed by model name)
+const moveInModelDefs = {
+  MoveInUser:         { file: "./src/models/movein_user",         name: "MoveInUser" },
+  MoveInUnit:         { file: "./src/models/movein_unit",         name: "MoveInUnit" },
+  MoveInLandlord:     { file: "./src/models/movein_landlord",     name: "MoveInLandlord" },
+  MoveInApplication:  { file: "./src/models/movein_application",  name: "MoveInApplication" },
+  CustomerPreference: { file: "./src/models/customer_preference", name: "CustomerPreference" },
+  MoveInViewingSlot:  { file: "./src/models/movein_viewing_slot", name: "MoveInViewingSlot" },
+  MoveInBooking:      { file: "./src/models/movein_booking",      name: "MoveInBooking" },
+  MoveInReservation:  { file: "./src/models/movein_reservation",  name: "MoveInReservation" },
+  MoveInPayment:      { file: "./src/models/movein_payment",      name: "MoveInPayment" },
+  MoveInDeal:         { file: "./src/models/movein_deal",         name: "MoveInDeal" },
+  MoveInCommission:   { file: "./src/models/movein_commission",   name: "MoveInCommission" },
+  MoveInNotification: { file: "./src/models/movein_notification", name: "MoveInNotification" },
+  MoveInReminder:       { file: "./src/models/movein_reminder",       name: "MoveInReminder" },
+  MoveInAuditLog:     { file: "./src/models/movein_audit_log",    name: "MoveInAuditLog" },
+  MoveInOtp:          { file: "./src/models/movein_otp",          name: "MoveInOtp" },
+  MoveInConversation:   { file: "./src/models/movein_conversation",   name: "MoveInConversation" },
+  MoveInMessage:        { file: "./src/models/movein_message",        name: "MoveInMessage" },
+  MoveInLandlordUser:   { file: "./src/models/movein_landlord_user",  name: "MoveInLandlordUser" },
+  MoveInHandoffToken:      { file: "./src/models/movein_handoff_token",      name: "MoveInHandoffToken" },
+  MoveInTenancy:           { file: "./src/models/movein_tenancy",           name: "MoveInTenancy" },
+  MoveInDisbursement:      { file: "./src/models/movein_disbursement",      name: "MoveInDisbursement" },
+  MoveInLease:             { file: "./src/models/movein_lease",             name: "MoveInLease" },
+  MoveInAmenity:           { file: "./src/models/movein_amenity",           name: "MoveInAmenity" },
+  MoveInEnquiry:           { file: "./src/models/movein_enquiry",           name: "MoveInEnquiry" },
+  MoveInInvoice:           { file: "./src/models/movein_invoice",           name: "MoveInInvoice" },
+  MoveInSettings:          { file: "./src/models/movein_settings",          name: "MoveInSettings" },
+  MoveInWantUnit:          { file: "./src/models/movein_want_unit",         name: "MoveInWantUnit" },
+  MoveInFeaturedPackage:   { file: "./src/models/movein_featured_package",  name: "MoveInFeaturedPackage" },
+  MoveInEmailThread:       { file: "./src/models/movein_email_thread",      name: "MoveInEmailThread" },
+};
+
+// Initial moveIn namespace — models on default connection (payserve_property).
+// connectToMoveInDB replaces these with models bound to payserve_movein.
+const moveInModels = {};
+for (const [key, def] of Object.entries(moveInModelDefs)) {
+  moveInModels[key] = require(def.file);
+}
+
+// Opens a dedicated connection to payserve_movein and re-registers all
+// moveIn models on that connection so queries hit the correct database.
+async function connectToMoveInDB(dbName, secured, username, password, url, port) {
+  try {
+    let connectionString;
+    if (secured === false) {
+      connectionString = `mongodb://${url}:${port}/${dbName}`;
+    } else {
+      const source = "?authSource=admin";
+      connectionString = `mongodb://${username}:${password}@${url}:${port}/${dbName}${source}`;
+    }
+
+    const conn = await mongoose.createConnection(connectionString, {
+      useNewUrlParser: true,
+    });
+
+    console.log(`Connected to Move-In DB: ${dbName}`);
+
+    // Re-register each moveIn model on the new connection
+    for (const [key, def] of Object.entries(moveInModelDefs)) {
+      const baseModel = require(def.file);
+      const schema = baseModel.schema;
+      moveInModels[key] = conn.models[def.name]
+        ? conn.models[def.name]
+        : conn.model(def.name, schema);
+    }
+
+    // Expose the raw connection for advanced use
+    module.exports.moveInConnection = conn;
+    return conn;
+  } catch (err) {
+    console.error("Error connecting to Move-In DB:", err);
+    throw err;
+  }
+}
+
 module.exports = {
   connectToMongoDB,
   connectToMoveInDB,
@@ -399,4 +410,5 @@ module.exports = {
   getModelFromDB,
   initializeService,
   ...models,
-};
+  moveIn: moveInModels,
+};

package/package.json

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

package/src/models/levycontract.js

@@ -118,6 +118,31 @@ const LevyContractSchema = new Schema(
                 default: 0,
                 min: [0, 'Upfront amount cannot be negative']
             },
+            // How many months of billing the upfront amount covers. Drives
+            // how many period invoices get generated (combined with the
+            // contract's paymentFrequency/collectionFrequency).
+            numberOfMonths: {
+                type: Number,
+                min: [1, 'Number of months must be at least 1']
+            },
+            // The levy's per-month rate, used to compute each period
+            // invoice's amount (amountPerMonth * monthsInPeriod, with the
+            // first period prorated by days if the contract starts mid-month).
+            amountPerMonth: {
+                type: Number,
+                min: [0, 'Amount per month cannot be negative']
+            },
+            // How the upfront amount was derived on the frontend ('auto'
+            // = amountPerMonth x numberOfMonths, 'custom' = manually entered
+            // total). Stored for reference/audit only.
+            calculationMode: {
+                type: String,
+                enum: ['auto', 'custom'],
+                default: 'auto'
+            },
+            // Legacy fields — superseded by numberOfMonths + the date-range
+            // period builder, but kept in place since other code may still
+            // reference them.
             billingPeriods: {
                 type: [String],
                 default: []

package/src/models/movein_amenity.js

@@ -0,0 +1,14 @@
+const mongoose = require('mongoose');
+
+const moveInAmenitySchema = new mongoose.Schema(
+    {
+        name:     { type: String, required: true, trim: true },
+        icon:     { type: String, default: null },
+        category: { type: String, default: 'general', trim: true },
+        isActive: { type: Boolean, default: true },
+    },
+    { timestamps: true }
+);
+
+const MoveInAmenity = mongoose.model('MoveInAmenity', moveInAmenitySchema);
+module.exports = MoveInAmenity;

package/src/models/movein_application.js

@@ -3,7 +3,7 @@ const mongoose = require('mongoose');
 const moveInApplicationSchema = new mongoose.Schema(
     {
         unitId: { type: mongoose.Schema.Types.ObjectId, required: true, index: true },
-        facilityId: { type: mongoose.Schema.Types.ObjectId, ref: 'Facility', required: true, index: true },
+        facilityId: { type: mongoose.Schema.Types.ObjectId, ref: 'Facility', default: null, index: true },
         unitName: { type: String, default: null },
         facilityName: { type: String, default: null },
         tenantId: { type: mongoose.Schema.Types.ObjectId, ref: 'User', required: true, index: true },
@@ -26,4 +26,4 @@ const moveInApplicationSchema = new mongoose.Schema(
 );
 
 const MoveInApplication = mongoose.model('MoveInApplication', moveInApplicationSchema);
-module.exports = MoveInApplication;
+module.exports = MoveInApplication;

package/src/models/movein_disbursement.js

@@ -0,0 +1,37 @@
+const mongoose = require('mongoose');
+
+const moveInDisbursementSchema = new mongoose.Schema(
+    {
+        tenancyId:       { type: mongoose.Schema.Types.ObjectId, required: true, index: true },
+        unitId:          { type: mongoose.Schema.Types.ObjectId, required: true, index: true },
+        landlordId:      { type: mongoose.Schema.Types.ObjectId, required: true, index: true },
+        tenantId:        { type: mongoose.Schema.Types.ObjectId, required: true, index: true },
+
+        // Amounts
+        totalCollected:  { type: Number, required: true },
+        commissionAmount:{ type: Number, required: true },
+        netAmount:       { type: Number, required: true },  // totalCollected - commissionAmount
+        currency:        { type: String, default: 'KES' },
+
+        // Disbursement details
+        status:          { type: String, enum: ['pending', 'processing', 'settled', 'failed'], default: 'pending', index: true },
+        method:          { type: String, enum: ['mpesa', 'bank', null], default: null },
+        reference:       { type: String, default: null },  // M-Pesa code or bank ref
+        disbursedAt:     { type: Date, default: null },
+        disbursedBy:     { type: mongoose.Schema.Types.ObjectId, default: null },
+        note:            { type: String, default: null },
+
+        // Bank details snapshot at time of disbursement
+        bankName:        { type: String, default: null },
+        bankAccount:     { type: String, default: null },
+        bankBranch:      { type: String, default: null },
+
+        // Invoice references
+        landlordInvoiceId: { type: mongoose.Schema.Types.ObjectId, default: null },
+        landlordReceiptId: { type: mongoose.Schema.Types.ObjectId, default: null },
+    },
+    { timestamps: true }
+);
+
+const MoveInDisbursement = mongoose.model('MoveInDisbursement', moveInDisbursementSchema);
+module.exports = MoveInDisbursement;

package/src/models/movein_email_thread.js

@@ -0,0 +1,20 @@
+const mongoose = require('mongoose');
+
+const moveInEmailThreadSchema = new mongoose.Schema(
+    {
+        messageId: { type: String, required: true, unique: true, index: true },
+        from:      { type: String, default: '' },
+        fromName:  { type: String, default: '' },
+        subject:   { type: String, default: '(no subject)' },
+        bodyText:  { type: String, default: '' },
+        bodyHtml:  { type: String, default: '' },
+        date:      { type: Date, default: Date.now },
+        uid:       { type: Number, default: null },
+        isRead:    { type: Boolean, default: false },
+        isReplied: { type: Boolean, default: false },
+    },
+    { timestamps: true }
+);
+
+const MoveInEmailThread = mongoose.model('MoveInEmailThread', moveInEmailThreadSchema);
+module.exports = MoveInEmailThread;

package/src/models/movein_enquiry.js

@@ -0,0 +1,17 @@
+const mongoose = require('mongoose');
+
+const moveInEnquirySchema = new mongoose.Schema(
+    {
+        unitId:     { type: mongoose.Schema.Types.ObjectId, required: true, index: true },
+        landlordId: { type: mongoose.Schema.Types.ObjectId, default: null, index: true },
+        fullName:   { type: String, required: true, trim: true },
+        phone:      { type: String, default: null },
+        email:      { type: String, required: true, trim: true, lowercase: true },
+        message:    { type: String, default: null },
+        isRead:     { type: Boolean, default: false },
+    },
+    { timestamps: true }
+);
+
+const MoveInEnquiry = mongoose.model('MoveInEnquiry', moveInEnquirySchema);
+module.exports = MoveInEnquiry;

package/src/models/movein_featured_package.js

@@ -0,0 +1,17 @@
+const mongoose = require('mongoose');
+
+const moveInFeaturedPackageSchema = new mongoose.Schema(
+    {
+        name:         { type: String, required: true, trim: true, maxlength: 80 },
+        description:  { type: String, default: '', maxlength: 500 },
+        durationDays: { type: Number, required: true, min: 1, max: 365 },
+        price:        { type: Number, required: true, min: 0 },
+        sortOrder:    { type: Number, default: 0 },
+        isActive:     { type: Boolean, default: true },
+        createdBy:    { type: mongoose.Schema.Types.ObjectId, default: null },
+    },
+    { timestamps: true }
+);
+
+const MoveInFeaturedPackage = mongoose.model('MoveInFeaturedPackage', moveInFeaturedPackageSchema);
+module.exports = MoveInFeaturedPackage;

package/src/models/movein_invoice.js

@@ -0,0 +1,25 @@
+const mongoose = require('mongoose');
+
+const moveInInvoiceSchema = new mongoose.Schema(
+    {
+        invoiceNumber:          { type: String, required: true, unique: true, index: true },
+        tenantName:             { type: String, required: true, trim: true },
+        tenantEmail:            { type: String, required: true, trim: true, lowercase: true },
+        tenantPhone:            { type: String, default: null },
+        unitId:                 { type: mongoose.Schema.Types.ObjectId, required: true, index: true },
+        landlordId:             { type: mongoose.Schema.Types.ObjectId, default: null, index: true },
+        wantUnitApplicationId:  { type: mongoose.Schema.Types.ObjectId, default: null },
+        type:                   { type: String, default: 'deposit' },
+        amount:                 { type: Number, required: true },
+        currency:               { type: String, default: 'KES' },
+        status:                 { type: String, enum: ['pending', 'paid', 'cancelled', 'expired'], default: 'pending', index: true },
+        deadlineAt:             { type: Date, default: null },
+        paidAt:                 { type: Date, default: null },
+        mpesaTransactionId:     { type: String, default: null },
+        notes:                  { type: String, default: null },
+    },
+    { timestamps: true }
+);
+
+const MoveInInvoice = mongoose.model('MoveInInvoice', moveInInvoiceSchema);
+module.exports = MoveInInvoice;

package/src/models/movein_lease.js

@@ -0,0 +1,38 @@
+const mongoose = require('mongoose');
+
+const moveInLeaseSchema = new mongoose.Schema(
+    {
+        // 'default' = platform-wide template; 'unit' = unit-specific override
+        type:            { type: String, enum: ['default', 'unit'], required: true, index: true },
+        unitId:          { type: mongoose.Schema.Types.ObjectId, default: null, index: true },
+        uploadedBy:      { type: mongoose.Schema.Types.ObjectId, required: true },
+
+        // File storage
+        originalName:    { type: String, required: true },
+        filePath:        { type: String, required: true },
+        mimeType:        { type: String, default: 'application/pdf' },
+        fileSizeBytes:   { type: Number, default: null },
+
+        status:          { type: String, enum: ['active', 'superseded'], default: 'active', index: true },
+        supersededAt:    { type: Date, default: null },
+
+        // Signed copy (per tenancy — embedded subdoc array)
+        signedCopies: [
+            {
+                tenancyId:     { type: mongoose.Schema.Types.ObjectId, required: true },
+                tenantId:      { type: mongoose.Schema.Types.ObjectId, required: true },
+                filePath:      { type: String, required: true },
+                originalName:  { type: String, default: null },
+                uploadedAt:    { type: Date, default: Date.now },
+                status:        { type: String, enum: ['pending_review', 'approved', 'rejected'], default: 'pending_review' },
+                reviewedAt:    { type: Date, default: null },
+                reviewedBy:    { type: mongoose.Schema.Types.ObjectId, default: null },
+                rejectionNote: { type: String, default: null },
+            }
+        ],
+    },
+    { timestamps: true }
+);
+
+const MoveInLease = mongoose.model('MoveInLease', moveInLeaseSchema);
+module.exports = MoveInLease;

package/src/models/movein_settings.js

@@ -0,0 +1,26 @@
+const mongoose = require('mongoose');
+
+const feeRuleSchema = new mongoose.Schema(
+    {
+        rule:  { type: String, default: 'same_as_rent' },
+        value: { type: Number, default: 0 },
+    },
+    { _id: false }
+);
+
+const moveInSettingsSchema = new mongoose.Schema(
+    {
+        singletonKey:         { type: String, default: 'global', unique: true },
+        reservation:          { type: feeRuleSchema, default: () => ({ rule: 'same_as_rent', value: 0 }) },
+        viewing:              { type: feeRuleSchema, default: () => ({ rule: 'fixed_amount', value: 500 }) },
+        commission:           { type: feeRuleSchema, default: () => ({ rule: 'fixed_amount', value: 0 }) },
+        paymentDeadlineHours: { type: Number, default: 24 },
+        featuredEnabled:      { type: Boolean, default: false },
+        updatedBy:            { type: mongoose.Schema.Types.ObjectId, default: null },
+        updatedAt:            { type: Date, default: null },
+    },
+    { timestamps: false }
+);
+
+const MoveInSettings = mongoose.model('MoveInSettings', moveInSettingsSchema);
+module.exports = MoveInSettings;

package/src/models/movein_tenancy.js

@@ -0,0 +1,56 @@
+const mongoose = require('mongoose');
+
+const moveInTenancySchema = new mongoose.Schema(
+    {
+        unitId:          { type: mongoose.Schema.Types.ObjectId, required: true, index: true },
+        unitName:        { type: String, default: null },
+        applicationId:   { type: mongoose.Schema.Types.ObjectId, required: true, index: true },
+        tenantId:        { type: mongoose.Schema.Types.ObjectId, required: true, index: true },
+        tenantName:      { type: String, default: null },
+        tenantEmail:     { type: String, default: null },
+        tenantPhone:     { type: String, default: null },
+        landlordId:      { type: mongoose.Schema.Types.ObjectId, default: null, index: true },
+
+        // Payment leg
+        paymentId:       { type: mongoose.Schema.Types.ObjectId, default: null },
+        paymentStatus:   { type: String, enum: ['pending', 'paid'], default: 'pending' },
+        amountPaid:      { type: Number, default: null },
+        accountNumber:   { type: String, default: null },   // MVR...
+        commissionAccountNumber: { type: String, default: null },  // MVC...
+        commissionType:  { type: String, enum: ['percent', 'flat'], default: 'percent' },
+        commissionValue: { type: Number, default: 15 },
+        commissionAmount:{ type: Number, default: null },
+        netToLandlord:   { type: Number, default: null },
+        paidAt:          { type: Date, default: null },
+
+        // Lease leg
+        leaseId:         { type: mongoose.Schema.Types.ObjectId, default: null },
+        leaseStatus:     { type: String, enum: ['pending', 'downloaded', 'uploaded', 'approved', 'rejected'], default: 'pending' },
+        leaseSignedAt:   { type: Date, default: null },
+        leaseApprovedAt: { type: Date, default: null },
+        leaseApprovedBy: { type: mongoose.Schema.Types.ObjectId, default: null },
+
+        // Overall tenancy status
+        status: {
+            type: String,
+            enum: ['awaiting_payment', 'awaiting_lease', 'awaiting_both', 'active', 'cancelled', 'ended'],
+            default: 'awaiting_both',
+            index: true,
+        },
+        activatedAt:     { type: Date, default: null },
+
+        // Disbursement leg
+        disbursementId:  { type: mongoose.Schema.Types.ObjectId, default: null },
+        disbursedAt:     { type: Date, default: null },
+
+        // Invoice references
+        tenantInvoiceId: { type: mongoose.Schema.Types.ObjectId, default: null },
+        tenantReceiptId: { type: mongoose.Schema.Types.ObjectId, default: null },
+
+        notes:           { type: String, default: null },
+    },
+    { timestamps: true }
+);
+
+const MoveInTenancy = mongoose.model('MoveInTenancy', moveInTenancySchema);
+module.exports = MoveInTenancy;

package/src/models/movein_want_unit.js

@@ -0,0 +1,21 @@
+const mongoose = require('mongoose');
+
+const moveInWantUnitSchema = new mongoose.Schema(
+    {
+        unitId:       { type: mongoose.Schema.Types.ObjectId, required: true, index: true },
+        landlordId:   { type: mongoose.Schema.Types.ObjectId, default: null, index: true },
+        fullName:     { type: String, required: true, trim: true },
+        phone:        { type: String, required: true, trim: true },
+        email:        { type: String, required: true, trim: true, lowercase: true },
+        occupation:   { type: String, default: null },
+        evidencePath: { type: String, default: null },
+        status:       { type: String, enum: ['pending', 'approved', 'rejected'], default: 'pending', index: true },
+        reason:       { type: String, default: null },
+        respondedAt:  { type: Date, default: null },
+        invoiceId:    { type: mongoose.Schema.Types.ObjectId, default: null },
+    },
+    { timestamps: true }
+);
+
+const MoveInWantUnit = mongoose.model('MoveInWantUnit', moveInWantUnitSchema);
+module.exports = MoveInWantUnit;

package/src/models/power_invoice.js

@@ -46,16 +46,11 @@ const powerInvoiceSchema = new mongoose.Schema(
       // Positive = arrears carried forward; Negative = credit from overpayment
     },
 
-    withholdingTaxes: [
-      {
-        name: { type: String, required: true },       // e.g. "withholding"
-        percentage: { type: Number, required: true }, // e.g. 5
-        amount: { type: Number, required: true },     // e.g. 50 (subTotal * percentage / 100)
-      },
-    ],
-    totalWithholdingTax: {
+    withholdingTaxPercentage: {
       type: Number,
-      default: 0,
+      min: 0,
+      max: 100,
+      default: 0
     },
 
     // ── Biller Address ─────────────────────────────────────────────────────────