payservedb 2.5.0 → 2.5.1

package/.env

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

package/index.js

@@ -1,95 +1,95 @@
-const mongoose = require('mongoose');
-require('dotenv').config()
-
-
-// Maintain a record of open connections for each database
-const connections = {};
-const url = '127.0.0.1:27017';
-const source = '?authSource=admin'
-
-// Utility function to connect to MongoDB
-async function connectToMongoDB(dbName) {
-    try {
-       
-        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')
-};
-
-// 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 = {};
+const url = '127.0.0.1:27017';
+const source = '?authSource=admin'
+
+// Utility function to connect to MongoDB
+async function connectToMongoDB(dbName) {
+    try {
+       
+        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')
+};
+
+// 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,16 +1,16 @@
-{
-  "name": "payservedb",
-  "version": "2.5.0",
-  "main": "index.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "keywords": [],
-  "author": "",
-  "license": "ISC",
-  "description": "",
-  "dependencies": {
-    "dotenv": "^16.4.5",
-    "mongoose": "^8.3.5"
-  }
-}
+{
+  "name": "payservedb",
+  "version": "2.5.1",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "keywords": [],
+  "author": "",
+  "license": "ISC",
+  "description": "",
+  "dependencies": {
+    "dotenv": "^16.4.5",
+    "mongoose": "^8.3.5"
+  }
+}

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/archivedapilog.js

@@ -1,18 +1,18 @@
-
-const mongoose = require('mongoose');
-const { Schema } = mongoose;
-
-const ArchivedApiLogSchema = new Schema({
-    url: { type: String, required: true, index: true },
-    method: { type: String, required: true, enum: ['GET', 'POST', 'PUT', 'DELETE'], index: true },
-    duration: { type: Number, required: true },
-    time: { type: Date, default: Date.now, required: true, index: true },
-    date: { type: String, required: true, index: true },
-});
-
-
-ArchivedApiLogSchema.index({ time: 1 }, { expireAfterSeconds: 60 * 60 * 24 * 365 });
-
-const ArchivedApiLog = mongoose.model('ArchivedApiLog', ArchivedApiLogSchema);
-
-module.exports = ArchivedApiLog;
+
+const mongoose = require('mongoose');
+const { Schema } = mongoose;
+
+const ArchivedApiLogSchema = new Schema({
+    url: { type: String, required: true, index: true },
+    method: { type: String, required: true, enum: ['GET', 'POST', 'PUT', 'DELETE'], index: true },
+    duration: { type: Number, required: true },
+    time: { type: Date, default: Date.now, required: true, index: true },
+    date: { type: String, required: true, index: true },
+});
+
+
+ArchivedApiLogSchema.index({ time: 1 }, { expireAfterSeconds: 60 * 60 * 24 * 365 });
+
+const ArchivedApiLog = mongoose.model('ArchivedApiLog', ArchivedApiLogSchema);
+
+module.exports = ArchivedApiLog;

package/src/models/archivedauditlog.js

@@ -1,83 +1,83 @@
-const mongoose = require('mongoose');
-
-const ArchivedAuditLogSchema = new mongoose.Schema({
-    action: {
-        type: String,
-        required: true,
-        trim: true
-    },
-    page: {
-        type: String,
-        required: true,
-        trim: true
-    },
-    userId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'Company',
-        required: true
-    },
-    userInfo: {
-        type: mongoose.Schema.Types.Mixed,
-        required: true
-    },
-    projectId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'Project',
-        required: true
-    },
-    projectInfo: {
-        type: mongoose.Schema.Types.Mixed,
-        required: true
-    },
-    computerName: {
-        type: String,
-        required: true,
-        trim: true
-    },
-    browser: {
-        type: String,
-        required: true,
-        trim: true
-    },
-    ipAddress: {
-        type: String,
-        required: true,
-        trim: true
-    },
-    time: {
-        type: String,
-        required: true,
-        trim: true
-    },
-    date: {
-        type: String,
-        required: true,
-        trim: true
-    },
-    createdOn: {
-        type: Date,
-        default: Date.now,
-        required: true
-    },
-    oldData: {
-        type: mongoose.Schema.Types.Mixed,
-        default: {}
-    },
-    newData: {
-        type: mongoose.Schema.Types.Mixed,
-        default: {}
-    },
-    deletedData: {
-        type: mongoose.Schema.Types.Mixed,
-        default: {}
-    }
-}, {
-    timestamps: true 
-});
-
-ArchivedAuditLogSchema.index({ userId: 1, projectId: 1, createdOn: -1 });
-ArchivedAuditLogSchema.index({ action: 1 });
-ArchivedAuditLogSchema.index({ page: 1 });
-const ArchivedAuditLog = mongoose.model('ArchivedAuditLog', ArchivedAuditLogSchema);
-
-module.exports = ArchivedAuditLog;
+const mongoose = require('mongoose');
+
+const ArchivedAuditLogSchema = new mongoose.Schema({
+    action: {
+        type: String,
+        required: true,
+        trim: true
+    },
+    page: {
+        type: String,
+        required: true,
+        trim: true
+    },
+    userId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Company',
+        required: true
+    },
+    userInfo: {
+        type: mongoose.Schema.Types.Mixed,
+        required: true
+    },
+    projectId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Project',
+        required: true
+    },
+    projectInfo: {
+        type: mongoose.Schema.Types.Mixed,
+        required: true
+    },
+    computerName: {
+        type: String,
+        required: true,
+        trim: true
+    },
+    browser: {
+        type: String,
+        required: true,
+        trim: true
+    },
+    ipAddress: {
+        type: String,
+        required: true,
+        trim: true
+    },
+    time: {
+        type: String,
+        required: true,
+        trim: true
+    },
+    date: {
+        type: String,
+        required: true,
+        trim: true
+    },
+    createdOn: {
+        type: Date,
+        default: Date.now,
+        required: true
+    },
+    oldData: {
+        type: mongoose.Schema.Types.Mixed,
+        default: {}
+    },
+    newData: {
+        type: mongoose.Schema.Types.Mixed,
+        default: {}
+    },
+    deletedData: {
+        type: mongoose.Schema.Types.Mixed,
+        default: {}
+    }
+}, {
+    timestamps: true 
+});
+
+ArchivedAuditLogSchema.index({ userId: 1, projectId: 1, createdOn: -1 });
+ArchivedAuditLogSchema.index({ action: 1 });
+ArchivedAuditLogSchema.index({ page: 1 });
+const ArchivedAuditLog = mongoose.model('ArchivedAuditLog', ArchivedAuditLogSchema);
+
+module.exports = ArchivedAuditLog;

package/src/models/asset.js

@@ -0,0 +1,35 @@
+const mongoose = require('mongoose');
+
+const assetSchema = new mongoose.Schema({
+  facilityId: {
+    type: mongoose.Schema.Types.ObjectId,
+    ref: 'Facility', 
+    required: true,
+  },
+  name: {
+    type: String,
+    required: true,
+  },
+  serialNumber: {
+    type: String,
+    unique: true, 
+    required: true,
+  },
+  dateBought: {
+    type: String, // Year or full date, e.g., '2023' or '2023-01-01'
+    required: true,
+  },
+  // assignedTo: {
+  //   type: String, // Name of the person or department the asset is assigned to 
+  //   default: 'Unassigned', // Default if not yet assigned
+  // }, Commented out, moved to the vendor schema
+  insuranceStatus: {
+    type: String,
+    enum: ['Insured', 'Not Insured', 'Expired'], 
+    required: true,
+  },
+}, {
+  timestamps: true, 
+});
+
+module.exports = mongoose.model('Asset', assetSchema);

package/src/models/audit.js

@@ -1,17 +1,17 @@
-const mongoose = require("mongoose");
-
-const AuditSchema = new mongoose.Schema({
-    entityType: { 
-      type: String, 
-      enum: ['lease', 'invoice'], 
-      required: true 
-    },
-    entityId: { type: mongoose.Schema.Types.ObjectId, required: true },
-    action: { type: String, required: true },
-    changedBy: { type: String, required: true },
-    changes: { type: mongoose.Schema.Types.Mixed, required: true },
-    timestamp: { type: Date, default: Date.now },
-  });
-  
-  module.exports = mongoose.model('Audit', AuditSchema);
+const mongoose = require("mongoose");
+
+const AuditSchema = new mongoose.Schema({
+    entityType: { 
+      type: String, 
+      enum: ['lease', 'invoice'], 
+      required: true 
+    },
+    entityId: { type: mongoose.Schema.Types.ObjectId, required: true },
+    action: { type: String, required: true },
+    changedBy: { type: String, required: true },
+    changes: { type: mongoose.Schema.Types.Mixed, required: true },
+    timestamp: { type: Date, default: Date.now },
+  });
+  
+  module.exports = mongoose.model('Audit', AuditSchema);