payservedb 6.1.1 → 6.1.2

package/index.js

@@ -206,9 +206,90 @@ async function getModelFromDB(dbConnection, modelName, schema) {
   return dbConnection.models[modelName]; // Return existing model if already registered
 }
 
+// Function to initialize service with specific models
+function initializeService(modelNames = []) {
+  const serviceModels = {};
+  let currentConnection = null;
+  
+  // 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 (models[modelName] && !currentConnection.models[modelName]) {
+        serviceModels[modelName] = currentConnection.model(modelName, models[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);
+    currentConnection = dbConnection;
+    
+    // Register models with the new connection
+    const dbModels = {};
+    modelNames.forEach(modelName => {
+      if (models[modelName]) {
+        if (!dbConnection.models[modelName]) {
+          dbModels[modelName] = dbConnection.model(modelName, models[modelName]);
+        } else {
+          dbModels[modelName] = dbConnection.models[modelName];
+        }
+      }
+    });
+    
+    return { connection: dbConnection, models: dbModels };
+  }
+  
+  // Function to get models for the current connection
+  function getModels() {
+    if (!currentConnection) {
+      throw new Error('No active database connection. Please connect first.');
+    }
+    
+    const connectionModels = {};
+    modelNames.forEach(modelName => {
+      if (currentConnection.models[modelName]) {
+        connectionModels[modelName] = currentConnection.models[modelName];
+      }
+    });
+    
+    return connectionModels;
+  }
+  
+  // Function to get a specific model
+  function getModel(modelName) {
+    if (!currentConnection) {
+      throw new Error('No active database connection. Please connect first.');
+    }
+    
+    if (!modelNames.includes(modelName)) {
+      throw new Error(`Model ${modelName} not initialized in this service`);
+    }
+    
+    return currentConnection.models[modelName];
+  }
+  
+  return {
+    connectToMongoDB: connectWithModels,
+    switchDB: switchDBWithModels,
+    getModels,
+    getModel,
+    getCurrentConnection: () => currentConnection
+  };
+}
+
 module.exports = {
   connectToMongoDB,
   switchDB,
   getModelFromDB,
+  initializeService,
   ...models, // Spread operator to export all models
-};
+};

package/package.json

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

package/src/models/water_meter_concentrator.js

@@ -29,8 +29,8 @@ const concentratorSchema = new mongoose.Schema({
     status: {
         type: String,
         required: true,
-        enum: ['Online', 'Offline', 'Maintenance'],
-        default: 'Offline'
+        enum: ['online', 'offline', 'maintenance'],
+        default: '0ffline'
     },
     meter_fails: {
         type: Number,
@@ -55,6 +55,9 @@ const concentratorSchema = new mongoose.Schema({
             min: -180,
             max: 180
         }
+    },
+    lastUpdated: {
+        type: String
     }
 }, {
     timestamps: true