payservedb 4.2.1 → 4.2.2

package/.env

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

package/index.js

@@ -1,152 +1,152 @@
-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 {
-        const connectionString = `mongodb://${url}/${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'),
-    Email: 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'),
-    Meter: require('./src/models/smart_water_meter'),
-    DailyConsumption: require('./src/models/smart_meter_daily_consumption'),
-    WaterMeterSettings: require('./src/models/water_meter_settings'),
-    AnalogMeter: require('./src/models/analog_water_meter'),
-    AnalogBilling: require('./src/models/analog_water_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'),
-    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'),
-    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'),
-    UserAccount: require('./src/models/user_account'),
-    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')
-
-};
-
-// 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 {
+        const connectionString = `mongodb://${url}/${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'),
+    Email: 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'),
+    Meter: require('./src/models/smart_water_meter'),
+    DailyConsumption: require('./src/models/smart_meter_daily_consumption'),
+    WaterMeterSettings: require('./src/models/water_meter_settings'),
+    AnalogMeter: require('./src/models/analog_water_meter'),
+    AnalogBilling: require('./src/models/analog_water_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'),
+    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'),
+    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'),
+    UserAccount: require('./src/models/user_account'),
+    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')
+
+};
+
+// 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": "4.2.1",
-  "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": "4.2.2",
+  "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,37 +1,37 @@
-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,
-    },
-});
-
-// [ {accountnumber:1,facilityId:1},{accountnumber:2, facility:2}]
-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,
+    },
+});
+
+// [ {accountnumber:1,facilityId:1},{accountnumber:2, facility:2}]
+const Account = mongoose.model('Account', accountSchema);
+
 module.exports = Account;

package/src/models/analog_water_billing.js

@@ -1,58 +1,58 @@
-const mongoose = require('mongoose');
-
-const analogBillingSchema = new mongoose.Schema({
-    facilityId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'Facility',
-        required: true,
-    },
-    meterNumber: {
-        type: String,
-        required: true,
-    },
-    accountNumber: {
-        type: String,
-        required: true,
-    },
-    currentReading: {
-        type: Number,
-        required: true,
-    },
-    previousReading: {
-        type: Number,
-        required: true,
-    },
-    yearMonth: {
-        type: String, // Expected format: 'YYYY-MM'
-        required: true,
-    },
-    totalUsage: {
-        type: Number,
-        required: true,
-    },
-    unitName: {
-        type: String,
-        required: true,
-    },
-    customerId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'Customer',
-    },
-    billingType: {
-        type: String,
-        enum: ['postpaid', 'prepaid'],
-    },
-    status: {
-        type: String,
-        enum: ['pending', 'reviewed', 'billed'],
-        default: 'pending',
-    },
-}, {
-    timestamps: true,
-});
-
-analogBillingSchema.index({ meterNumber: 1, yearMonth: 1 }, { unique: true });
-
-const AnalogBilling = mongoose.model('AnalogBilling', analogBillingSchema);
-
-module.exports = AnalogBilling;
+const mongoose = require('mongoose');
+
+const analogBillingSchema = new mongoose.Schema({
+    facilityId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Facility',
+        required: true,
+    },
+    meterNumber: {
+        type: String,
+        required: true,
+    },
+    accountNumber: {
+        type: String,
+        required: true,
+    },
+    currentReading: {
+        type: Number,
+        required: true,
+    },
+    previousReading: {
+        type: Number,
+        required: true,
+    },
+    yearMonth: {
+        type: String, // Expected format: 'YYYY-MM'
+        required: true,
+    },
+    totalUsage: {
+        type: Number,
+        required: true,
+    },
+    unitName: {
+        type: String,
+        required: true,
+    },
+    customerId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Customer',
+    },
+    billingType: {
+        type: String,
+        enum: ['postpaid', 'prepaid'],
+    },
+    status: {
+        type: String,
+        enum: ['pending', 'reviewed', 'billed'],
+        default: 'pending',
+    },
+}, {
+    timestamps: true,
+});
+
+analogBillingSchema.index({ meterNumber: 1, yearMonth: 1 }, { unique: true });
+
+const AnalogBilling = mongoose.model('AnalogBilling', analogBillingSchema);
+
+module.exports = AnalogBilling;