payservedb 5.6.7 → 5.6.8

package/.env

@@ -1,3 +1,3 @@
-User=Ps
-Password=Letmein987
+User=Ps
+Password=Letmein987
 source=?authSource=admin

package/index.js

@@ -1,193 +1,194 @@
-const mongoose = require("mongoose");
-require("dotenv").config();
-
-// Maintain a record of open connections for each database
-const connections = {};
-
-// Utility function to connect to MongoDB
-async function connectToMongoDB(
-  dbName,
-  secured,
-  username,
-  password,
-  url,
-  port,
-) {
-  try {
-    if (secured === false) {
-      const url_ = url + ":" + port;
-      const connectionString = `mongodb://${url_}/${dbName}`;
-      await mongoose.connect(connectionString, {
-        useNewUrlParser: true,
-      });
-      console.log("Connected to MongoDB");
-    } else {
-      const url_ = `${username}:${password}@${url}:${port}`;
-      const source = "?authSource=admin";
-      const connectionString = `mongodb://${url_}/${dbName}${source}`;
-      await mongoose.connect(connectionString, {
-        useNewUrlParser: true,
-      });
-      console.log("Connected to MongoDB");
-    }
-  } catch (err) {
-    console.error("Error connecting to MongoDB:", err);
-    throw err;
-  }
-}
-
-// Function to switch databases dynamically
-async function switchDB(dbName) {
-  // Check if there's already a connection to the desired database
-  if (connections[dbName]) {
-    return connections[dbName]; // Return existing connection
-  }
-
-  try {
-    // Use environment variables for connection parameters - same as in connectToMongoDB
-    const username = process.env.MONGODB_USER;
-    const password = process.env.MONGODB_PASSWORD;
-    const url = process.env.MONGODB_HOST;
-    const port = process.env.MONGODB_PORT;
-    const source = "?authSource=admin";
-
-    const connectionString = `mongodb://${username}:${password}@${url}:${port}/${dbName}${source}`;
-    const dbConnection = await mongoose.createConnection(connectionString, {
-      useNewUrlParser: true,
-    });
-
-    connections[dbName] = dbConnection; // Store the connection for reuse
-    console.log(`Switched to database: ${dbName}`);
-    return dbConnection;
-  } catch (err) {
-    console.error(`Error switching to database: ${dbName}`, err);
-    throw err;
-  }
-}
-
-// Importing all model files (Note: models may need to be re-registered for different connections)
-const models = {
-  User: require("./src/models/user"),
-  AuditLog: require("./src/models/auditlog"),
-  Company: require("./src/models/company"),
-  Customer: require("./src/models/customer"),
-  FacilityEmailDetails: require("./src/models/email"),
-  Module: require("./src/models/module"),
-  Facility: require("./src/models/facility"),
-  RefreshToken: require("./src/models/refresh_token"),
-  ApiLog: require("./src/models/apilog"),
-  ArchivedApiLog: require("./src/models/archivedapilog"),
-  ArchivedAuditLog: require("./src/models/archivedauditlog"),
-  FacilityAsset: require("./src/models/facilityasset"),
-  Unit: require("./src/models/units"),
-  FAQ: require("./src/models/faq"),
-  UnitAsset: require("./src/models/unitasset"),
-  CombinedUnit: require("./src/models/combinedUnits"),
-  Message: require("./src/models/message"),
-  SMSAfricastalking: require("./src/models/sms_africastalking"),
-  SMSMeliora: require("./src/models/sms_meliora"),
-  EntryExit: require("./src/models/entry_exit"),
-  Guard: require("./src/models/guard"),
-  Visitor: require("./src/models/visitor"),
-  VisitLog: require("./src/models/visitLog"),
-  Settings: require("./src/models/settings"),
-  Levy: require("./src/models/levy"),
-  LevyType: require("./src/models/levytype"),
-  LevyContract: require("./src/models/levycontract"),
-  Invoice: require("./src/models/invoice"),
-  Reminder: require("./src/models/reminder"),
-  Penalty: require("./src/models/penalty"),
-  Notifiaction: require("./src/models/notification"),
-  Resident: require("./src/models/resident"),
-  Asset: require("./src/models/asset"),
-  DutyRoster: require("./src/models/dutyroster"),
-  LeaseTemplate: require("./src/models/leasetemplate"),
-  Report: require("./src/models/report"),
-  Ticket: require("./src/models/tickets"),
-  Stocksandspare: require("./src/models/stocksandspare"),
-  ServiceVendor: require("./src/models/maintenance_service_vendor"),
-  MaintenanceServices: require("./src/models/maintenance_services"),
-  StockRequisition: require("./src/models/maintenancerequisition"),
-  LeaseAgreement: require("./src/models/leaseagreement"),
-  WorkOrder: require("./src/models/workorder"),
-  ValueAddedService: require("./src/models/valueaddedservices"),
-  VasInvoice: require("./src/models/vasinvoice"),
-  VasVendor: require("./src/models/vasvendor"),
-  Staff: require("./src/models/staff"),
-  ServiceRequest: require("./src/models/servicerequest"),
-  CountryTaxRate: require("./src/models/country_tax"),
-  WaterMeter: require("./src/models/water_meters"),
-  DailyConsumption: require("./src/models/smart_meter_daily_consumption"),
-  WaterMeterSettings: require("./src/models/water_meter_settings"),
-  AnalogBilling: require("./src/models/water_meter_billing"),
-  MeterSize: require("./src/models/water_meter_size"),
-  WaterInvoice: require("./src/models/water_invoice"),
-  MeterProtocol: require("./src/models/water_meter_communication"),
-  MeterManufacturer: require("./src/models/water_meter_manufacturer"),
-  MeterIotCard: require("./src/models/water_meter_iot_cards"),
-  MetersDelivery: require("./src/models/water_meters_delivery"),
-  Notification: require("./src/models/notification"),
-  Concentrator: require("./src/models/water_meter_concentrator"),
-  Handover: require("./src/models/handover"),
-  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"),
-  DefaultPaymentDetails: require("./src/models/default_payment_details"),
-  Currency: require("./src/models/currency_settings"),
-  WaterMeterAccount: require("./src/models/water_meter_account"),
-  SingleDayWaterMeterHistory: require("./src/models/water_meter_single_day_history"),
-  DailyWaterMeterHistory: require("./src/models/water_meter_daily_history"),
-  MonthlyWaterMeterHistory: require("./src/models/water_meter_monthly_history"),
-  WaterPrepaidCredit: require("./src/models/water_prepaid_credit"),
-  WaterPrepaidDebit: require("./src/models/water_prepaid_debit"),
-  MeterLog: require("./src/models/water_meter_communication_logs"),
-  CashPayment: require("./src/models/cashpayment"),
-  VasPayment: require("./src/models/vas_payments"),
-  VasInvoicesQuickBooks: require("./src/models/vas_invoices_upload"),
-  ServiceChargePayment: require("./src/models/service_charge_payments"),
-  ServiceChargeInvoiceUpload: require("./src/models/service_charge_invoice_upload"),
-  Campaign: require("./src/models/campaigns"),
-  InspectionItem: require("./src/models/item_inspection"),
-  Supplier: require("./src/models/suppliers"),
-  PurchaseRequest: require("./src/models/purchase_request"),
-  PurchaseOrder: require("./src/models/purchase_order"),
-  RFQDetails: require("./src/models/rfq_details"),
-  RFQResponse: require("./src/models/rfq_response"),
-  ApprovalWorkflow: require("./src/models/approvalsWorkflows"),
-  CommonAreaElectricityReading: require("./src/models/common_area_electricity"),
-  CommonAreaWaterReading: require("./src/models/common_area_water"),
-  CommonAreaGeneratorReading: require("./src/models/common_area_generator"),
-  CommonAreaUtilityAlert: require("./src/models/common_area_utility_alert"),
-  BookingProperty: require("./src/models/bookingproperty"),
-  BookingReservation: require("./src/models/bookingreservation"),
-  BookingConfig: require("./src/models/bookingconfig"),
-  BookingAnalytics: require("./src/models/bookinganalytics"),
-  BookingInvoice: require("./src/models/booking_invoice"),
-  RevenueRecord: require("./src/models/bookingrevenuerecord"),
-  GLAccount: require("./src/models/gl_accounts"),
-  GLEntry: require("./src/models/gl_entries"),
-  GLAccountDoubleEntries: require("./src/models/gl_account_double_entries"),
-  PendingCredential: require("./src/models/pendingCredentials"),
-  UnitManagementTemplate: require("./src/models/unitManagementTemplate"),
-  PropertyManagerRevenue: require("./src/models/propertyManagerRevenue"),
-  PropertyManagerContract: require("./src/models/propertyManagerContract"),
-};
-
-// Function to get models dynamically from a specific database connection
-async function getModelFromDB(dbConnection, modelName, schema) {
-  if (!dbConnection.models[modelName]) {
-    return dbConnection.model(modelName, schema); // Register the model in the db connection
-  }
-  return dbConnection.models[modelName]; // Return existing model if already registered
-}
-
-module.exports = {
-  connectToMongoDB,
-  switchDB,
-  getModelFromDB,
-  ...models, // Spread operator to export all models
-};
+const mongoose = require("mongoose");
+require("dotenv").config();
+
+// Maintain a record of open connections for each database
+const connections = {};
+
+// Utility function to connect to MongoDB
+async function connectToMongoDB(
+    dbName,
+    secured,
+    username,
+    password,
+    url,
+    port,
+) {
+    try {
+        if (secured === false) {
+            const url_ = url + ":" + port;
+            const connectionString = `mongodb://${url_}/${dbName}`;
+            await mongoose.connect(connectionString, {
+                useNewUrlParser: true,
+            });
+            console.log("Connected to MongoDB");
+        } else {
+            const url_ = `${username}:${password}@${url}:${port}`;
+            const source = "?authSource=admin";
+            const connectionString = `mongodb://${url_}/${dbName}${source}`;
+            await mongoose.connect(connectionString, {
+                useNewUrlParser: true,
+            });
+            console.log("Connected to MongoDB");
+        }
+    } catch (err) {
+        console.error("Error connecting to MongoDB:", err);
+        throw err;
+    }
+}
+
+// Function to switch databases dynamically
+async function switchDB(dbName) {
+    // Check if there's already a connection to the desired database
+    if (connections[dbName]) {
+        return connections[dbName]; // Return existing connection
+    }
+
+    try {
+        // Use environment variables for connection parameters - same as in connectToMongoDB
+        const username = process.env.MONGODB_USER;
+        const password = process.env.MONGODB_PASSWORD;
+        const url = process.env.MONGODB_HOST;
+        const port = process.env.MONGODB_PORT;
+        const source = "?authSource=admin";
+
+        const connectionString = `mongodb://${username}:${password}@${url}:${port}/${dbName}${source}`;
+        const dbConnection = await mongoose.createConnection(connectionString, {
+            useNewUrlParser: true,
+        });
+
+        connections[dbName] = dbConnection; // Store the connection for reuse
+        console.log(`Switched to database: ${dbName}`);
+        return dbConnection;
+    } catch (err) {
+        console.error(`Error switching to database: ${dbName}`, err);
+        throw err;
+    }
+}
+
+// Importing all model files (Note: models may need to be re-registered for different connections)
+const models = {
+    User: require("./src/models/user"),
+    AuditLog: require("./src/models/auditlog"),
+    Company: require("./src/models/company"),
+    Customer: require("./src/models/customer"),
+    FacilityEmailDetails: require("./src/models/email"),
+    Module: require("./src/models/module"),
+    Facility: require("./src/models/facility"),
+    RefreshToken: require("./src/models/refresh_token"),
+    ApiLog: require("./src/models/apilog"),
+    ArchivedApiLog: require("./src/models/archivedapilog"),
+    ArchivedAuditLog: require("./src/models/archivedauditlog"),
+    FacilityAsset: require("./src/models/facilityasset"),
+    Unit: require("./src/models/units"),
+    FAQ: require("./src/models/faq"),
+    UnitAsset: require("./src/models/unitasset"),
+    CombinedUnit: require("./src/models/combinedUnits"),
+    Message: require("./src/models/message"),
+    SMSAfricastalking: require("./src/models/sms_africastalking"),
+    SMSMeliora: require("./src/models/sms_meliora"),
+    EntryExit: require("./src/models/entry_exit"),
+    Guard: require("./src/models/guard"),
+    Visitor: require("./src/models/visitor"),
+    VisitLog: require("./src/models/visitLog"),
+    Settings: require("./src/models/settings"),
+    Levy: require("./src/models/levy"),
+    LevyType: require("./src/models/levytype"),
+    LevyContract: require("./src/models/levycontract"),
+    Invoice: require("./src/models/invoice"),
+    Reminder: require("./src/models/reminder"),
+    Penalty: require("./src/models/penalty"),
+    Notifiaction: require("./src/models/notification"),
+    Resident: require("./src/models/resident"),
+    Asset: require("./src/models/asset"),
+    DutyRoster: require("./src/models/dutyroster"),
+    LeaseTemplate: require("./src/models/leasetemplate"),
+    Report: require("./src/models/report"),
+    Ticket: require("./src/models/tickets"),
+    Stocksandspare: require("./src/models/stocksandspare"),
+    ServiceVendor: require("./src/models/maintenance_service_vendor"),
+    MaintenanceServices: require("./src/models/maintenance_services"),
+    StockRequisition: require("./src/models/maintenancerequisition"),
+    LeaseAgreement: require("./src/models/leaseagreement"),
+    WorkOrder: require("./src/models/workorder"),
+    ValueAddedService: require("./src/models/valueaddedservices"),
+    VasInvoice: require("./src/models/vasinvoice"),
+    VasVendor: require("./src/models/vasvendor"),
+    Staff: require("./src/models/staff"),
+    ServiceRequest: require("./src/models/servicerequest"),
+    CountryTaxRate: require("./src/models/country_tax"),
+    WaterMeter: require("./src/models/water_meters"),
+    DailyConsumption: require("./src/models/smart_meter_daily_consumption"),
+    WaterMeterSettings: require("./src/models/water_meter_settings"),
+    AnalogBilling: require("./src/models/water_meter_billing"),
+    MeterSize: require("./src/models/water_meter_size"),
+    WaterInvoice: require("./src/models/water_invoice"),
+    MeterProtocol: require("./src/models/water_meter_communication"),
+    MeterManufacturer: require("./src/models/water_meter_manufacturer"),
+    MeterIotCard: require("./src/models/water_meter_iot_cards"),
+    MetersDelivery: require("./src/models/water_meters_delivery"),
+    Notification: require("./src/models/notification"),
+    Concentrator: require("./src/models/water_meter_concentrator"),
+    Handover: require("./src/models/handover"),
+    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"),
+    DefaultPaymentDetails: require("./src/models/default_payment_details"),
+    Currency: require("./src/models/currency_settings"),
+    WaterMeterAccount: require("./src/models/water_meter_account"),
+    SingleDayWaterMeterHistory: require("./src/models/water_meter_single_day_history"),
+    DailyWaterMeterHistory: require("./src/models/water_meter_daily_history"),
+    MonthlyWaterMeterHistory: require("./src/models/water_meter_monthly_history"),
+    WaterPrepaidCredit: require("./src/models/water_prepaid_credit"),
+    WaterPrepaidDebit: require("./src/models/water_prepaid_debit"),
+    MeterLog: require("./src/models/water_meter_communication_logs"),
+    CashPayment: require("./src/models/cashpayment"),
+    VasPayment: require("./src/models/vas_payments"),
+    VasInvoicesQuickBooks: require("./src/models/vas_invoices_upload"),
+    ServiceChargePayment: require("./src/models/service_charge_payments"),
+    ServiceChargeInvoiceUpload: require("./src/models/service_charge_invoice_upload"),
+    Campaign: require("./src/models/campaigns"),
+    InspectionItem: require("./src/models/item_inspection"),
+    Supplier: require("./src/models/suppliers"),
+    PurchaseRequest: require("./src/models/purchase_request"),
+    PurchaseOrder: require("./src/models/purchase_order"),
+    RFQDetails: require("./src/models/rfq_details"),
+    RFQResponse: require("./src/models/rfq_response"),
+    ApprovalWorkflow: require("./src/models/approvalsWorkflows"),
+    CommonAreaElectricityReading: require("./src/models/common_area_electricity"),
+    CommonAreaWaterReading: require("./src/models/common_area_water"),
+    CommonAreaGeneratorReading: require("./src/models/common_area_generator"),
+    CommonAreaUtilityAlert: require("./src/models/common_area_utility_alert"),
+    BookingProperty: require("./src/models/bookingproperty"),
+    BookingReservation: require("./src/models/bookingreservation"),
+    BookingConfig: require("./src/models/bookingconfig"),
+    BookingAnalytics: require("./src/models/bookinganalytics"),
+    BookingInvoice: require("./src/models/booking_invoice"),
+    RevenueRecord: require("./src/models/bookingrevenuerecord"),
+    GLAccount: require("./src/models/gl_accounts"),
+    GLEntry: require("./src/models/gl_entries"),
+    GLAccountDoubleEntries: require("./src/models/gl_account_double_entries"),
+    PendingCredential: require("./src/models/pendingCredentials"),
+    UnitManagementTemplate: require("./src/models/unitManagementTemplate"),
+    PropertyManagerRevenue: require("./src/models/propertyManagerRevenue"),
+    PropertyManagerContract: require("./src/models/propertyManagerContract"),
+    BillerAddress: require('./src/models/billerAddress')
+};
+
+// Function to get models dynamically from a specific database connection
+async function getModelFromDB(dbConnection, modelName, schema) {
+    if (!dbConnection.models[modelName]) {
+        return dbConnection.model(modelName, schema); // Register the model in the db connection
+    }
+    return dbConnection.models[modelName]; // Return existing model if already registered
+}
+
+module.exports = {
+    connectToMongoDB,
+    switchDB,
+    getModelFromDB,
+    ...models, // Spread operator to export all models
+};

package/package.json

@@ -1,17 +1,17 @@
-{
-  "name": "payservedb",
-  "version": "5.6.7",
-  "main": "index.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "keywords": [],
-  "author": "",
-  "license": "ISC",
-  "description": "",
-  "dependencies": {
-    "dotenv": "^16.4.5",
-    "moment-timezone": "^0.5.47",
-    "mongoose": "^8.3.5"
-  }
-}
+{
+  "name": "payservedb",
+  "version": "5.6.8",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "keywords": [],
+  "author": "",
+  "license": "ISC",
+  "description": "",
+  "dependencies": {
+    "dotenv": "^16.4.5",
+    "moment-timezone": "^0.5.47",
+    "mongoose": "^8.3.5"
+  }
+}

package/src/models/account.js

@@ -1,36 +1,36 @@
-const mongoose = require("mongoose");
-
-const accountSchema = new mongoose.Schema({
-    accountNumber: {
-        type: String,
-        required: true,
-        unique: true,
-        trim: true,
-    },
-    facilityId: {
-        type: mongoose.Schema.Types.ObjectId,
-        default: null,
-    },
-    customerId: {
-        type: mongoose.Schema.Types.ObjectId,
-        default: null,
-    },
-    isActive: {
-        type: Boolean,
-        default: true,
-    },
-    accountType: {
-        type: String,
-    },
-    amount: {
-        type: Number,
-    },
-    createdAt: {
-        type: Date,
-        default: Date.now,
-    },
-});
-
-const Account = mongoose.model('Account', accountSchema);
-
+const mongoose = require("mongoose");
+
+const accountSchema = new mongoose.Schema({
+    accountNumber: {
+        type: String,
+        required: true,
+        unique: true,
+        trim: true,
+    },
+    facilityId: {
+        type: mongoose.Schema.Types.ObjectId,
+        default: null,
+    },
+    customerId: {
+        type: mongoose.Schema.Types.ObjectId,
+        default: null,
+    },
+    isActive: {
+        type: Boolean,
+        default: true,
+    },
+    accountType: {
+        type: String,
+    },
+    amount: {
+        type: Number,
+    },
+    createdAt: {
+        type: Date,
+        default: Date.now,
+    },
+});
+
+const Account = mongoose.model('Account', accountSchema);
+
 module.exports = Account;

package/src/models/apilog.js

@@ -1,18 +1,18 @@
-// models/apiLog.js
-const mongoose = require('mongoose');
-const { Schema } = mongoose;
-
-const apiLogSchema = new Schema({
-    url: { type: String, required: true, index: true },
-    method: { type: String, required: true, index: true },
-    duration: { type: Number, required: true },
-    time: { type: Date, default: Date.now, required: true, index: true },
-    date: { type: String, required: true, index: true },
-});
-
-
-apiLogSchema.index({ time: 1 }, { expireAfterSeconds: 60 * 60 * 24 * 365 });
-
-const ApiLog = mongoose.model('ApiLog', apiLogSchema);
-
-module.exports = ApiLog;
+// models/apiLog.js
+const mongoose = require('mongoose');
+const { Schema } = mongoose;
+
+const apiLogSchema = new Schema({
+    url: { type: String, required: true, index: true },
+    method: { type: String, required: true, index: true },
+    duration: { type: Number, required: true },
+    time: { type: Date, default: Date.now, required: true, index: true },
+    date: { type: String, required: true, index: true },
+});
+
+
+apiLogSchema.index({ time: 1 }, { expireAfterSeconds: 60 * 60 * 24 * 365 });
+
+const ApiLog = mongoose.model('ApiLog', apiLogSchema);
+
+module.exports = ApiLog;

package/src/models/approvalsWorkflows.js

@@ -1,49 +1,49 @@
-const mongoose = require('mongoose');
-
-const approvalWorkflowSchema = new mongoose.Schema(
-  {
-    module: {
-      type: String,
-      required: true,
-      trim: true
-    },
-    facilityId: {
-      type: mongoose.Schema.Types.ObjectId,
-      ref: 'Facility',
-      required: true,
-      index: true
-    },
-   
-    steps: {
-      type: [
-        {
-          stepNumber: {
-            type: Number,
-            required: true,
-            min: 1
-          },
-          name: {
-            type: String,
-            required: true,
-            trim: true
-          },
-          approvers: [
-            {
-              type: mongoose.Schema.Types.ObjectId,
-              ref: 'User', 
-              required: true
-            }
-          ]
-        }
-      ],
-      default: []
-    }
-  },
-  {
-    timestamps: true
-  }
-);
-
-const ApprovalWorkflow = mongoose.model('ApprovalWorkflow', approvalWorkflowSchema);
-
-module.exports = ApprovalWorkflow;
+const mongoose = require('mongoose');
+
+const approvalWorkflowSchema = new mongoose.Schema(
+  {
+    module: {
+      type: String,
+      required: true,
+      trim: true
+    },
+    facilityId: {
+      type: mongoose.Schema.Types.ObjectId,
+      ref: 'Facility',
+      required: true,
+      index: true
+    },
+   
+    steps: {
+      type: [
+        {
+          stepNumber: {
+            type: Number,
+            required: true,
+            min: 1
+          },
+          name: {
+            type: String,
+            required: true,
+            trim: true
+          },
+          approvers: [
+            {
+              type: mongoose.Schema.Types.ObjectId,
+              ref: 'User', 
+              required: true
+            }
+          ]
+        }
+      ],
+      default: []
+    }
+  },
+  {
+    timestamps: true
+  }
+);
+
+const ApprovalWorkflow = mongoose.model('ApprovalWorkflow', approvalWorkflowSchema);
+
+module.exports = ApprovalWorkflow;