payservedb 7.9.8 → 8.0.0

package/index.js

@@ -216,7 +216,9 @@ const models = {
     CoreInvoiceSettings: require("./src/models/coreInvoiceSettings"),
     FacilityInvoice: require("./src/models/facilityInvoice"),
     CoreBaseSettings: require("./src/models/coreBaseSettings"),
-    Recipient: require("./src/models/facilityInvoiceRecipient")
+    Recipient: require("./src/models/facilityInvoiceRecipient"),
+    FacilityBillingPrice: require("./src/models/facilityBillingPrices"),
+    FacilityInvoicePayment: require("./src/models/facilityInvoicePayment")
 };
 
 // Function to get models dynamically from a specific database connection

package/package.json

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

package/src/models/facilityBillingPrices.js

@@ -0,0 +1,28 @@
+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;

package/src/models/facilityInvoicePayment.js

@@ -0,0 +1,47 @@
+const mongoose = require("mongoose");
+
+const FacilityInvoicePaymentSchema = new mongoose.Schema({
+  facilityId: {
+    type: mongoose.Schema.Types.ObjectId,
+    ref: "Facility",
+    required: true,
+  },
+  invoiceId: {
+    type: mongoose.Schema.Types.ObjectId,
+    ref: "FacilityInvoice",
+    required: true,
+  },
+  paymentDate: {
+    type: Date,
+    required: true,
+  },
+  amountPaid: {
+    type: Number,
+    required: true,
+  },
+  comments: {
+    type: String,
+    required: false,
+  },
+  status: {
+    type: String,
+    enum: ["pending", "paid", "overpaid", "rejected"],
+    default: "pending",
+  },
+  paymentMethod: {
+    type: String,
+    enum: ["cash", "credit", "debit"],
+    default: "cash",
+  },
+  rejectedReason: {
+    type: String,
+    required: false,
+  },
+});
+
+const FacilityInvoicePayment = mongoose.model(
+  "FacilityInvoicePayment",
+  FacilityInvoicePaymentSchema,
+);
+
+module.exports = FacilityInvoicePayment;

package/src/models/invoicing_schedule.js

@@ -1,22 +1,18 @@
 const mongoose = require('mongoose');
 
-/**
- * @description The schema for tracking invoicing schedules for each facility.
- * This document is stored in the central invoice service database.
- * It contains minimal data required for the service to function,
- * avoiding the complexity of facility-specific data.
- */
 const InvoicingScheduleSchema = new mongoose.Schema({
     facilityId: {
-        type: String,
-        required: true,
-        unique: true,
-        index: true
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Facility',
     },
     nextInvoiceDate: {
         type: Date,
         required: true
     },
+    invoiceType: {
+        type: String,
+        required: true
+    },
     createdAt: {
         type: Date,
         default: Date.now