payservedb 9.2.1 → 9.2.3

package/src/models/visitLog.js

@@ -1,95 +1,95 @@
-const mongoose = require('mongoose');
-
-// Define the schema for visit logs
-const visitLogSchema = new mongoose.Schema({
-    visitorName: {
-        type: String,
-        required: true
-    },
-    visitorId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'Visitor',
-        required: true
-    },
-    residentName: {
-        type: String,
-        required: false
-    },
-    phoneNumber: {
-        type: String,
-        trim: true
-    },
-    residentId: {
-        type: mongoose.Schema.Types.ObjectId,
-    },
-    qrCode: {
-        type: Boolean,
-        required: false
-    },
-    houseNumber: {
-        type: String,
-        required: false
-    },
-    startTime: {
-        type: String, // Changed to Date for better handling of time
-        required: true
-    },
-    endTime: {
-        type: Date, // Changed to Date for better handling of time
-        required: false
-    },
-    days: {
-        type: Number,
-        required: false
-    },
-    division: {
-        type: String,
-        required: false
-    },
-    entryPoint: {
-        type: String,
-        required: false
-    },
-    exitPoint: {
-        type: String,
-        required: false
-    },
-    guardId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'User',
-        required: false
-    },
-    status: {
-        type: String,
-        required: true,
-        enum: ['Visit Confirmation', 'Scheduled', 'Checked In', 'Checked Out', 'Cancelled'] // Define valid statuses
-        // Define valid statuses
-    },
-    vehicle: {
-        registration: String,
-        make: String,
-        color: String,
-        occupants: String,
-    },
-    visitationCode: {
-        type: Number,
-        required: false
-    },
-    requestedBy: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: "User",
-        required: false
-    },
-    facilityId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'Facility',
-        required: true // Ensures a facilityId is always provided
-    }
-}, {
-    timestamps: true // Automatically add createdAt and updatedAt fields
-});
-
-// Compile the model from the schema
-const VisitLog = mongoose.model('VisitLog', visitLogSchema);
-
-module.exports = VisitLog;
+const mongoose = require('mongoose');
+
+// Define the schema for visit logs
+const visitLogSchema = new mongoose.Schema({
+    visitorName: {
+        type: String,
+        required: true
+    },
+    visitorId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Visitor',
+        required: true
+    },
+    residentName: {
+        type: String,
+        required: false
+    },
+    phoneNumber: {
+        type: String,
+        trim: true
+    },
+    residentId: {
+        type: mongoose.Schema.Types.ObjectId,
+    },
+    qrCode: {
+        type: Boolean,
+        required: false
+    },
+    houseNumber: {
+        type: String,
+        required: false
+    },
+    startTime: {
+        type: String, // Changed to Date for better handling of time
+        required: true
+    },
+    endTime: {
+        type: Date, // Changed to Date for better handling of time
+        required: false
+    },
+    days: {
+        type: Number,
+        required: false
+    },
+    division: {
+        type: String,
+        required: false
+    },
+    entryPoint: {
+        type: String,
+        required: false
+    },
+    exitPoint: {
+        type: String,
+        required: false
+    },
+    guardId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'User',
+        required: false
+    },
+    status: {
+        type: String,
+        required: true,
+        enum: ['Visit Confirmation', 'Scheduled', 'Checked In', 'Checked Out', 'Cancelled'] // Define valid statuses
+        // Define valid statuses
+    },
+    vehicle: {
+        registration: String,
+        make: String,
+        color: String,
+        occupants: String,
+    },
+    visitationCode: {
+        type: Number,
+        required: false
+    },
+    requestedBy: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: "User",
+        required: false
+    },
+    facilityId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Facility',
+        required: true // Ensures a facilityId is always provided
+    }
+}, {
+    timestamps: true // Automatically add createdAt and updatedAt fields
+});
+
+// Compile the model from the schema
+const VisitLog = mongoose.model('VisitLog', visitLogSchema);
+
+module.exports = VisitLog;

package/src/models/visitor.js

@@ -1,67 +1,67 @@
-const mongoose = require('mongoose');
-
-// Define the schema for companies
-const visitorSchema = new mongoose.Schema({
-    firstName: {
-        type: String,
-        required: true
-    },
-    lastName: {
-        type: String,
-        required: true
-    },
-    phoneNumber: {
-        type: String,
-        required: true
-    },
-    email: {
-        type: String,
-        required: false
-    },
-    idNumber: {
-        type: String,
-        required: false
-    },
-    houseNumber: {
-        type: String,
-        required: false
-    },
-    status: {
-        type: String,
-        required: false
-    },
-    type: {
-        type: String,
-        required: false,
-        enum: ["Staff", "Other", "Service Providers", "Government Officials/Agents", "Student", ""]
-    },
-    residentId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'Customer',
-    },
-    invited: {
-        type: Boolean,
-        required: false,
-        default: false
-    },
-    invitationDate: {
-        type: String,
-        required: false
-    },
-    visitingEndDate: {
-        type: String,
-        required: false
-    },
-    facilityId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'Facility',
-    },
-}, {
-    timestamps: true // Automatically add createdAt and updatedAt fields
-});
-
-// Indexes for improved performance
-// Compile the model from the schema
-const Visitor = mongoose.model('Visitor', visitorSchema);
-
-module.exports = Visitor;
+const mongoose = require('mongoose');
+
+// Define the schema for companies
+const visitorSchema = new mongoose.Schema({
+    firstName: {
+        type: String,
+        required: true
+    },
+    lastName: {
+        type: String,
+        required: true
+    },
+    phoneNumber: {
+        type: String,
+        required: true
+    },
+    email: {
+        type: String,
+        required: false
+    },
+    idNumber: {
+        type: String,
+        required: false
+    },
+    houseNumber: {
+        type: String,
+        required: false
+    },
+    status: {
+        type: String,
+        required: false
+    },
+    type: {
+        type: String,
+        required: false,
+        enum: ["Staff", "Other", "Service Providers", "Government Officials/Agents", "Student", ""]
+    },
+    residentId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Customer',
+    },
+    invited: {
+        type: Boolean,
+        required: false,
+        default: false
+    },
+    invitationDate: {
+        type: String,
+        required: false
+    },
+    visitingEndDate: {
+        type: String,
+        required: false
+    },
+    facilityId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Facility',
+    },
+}, {
+    timestamps: true // Automatically add createdAt and updatedAt fields
+});
+
+// Indexes for improved performance
+// Compile the model from the schema
+const Visitor = mongoose.model('Visitor', visitorSchema);
+
+module.exports = Visitor;

package/src/models/waitlist.js

@@ -1,45 +1,45 @@
-const mongoose = require('mongoose');
-
-// Define the schema for companies
-const waitListSchema = new mongoose.Schema({
-    firstName: {
-        type: String,
-        required: true
-    },
-    lastName: {
-        type: String,
-        required: true
-    },
-    phoneNumber: {
-        type: String,
-        required: true
-    },
-    division: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'Facility',
-        required: true
-    },
-    unit: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'Unit',
-        required: true
-    },
-    status: {
-        type: String,
-        required: true,
-        enum: ['Waiting confirmation', 'Approved', 'Denied']
-    },
-    facilityId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'Facility',
-        required: true // Ensures a facilityId is always provided
-    },
-   
-}, {
-    timestamps: true // Automatically add createdAt and updatedAt fields
-});
-
-
-const WaitList = mongoose.model('WaitList', waitListSchema);
-
-module.exports = WaitList;
+const mongoose = require('mongoose');
+
+// Define the schema for companies
+const waitListSchema = new mongoose.Schema({
+    firstName: {
+        type: String,
+        required: true
+    },
+    lastName: {
+        type: String,
+        required: true
+    },
+    phoneNumber: {
+        type: String,
+        required: true
+    },
+    division: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Facility',
+        required: true
+    },
+    unit: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Unit',
+        required: true
+    },
+    status: {
+        type: String,
+        required: true,
+        enum: ['Waiting confirmation', 'Approved', 'Denied']
+    },
+    facilityId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Facility',
+        required: true // Ensures a facilityId is always provided
+    },
+   
+}, {
+    timestamps: true // Automatically add createdAt and updatedAt fields
+});
+
+
+const WaitList = mongoose.model('WaitList', waitListSchema);
+
+module.exports = WaitList;

package/src/models/wallet.js

@@ -1,44 +1,44 @@
-const mongoose = require("mongoose");
-
-// Define the schema for Wallet
-const walletSchema = new mongoose.Schema(
-  {
-    owner: {
-      type: mongoose.Schema.Types.ObjectId,
-      required: true,
-    },
-    ownerType: {
-      type: String,
-      required: true,
-      enum: ["User", "Customer", "Facility"],
-    },
-    walletType: {
-      type: String,
-      required: false,
-      enum: ["levy", "propertyManagement", "lease", "utility", "vas"],
-    },
-    amount: {
-      type: Number,
-      default: 0,
-      min: 0,
-    },
-    facilityId: {
-      type: mongoose.Schema.Types.ObjectId,
-      ref: "Facility",
-      required: true,
-    },
-    isActive: {
-      type: Boolean,
-      default: true,
-    },
-  },
-  {
-    timestamps: true,
-  },
-);
-
-// Index for efficient queries
-walletSchema.index({ owner: 1, ownerType: 1, facilityId: 1 });
-
-const Wallet = mongoose.model("Wallet", walletSchema);
-module.exports = Wallet;
+const mongoose = require("mongoose");
+
+// Define the schema for Wallet
+const walletSchema = new mongoose.Schema(
+  {
+    owner: {
+      type: mongoose.Schema.Types.ObjectId,
+      required: true,
+    },
+    ownerType: {
+      type: String,
+      required: true,
+      enum: ["User", "Customer", "Facility"],
+    },
+    walletType: {
+      type: String,
+      required: false,
+      enum: ["levy", "propertyManagement", "lease", "utility", "vas"],
+    },
+    amount: {
+      type: Number,
+      default: 0,
+      min: 0,
+    },
+    facilityId: {
+      type: mongoose.Schema.Types.ObjectId,
+      ref: "Facility",
+      required: true,
+    },
+    isActive: {
+      type: Boolean,
+      default: true,
+    },
+  },
+  {
+    timestamps: true,
+  },
+);
+
+// Index for efficient queries
+walletSchema.index({ owner: 1, ownerType: 1, facilityId: 1 });
+
+const Wallet = mongoose.model("Wallet", walletSchema);
+module.exports = Wallet;

package/src/models/wallet_transaction.js

@@ -0,0 +1,68 @@
+const mongoose = require("mongoose");
+
+// Every credit/debit is an immutable row — balance is derived from
+// balanceAfter on the most recent row for a given customerId, same
+// running-balance pattern used in the unit/customer SOA handlers.
+const WalletTransactionSchema = new mongoose.Schema(
+  {
+    customerId: {
+      type: mongoose.Schema.Types.ObjectId,
+      ref: "Customer",
+      required: true,
+      index: true, // NOT unique — a customer has MANY ledger entries over time
+    },
+    facilityId: {
+      type: mongoose.Schema.Types.ObjectId,
+      ref: "Facility",
+      required: true,
+      index: true,
+    },
+    type: { type: String, enum: ["credit", "debit"], required: true },
+    source: {
+      type: String,
+      enum: [
+        "rental-income", // auto-detected incoming payment
+        "expense-deduction", // management fee, maintenance cost, etc.
+        "withdrawal-request", // debit created when landlord requests payout
+        "withdrawal-reversal", // corrective credit if a withdrawal needs reversing
+        "manual-adjustment",
+      ],
+      required: true,
+    },
+    amount: { type: Number, required: true }, // always positive; type determines sign
+    balanceAfter: { type: Number, required: true }, // running balance snapshot
+    status: {
+      type: String,
+      enum: ["pending", "completed", "rejected"],
+      default: "completed",
+    },
+    reference: { type: String }, // bank txn ref, invoice number, withdrawal request id
+    detectedPaymentId: {
+      type: mongoose.Schema.Types.ObjectId,
+      ref: "CashPayment",
+      index: true,
+      sparse: true,
+    }, // idempotency link — prevents double-crediting the same bank payment
+    notes: { type: String },
+  },
+  {
+    timestamps: true,
+  }
+);
+
+// Compound index: the query you'll run constantly is "give me the latest
+// entry for this customer" — this makes that a fast indexed lookup instead
+// of a collection scan as the ledger grows.
+WalletTransactionSchema.index({ customerId: 1, createdAt: -1 });
+
+// Idempotency guard at the DB level: a given detectedPaymentId should only
+// ever produce one wallet credit, even if the payment-detection hook fires
+// twice (retries, webhook redelivery, etc.)
+WalletTransactionSchema.index(
+  { detectedPaymentId: 1 },
+  { unique: true, partialFilterExpression: { detectedPaymentId: { $exists: true } } }
+);
+
+const WalletTransaction = mongoose.model("WalletTransaction", WalletTransactionSchema);
+
+module.exports = WalletTransaction;

package/src/models/wallet_transactions.js

@@ -1,50 +1,50 @@
-const mongoose = require("mongoose");
-
-// Define the schema for Wallet Transactions
-const walletTransactionSchema = new mongoose.Schema(
-  {
-    walletId: {
-      type: mongoose.Schema.Types.ObjectId,
-      ref: "Wallet",
-      required: true,
-    },
-    date: {
-      type: Date,
-      required: true,
-      default: Date.now,
-    },
-    amount: {
-      type: Number,
-      required: true,
-      min: 0.01,
-    },
-    transactionType: {
-      type: String,
-      required: true,
-      enum: ["topup", "deductable"],
-    },
-    description: {
-      type: String,
-      required: true,
-    },
-    facilityId: {
-      type: mongoose.Schema.Types.ObjectId,
-      ref: "Facility",
-      required: true,
-    },
-  },
-  {
-    timestamps: true,
-  },
-);
-
-// Index for efficient queries
-walletTransactionSchema.index({ walletId: 1, facilityId: 1 });
-walletTransactionSchema.index({ facilityId: 1, transactionType: 1 });
-walletTransactionSchema.index({ date: -1 });
-
-const WalletTransaction = mongoose.model(
-  "WalletTransaction",
-  walletTransactionSchema,
-);
-module.exports = WalletTransaction;
+const mongoose = require("mongoose");
+
+// Define the schema for Wallet Transactions
+const walletTransactionSchema = new mongoose.Schema(
+  {
+    walletId: {
+      type: mongoose.Schema.Types.ObjectId,
+      ref: "Wallet",
+      required: true,
+    },
+    date: {
+      type: Date,
+      required: true,
+      default: Date.now,
+    },
+    amount: {
+      type: Number,
+      required: true,
+      min: 0.01,
+    },
+    transactionType: {
+      type: String,
+      required: true,
+      enum: ["topup", "deductable"],
+    },
+    description: {
+      type: String,
+      required: true,
+    },
+    facilityId: {
+      type: mongoose.Schema.Types.ObjectId,
+      ref: "Facility",
+      required: true,
+    },
+  },
+  {
+    timestamps: true,
+  },
+);
+
+// Index for efficient queries
+walletTransactionSchema.index({ walletId: 1, facilityId: 1 });
+walletTransactionSchema.index({ facilityId: 1, transactionType: 1 });
+walletTransactionSchema.index({ date: -1 });
+
+const WalletTransaction = mongoose.model(
+  "WalletTransaction",
+  walletTransactionSchema,
+);
+module.exports = WalletTransaction;