payservedb 7.9.1 → 7.9.3

package/src/models/expense.js

@@ -1,100 +1,100 @@
-const mongoose = require('mongoose');
-
-const expenseSchema = new mongoose.Schema({
-    facilityId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'Facility',
-        required: true
-    },
-    budgetId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'Budget'
-    },
-    name: {
-        type: String,
-        required: true,
-        trim: true
-    },
-    categoryId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'ExpenseCategory'
-    },
-    amount: {
-        type: Number,
-        required: true
-    },
-    type: {
-        type: String,
-        enum: ['RECURRING', 'ONE_TIME'],
-        required: true
-    },
-    date: {
-        type: Date,
-        required: true,
-        default: Date.now
-    },
-    status: {
-        type: String,
-        enum: ['PAID', 'UNPAID'],
-        default: 'UNPAID'
-    },
-    description: {
-        type: String,
-        trim: true
-    },
-    receiptUrl: {
-        type: String,
-        trim: true
-    },
-    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
-});
-
-const Expense = mongoose.model('Expense', expenseSchema);
-
+const mongoose = require('mongoose');
+
+const expenseSchema = new mongoose.Schema({
+    facilityId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Facility',
+        required: true
+    },
+    budgetId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Budget'
+    },
+    name: {
+        type: String,
+        required: true,
+        trim: true
+    },
+    categoryId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'ExpenseCategory'
+    },
+    amount: {
+        type: Number,
+        required: true
+    },
+    type: {
+        type: String,
+        enum: ['RECURRING', 'ONE_TIME'],
+        required: true
+    },
+    date: {
+        type: Date,
+        required: true,
+        default: Date.now
+    },
+    status: {
+        type: String,
+        enum: ['PAID', 'UNPAID'],
+        default: 'UNPAID'
+    },
+    description: {
+        type: String,
+        trim: true
+    },
+    receiptUrl: {
+        type: String,
+        trim: true
+    },
+    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
+});
+
+const Expense = mongoose.model('Expense', expenseSchema);
+
 module.exports = Expense;

package/src/models/expense_category.js

@@ -1,46 +1,46 @@
-const mongoose = require('mongoose');
-
-const expenseCategorySchema = new mongoose.Schema({
-    facilityId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'Facility',
-        required: true
-    },
-    name: {
-        type: String,
-        required: true,
-        trim: true
-    },
-    glAccounts: {
-        invoice: {
-            debit: {
-                type: mongoose.Schema.Types.ObjectId,
-                ref: "GLAccount",
-                required: false,
-            },
-            credit: {
-                type: mongoose.Schema.Types.ObjectId,
-                ref: "GLAccount",
-                required: false,
-            }
-        },
-        payment: {
-            debit: {
-                type: mongoose.Schema.Types.ObjectId,
-                ref: "GLAccount",
-                required: false,
-            },
-            credit: {
-                type: mongoose.Schema.Types.ObjectId,
-                ref: "GLAccount",
-                required: false,
-            }
-        }
-    },
-}, {
-    timestamps: true
-});
-
-const ExpenseCategory = mongoose.model('ExpenseCategory', expenseCategorySchema);
-
+const mongoose = require('mongoose');
+
+const expenseCategorySchema = new mongoose.Schema({
+    facilityId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Facility',
+        required: true
+    },
+    name: {
+        type: String,
+        required: true,
+        trim: true
+    },
+    glAccounts: {
+        invoice: {
+            debit: {
+                type: mongoose.Schema.Types.ObjectId,
+                ref: "GLAccount",
+                required: false,
+            },
+            credit: {
+                type: mongoose.Schema.Types.ObjectId,
+                ref: "GLAccount",
+                required: false,
+            }
+        },
+        payment: {
+            debit: {
+                type: mongoose.Schema.Types.ObjectId,
+                ref: "GLAccount",
+                required: false,
+            },
+            credit: {
+                type: mongoose.Schema.Types.ObjectId,
+                ref: "GLAccount",
+                required: false,
+            }
+        }
+    },
+}, {
+    timestamps: true
+});
+
+const ExpenseCategory = mongoose.model('ExpenseCategory', expenseCategorySchema);
+
 module.exports = ExpenseCategory;

package/src/models/facility.js

@@ -1,63 +1,63 @@
-const mongoose = require('mongoose');
-
-// Define the schema for facilities
-const facilitySchema = new mongoose.Schema({
-    name: {
-        type: String,
-        required: [true, 'Facility name is required'],
-        trim: true,
-        minlength: [1, 'Facility name must be at least 1 character long']
-    },
-    location: {
-        type: String,
-        required: true
-    },
-    isOnboarded: { type: Boolean, default: false },
-    subDivision: { type: String, required: true },
-    isEnabled: { type: Boolean, required: true },
-    divisionArray: [],
-    landReferenceNumbers: [],
-    defaultMeasurement: { type: String, required: false },
-    totalCommonArea: { type: String, required: false },
-    totalLettableArea: { type: String, required: false },
-    modules: {
-        visitor: { type: Boolean, },
-        levy: { type: Boolean, },
-        maintenance: { type: Boolean, },
-        propertyManagement: { type: Boolean, },
-        lease: { type: Boolean, },
-        vas: { type: Boolean, },
-        tickets: { type: Boolean, },
-        utility: { type: Boolean, },
-        booking: { type: Boolean, },
-        handover: { type: Boolean, },
-        expense: { type: Boolean, },
-        campaign: { type: Boolean, },
-        procurement: { type: Boolean, },
-        accounts: { type: Boolean, },
-    },
-
-    logo: {
-        type: String,
-        trim: false,
-        default: null
-    },
-    dbName: {
-        type: String,
-        required: [true, 'Database name is required'],
-        unique: true,
-        trim: true
-    }
-
-}, {
-    timestamps: true // Automatically add createdAt and updatedAt fields
-});
-
-// Indexes for improved performance
-facilitySchema.index({ name: 1 });
-facilitySchema.index({ dbName: 1 });
-
-// Compile the model from the schema
-const Facility = mongoose.model('Facility', facilitySchema);
-
+const mongoose = require('mongoose');
+
+// Define the schema for facilities
+const facilitySchema = new mongoose.Schema({
+    name: {
+        type: String,
+        required: [true, 'Facility name is required'],
+        trim: true,
+        minlength: [1, 'Facility name must be at least 1 character long']
+    },
+    location: {
+        type: String,
+        required: true
+    },
+    isOnboarded: { type: Boolean, default: false },
+    subDivision: { type: String, required: true },
+    isEnabled: { type: Boolean, required: true },
+    divisionArray: [],
+    landReferenceNumbers: [],
+    defaultMeasurement: { type: String, required: false },
+    totalCommonArea: { type: String, required: false },
+    totalLettableArea: { type: String, required: false },
+    modules: {
+        visitor: { type: Boolean, },
+        levy: { type: Boolean, },
+        maintenance: { type: Boolean, },
+        propertyManagement: { type: Boolean, },
+        lease: { type: Boolean, },
+        vas: { type: Boolean, },
+        tickets: { type: Boolean, },
+        utility: { type: Boolean, },
+        booking: { type: Boolean, },
+        handover: { type: Boolean, },
+        expense: { type: Boolean, },
+        campaign: { type: Boolean, },
+        procurement: { type: Boolean, },
+        accounts: { type: Boolean, },
+    },
+
+    logo: {
+        type: String,
+        trim: false,
+        default: null
+    },
+    dbName: {
+        type: String,
+        required: [true, 'Database name is required'],
+        unique: true,
+        trim: true
+    }
+
+}, {
+    timestamps: true // Automatically add createdAt and updatedAt fields
+});
+
+// Indexes for improved performance
+facilitySchema.index({ name: 1 });
+facilitySchema.index({ dbName: 1 });
+
+// Compile the model from the schema
+const Facility = mongoose.model('Facility', facilitySchema);
+
 module.exports = Facility;

package/src/models/facilityBillingPrices.js

@@ -0,0 +1,30 @@
+const mongoose = require('mongoose');
+
+const FacilityBillingPriceSchema = new mongoose.Schema({
+  facilityId: {
+    type: mongoose.Schema.Types.ObjectId,
+    ref: 'Facility',
+    required: true
+  },
+  levy: {
+    type: Number,
+    required: true
+  },
+  lease: {
+    type: Number,
+    required: true
+  },
+  powerMeters: {
+    type: Number,
+    required: true
+  },
+  waterMeters: {
+    type: Number,
+    required: true
+  },
+  
+});
+
+const FacilityBillingPrice = mongoose.model('FacilityBillingPrice', FacilityBillingPriceSchema);
+
+module.exports = FacilityBillingPrice;