payservedb 5.9.9 → 6.0.0

package/index.js

@@ -4,6 +4,9 @@ require("dotenv").config();
 // Maintain a record of open connections for each database
 const connections = {};
 
+// Model registry to track loaded models
+const modelRegistry = {};
+
 // Utility function to connect to MongoDB
 async function connectToMongoDB(
   dbName,
@@ -57,139 +60,150 @@ async function switchDB(dbName) {
     });
 
     connections[dbName] = dbConnection; // Store the connection for reuse
-    console.log(`Switched to database: ${dbName}`);
+    // console.log(Switched to database: ${dbName});
     return dbConnection;
   } catch (err) {
-    console.error(`Error switching to database: ${dbName}`, 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"),
-  PaymentTermMark: require("./src/models/paymentTermsMarks"),
-  DeliveryTimeMark: require("./src/models/deliveryTimeMarks"),
-  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"),
-  BankDetails: require("./src/models/bankdetails"),
-  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"),
-  AssetAssignment: require("./src/models/assetsAssignment"),
-  Wallet: require("./src/models/wallet"),
-  WalletTransaction: require("./src/models/wallet_transactions"),
-  GoodsReceivedNote: require("./src/models/goodsReceivedNotes"),
-  MeterCommandQueue: require("./src/models/water_meter_Command_Queue"),
-  FacilityDepartment: require("./src/models/facility_departements"),
-  EmailSmsQueue: require("./src/models/email_sms_queue"),
-  PurchaseOrderInvoice: require("./src/models/purchaseOrderInvoice")
-  
+// Model path registry - maps model names to their file paths
+const modelPaths = {
+  User: "./src/models/user",
+  AuditLog: "./src/models/auditlog",
+  Company: "./src/models/company",
+  Customer: "./src/models/customer",
+  FacilityEmailDetails: "./src/models/email",
+  Module: "./src/models/module",
+  Facility: "./src/models/facility",
+  RefreshToken: "./src/models/refresh_token",
+  ApiLog: "./src/models/apilog",
+  ArchivedApiLog: "./src/models/archivedapilog",
+  ArchivedAuditLog: "./src/models/archivedauditlog",
+  FacilityAsset: "./src/models/facilityasset",
+  Unit: "./src/models/units",
+  FAQ: "./src/models/faq",
+  UnitAsset: "./src/models/unitasset",
+  CombinedUnit: "./src/models/combinedUnits",
+  Message: "./src/models/message",
+  SMSAfricastalking: "./src/models/sms_africastalking",
+  SMSMeliora: "./src/models/sms_meliora",
+  EntryExit: "./src/models/entry_exit",
+  Guard: "./src/models/guard",
+  Visitor: "./src/models/visitor",
+  VisitLog: "./src/models/visitLog",
+  Settings: "./src/models/settings",
+  Levy: "./src/models/levy",
+  LevyType: "./src/models/levytype",
+  LevyContract: "./src/models/levycontract",
+  Invoice: "./src/models/invoice",
+  Reminder: "./src/models/reminder",
+  Penalty: "./src/models/penalty",
+  Notification: "./src/models/notification",
+  Resident: "./src/models/resident",
+  Asset: "./src/models/asset",
+  DutyRoster: "./src/models/dutyroster",
+  LeaseTemplate: "./src/models/leasetemplate",
+  Report: "./src/models/report",
+  Ticket: "./src/models/tickets",
+  Stocksandspare: "./src/models/stocksandspare",
+  ServiceVendor: "./src/models/maintenance_service_vendor",
+  MaintenanceServices: "./src/models/maintenance_services",
+  StockRequisition: "./src/models/maintenancerequisition",
+  LeaseAgreement: "./src/models/leaseagreement",
+  WorkOrder: "./src/models/workorder",
+  ValueAddedService: "./src/models/valueaddedservices",
+  VasInvoice: "./src/models/vasinvoice",
+  VasVendor: "./src/models/vasvendor",
+  Staff: "./src/models/staff",
+  ServiceRequest: "./src/models/servicerequest",
+  CountryTaxRate: "./src/models/country_tax",
+  WaterMeter: "./src/models/water_meters",
+  DailyConsumption: "./src/models/smart_meter_daily_consumption",
+  WaterMeterSettings: "./src/models/water_meter_settings",
+  AnalogBilling: "./src/models/water_meter_billing",
+  MeterSize: "./src/models/water_meter_size",
+  WaterInvoice: "./src/models/water_invoice",
+  MeterProtocol: "./src/models/water_meter_communication",
+  MeterManufacturer: "./src/models/water_meter_manufacturer",
+  MeterIotCard: "./src/models/water_meter_iot_cards",
+  MetersDelivery: "./src/models/water_meters_delivery",
+  Concentrator: "./src/models/water_meter_concentrator",
+  Handover: "./src/models/handover",
+  Budget: "./src/models/budget",
+  BudgetCategory: "./src/models/budgetCategory",
+  Expense: "./src/models/expense",
+  ExpenseCategory: "./src/models/expense_category",
+  InvoiceSettings: "./src/models/levy_invoice_settings",
+  Account: "./src/models/account",
+  FacilityPaymentDetails: "./src/models/facility_payment_details",
+  DefaultPaymentDetails: "./src/models/default_payment_details",
+  Currency: "./src/models/currency_settings",
+  WaterMeterAccount: "./src/models/water_meter_account",
+  SingleDayWaterMeterHistory: "./src/models/water_meter_single_day_history",
+  DailyWaterMeterHistory: "./src/models/water_meter_daily_history",
+  MonthlyWaterMeterHistory: "./src/models/water_meter_monthly_history",
+  WaterPrepaidCredit: "./src/models/water_prepaid_credit",
+  WaterPrepaidDebit: "./src/models/water_prepaid_debit",
+  MeterLog: "./src/models/water_meter_communication_logs",
+  CashPayment: "./src/models/cashpayment",
+  VasPayment: "./src/models/vas_payments",
+  VasInvoicesQuickBooks: "./src/models/vas_invoices_upload",
+  ServiceChargePayment: "./src/models/service_charge_payments",
+  ServiceChargeInvoiceUpload: "./src/models/service_charge_invoice_upload",
+  Campaign: "./src/models/campaigns",
+  InspectionItem: "./src/models/item_inspection",
+  Supplier: "./src/models/suppliers",
+  PurchaseRequest: "./src/models/purchase_request",
+  PurchaseOrder: "./src/models/purchase_order",
+  PaymentTermMark: "./src/models/paymentTermsMarks",
+  DeliveryTimeMark: "./src/models/deliveryTimeMarks",
+  RFQDetails: "./src/models/rfq_details",
+  RFQResponse: "./src/models/rfq_response",
+  ApprovalWorkflow: "./src/models/approvalsWorkflows",
+  CommonAreaElectricityReading: "./src/models/common_area_electricity",
+  CommonAreaWaterReading: "./src/models/common_area_water",
+  CommonAreaGeneratorReading: "./src/models/common_area_generator",
+  CommonAreaUtilityAlert: "./src/models/common_area_utility_alert",
+  BookingProperty: "./src/models/bookingproperty",
+  BookingReservation: "./src/models/bookingreservation",
+  BookingConfig: "./src/models/bookingconfig",
+  BookingAnalytics: "./src/models/bookinganalytics",
+  BookingInvoice: "./src/models/booking_invoice",
+  BankDetails: "./src/models/bankdetails",
+  RevenueRecord: "./src/models/bookingrevenuerecord",
+  GLAccount: "./src/models/gl_accounts",
+  GLEntry: "./src/models/gl_entries",
+  GLAccountDoubleEntries: "./src/models/gl_account_double_entries",
+  PendingCredential: "./src/models/pendingCredentials",
+  UnitManagementTemplate: "./src/models/unitManagementTemplate",
+  PropertyManagerRevenue: "./src/models/propertyManagerRevenue",
+  PropertyManagerContract: "./src/models/propertyManagerContract",
+  BillerAddress: "./src/models/billerAddress",
+  AssetAssignment: "./src/models/assetsAssignment",
+  Wallet: "./src/models/wallet",
+  WalletTransaction: "./src/models/wallet_transactions",
+  GoodsReceivedNote: "./src/models/goodsReceivedNotes",
+  MeterCommandQueue: "./src/models/water_meter_Command_Queue",
+  FacilityDepartment: "./src/models/facility_departements",
+  EmailSmsQueue: "./src/models/email_sms_queue",
+  PurchaseOrderInvoice: "./src/models/purchaseOrderInvoice"
 };
 
+// Function to load specific models on demand
+function loadModel(modelName) {
+  if (!modelPaths[modelName]) {
+    throw new Error(Model in registry);
+  }
+  
+  if (!modelRegistry[modelName]) {
+    modelRegistry[modelName] = require(modelPaths[modelName]);
+  }
+  
+  return modelRegistry[modelName];
+}
+
 // Function to get models dynamically from a specific database connection
 async function getModelFromDB(dbConnection, modelName, schema) {
   if (!dbConnection.models[modelName]) {
@@ -198,9 +212,85 @@ async function getModelFromDB(dbConnection, modelName, schema) {
   return dbConnection.models[modelName]; // Return existing model if already registered
 }
 
+// Function to load multiple models at once
+function loadModels(modelNames) {
+  const models = {};
+  modelNames.forEach(modelName => {
+    models[modelName] = loadModel(modelName);
+  });
+  return models;
+}
+
+// Function to get available model names
+function getAvailableModels() {
+  return Object.keys(modelPaths);
+}
+
+// Function to initialize service with specific models
+function initializeService(modelNames = []) {
+  const serviceSchemas = {};
+  const serviceModels = {};
+  let currentConnection = null;
+  
+  // Load schemas for specified models
+  modelNames.forEach(modelName => {
+    if (!modelPaths[modelName]) {
+      // console.warn(Warning: Model ${modelName} not found in registry);
+      return;
+    }
+    serviceSchemas[modelName] = loadModel(modelName);
+  });
+  
+  // Enhanced connect function that also registers models
+  async function connectWithModels(dbName, secured, username, password, url, port) {
+    await connectToMongoDB(dbName, secured, username, password, url, port);
+    currentConnection = mongoose.connection;
+    
+    // Register models with the current connection
+    modelNames.forEach(modelName => {
+      if (serviceSchemas[modelName] && !currentConnection.models[modelName]) {
+        serviceModels[modelName] = currentConnection.model(modelName, serviceSchemas[modelName]);
+      } else if (currentConnection.models[modelName]) {
+        serviceModels[modelName] = currentConnection.models[modelName];
+      }
+    });
+    
+    return serviceModels;
+  }
+  
+  // Enhanced switchDB function that also registers models
+  async function switchDBWithModels(dbName) {
+    const dbConnection = await switchDB(dbName);
+    
+    // Register models with the new connection
+    const dbModels = {};
+    modelNames.forEach(modelName => {
+      if (serviceSchemas[modelName]) {
+        dbModels[modelName] = getModelFromDB(dbConnection, modelName, serviceSchemas[modelName]);
+      }
+    });
+    
+    return { connection: dbConnection, models: dbModels };
+  }
+  
+  return {
+    schemas: serviceSchemas,
+    models: serviceModels,
+    connectToMongoDB: connectWithModels,
+    switchDB: switchDBWithModels,
+    getModelFromDB,
+    loadModel,
+    loadModels,
+    getCurrentConnection: () => currentConnection
+  };
+}
+
 module.exports = {
   connectToMongoDB,
   switchDB,
   getModelFromDB,
-  ...models, // Spread operator to export all models
-};
+  loadModel,
+  loadModels,
+  getAvailableModels,
+  initializeService
+};

package/package.json

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