payservedb 5.4.9 → 5.5.0

package/index.js

@@ -130,6 +130,7 @@ const models = {
     Budget: require('./src/models/budget'),
     BudgetCategory: require('./src/models/budgetCategory'),
     Expense: require('./src/models/expense'),
+    ExpenseCategory: require('./src/models/expense_category'),
     InvoiceSettings: require('./src/models/levy_invoice_settings'),
     Account: require('./src/models/account'),
     FacilityPaymentDetails: require('./src/models/facility_payment_details'),

package/package.json

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

package/src/models/expense.js

@@ -6,16 +6,19 @@ const expenseSchema = new mongoose.Schema({
         ref: 'Facility',
         required: true
     },
-    categoryId: {
+    budgetId: {
         type: mongoose.Schema.Types.ObjectId,
-        ref: 'BudgetCategory',
-        required: true
+        ref: 'Budget'
     },
     name: {
         type: String,
         required: true,
         trim: true
     },
+    categoryId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'ExpenseCategory'
+    },
     amount: {
         type: Number,
         required: true
@@ -35,10 +38,6 @@ const expenseSchema = new mongoose.Schema({
         enum: ['PAID', 'UNPAID'],
         default: 'UNPAID'
     },
-    approval: {
-        type: Boolean,
-        default: false
-    },
     description: {
         type: String,
         trim: true
@@ -46,7 +45,52 @@ const expenseSchema = new mongoose.Schema({
     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
 });

package/src/models/expense_category.js

@@ -0,0 +1,20 @@
+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
+    }
+}, {
+    timestamps: true
+});
+
+const ExpenseCategory = mongoose.model('ExpenseCategory', expenseCategorySchema);
+
+module.exports = ExpenseCategory;