payservedb 3.2.5 → 3.2.6

package/index.js

@@ -113,7 +113,10 @@ const models = {
     MeterIotCard:require('./src/models/water_meter_iot_cards'),
     MetersDelivery:require('./src/models/water_meters_delivery'),
     Concentrator:require('./src/models/water_meter_concentrator'),
-    Handover:require('./src/models/handover')
+    Handover:require('./src/models/handover'),
+    Budget:require('./src/models/budget'),
+    BudgetCategory:require('./src/models/budgetCategory'),
+    Expense:require('./src/models/expense')
    
     
 };

package/package.json

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

package/src/models/budget.js

@@ -0,0 +1,34 @@
+const mongoose = require('mongoose');
+
+const budgetSchema = new mongoose.Schema({
+    facilityId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Facility',
+        required: true
+    },
+    categoryId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'BudgetCategory',
+        required: true
+    },
+    amount: {
+        type: Number,
+        required: true
+    },
+    period: {
+        startDate: {
+            type: Date,
+            required: true
+        },
+        endDate: {
+            type: Date,
+            required: true
+        }
+    }
+}, {
+    timestamps: true
+});
+
+const Budget = mongoose.model('Budget', budgetSchema);
+
+module.exports = Budget;

package/src/models/budgetCategory.js

@@ -0,0 +1,20 @@
+const mongoose = require('mongoose');
+
+const budgetCategorySchema = new mongoose.Schema({
+    facilityId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Facility',
+        required: true
+    },
+    title: {
+        type: String,
+        required: true,
+        trim: true
+    }
+}, {
+    timestamps: true
+});
+
+const BudgetCategory = mongoose.model('BudgetCategory', budgetCategorySchema);
+
+module.exports = BudgetCategory;

package/src/models/expense.js

@@ -0,0 +1,52 @@
+const mongoose = require('mongoose');
+
+const expenseSchema = new mongoose.Schema({
+    facilityId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Facility',
+        required: true
+    },
+    categoryId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'BudgetCategory',
+        required: true
+    },
+    name: {
+        type: String,
+        required: true,
+        trim: true
+    },
+    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
+    }
+}, {
+    timestamps: true
+});
+
+const Expense = mongoose.model('Expense', expenseSchema);
+
+module.exports = Expense;

package/src/models/water_meters_delivery.js

@@ -17,8 +17,6 @@ const deliverySchema = new mongoose.Schema({
         trim: true
     },
     deliveredBy: {
-
-        
         type: String,
         required: true,
         trim: true
@@ -29,8 +27,7 @@ const deliverySchema = new mongoose.Schema({
     },
     deliveryDate: {
         type: Date,
-        required: true,
-        default: Date.now
+        required: true
     },
     notes: {
         type: String,
@@ -42,7 +39,7 @@ const deliverySchema = new mongoose.Schema({
     },
     fileUrl: {
         type: String,
-        trim: true 
+        trim: true
     },
     concentrators: [{
         concentratorId: {