payservedb 2.3.5 → 2.3.8

package/index.js

@@ -11,7 +11,7 @@ const source = '?authSource=admin'
 async function connectToMongoDB(dbName) {
     try {
        
-        const connectionString = `mongodb://Ps:Letmein987@127.0.0.1:27017/${dbName}${source}`;
+        const connectionString = `mongodb://${url}/${dbName}${source}`;
         await mongoose.connect(connectionString, {
             useNewUrlParser: true,
         });
@@ -29,7 +29,7 @@ async function switchDB(dbName) {
         return connections[dbName]; // Return existing connection
     }
     try {
-        const connectionString = `mongodb://Ps:Letmein987@127.0.0.1:27017/${dbName}${source}`;
+        const connectionString = `mongodb://${url}/${dbName}${source}`;
         const dbConnection = await mongoose.createConnection(connectionString, {
             useNewUrlParser: true,
         });
@@ -64,24 +64,12 @@ const models = {
     Message: require('./src/models/message'),
     SMSAfricastalking: require('./src/models/sms_africastalking'),
     SMSMeliora: require('./src/models/sms_meliora'),
-    WaterConcentrator: require('./src/models/waterConcentrator'),
-    WaterMeter: require('./src/models/waterMeter'),
-    WaterMeterSettings: require('./src/models/waterMeterSetting'),
     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'),
-    Contract: require('./src/models/contract'),
-    Levy: require('./src/models/levy'),
-    LevyType: require('./src/models/levytype'),
-    Invoice: require('./src/models/invoice'),
-    Tax: require('./src/models/tax'),
-    InvoiceBillingSetting: require('./src/models/invoiceBillingSetting'),
-    Penalty: require('./src/models/penalty'),
-    Reminder: require('./src/models/reminder'),
-    BankDetails: require('./src/models/bankdetails'),
-    John:require('./src/models/john')
+    Levy:require('./src/models/levy')
 };
 
 // Function to get models dynamically from a specific database connection

package/package.json

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

package/src/models/levy.js

@@ -1,49 +1,9 @@
-
 const mongoose = require('mongoose');
-
-const LevySchema = new mongoose.Schema({
-    levyName: {
-        type: String,
-        required: [true, 'Levy name is required'],
-        trim: true,
-    },
-    amount: {
-        type: String,
-        required: [true, 'amount is required'],
-    },
-    levyType: {
-        type: mongoose.Schema.Types.ObjectId,  // Update this to reference LevyType
-        ref: 'LevyType',
-        required: [true, 'Levy type is required'],
-    },
-    levyApplicant: {
-        type: String,
-        required: [true, 'Levy applicant is required'],
-        trim: true,
-    },
-    collectionFrequency: {
-        type: String,
-        required: [true, 'Collection Frequency is required'],
-        trim: true,
-        enum: ['Monthly', 'Quarterly', 'Annually', 'Semi-annually', 'Weekly']
-    },
-    invoiceDate: {
-        type: String,
-        required: [true, 'Invoice Date is required'],
-        trim: true,
-    },
-    disabled: {
-        type: Boolean,
-        default: false
-    },
-    facilityId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'Facility',
-    }
-}, {
-    timestamps: true, // Automatically add createdAt and updatedAt fields
-});
-
-const Levy = mongoose.model('Levy', LevySchema);
-
-module.exports = Levy;
+const levySchema = mongoose.Schema({
+ title:{
+    type:String,
+    required:true
+ }
+})
+const Levy = mongoose.model('Levy', levySchema);
+module.exports = Levy

package/src/models/contract.js

@@ -1,42 +0,0 @@
-const mongoose = require('mongoose');
-
-const contractSchema = new mongoose.Schema({
-    contractName: {
-        type: String,
-        required: true
-    },
-    contractStart: {
-        type: String,
-        required: true
-    },
-    contractEnd: {
-        type: String,
-        required: true
-    },
-    levy: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'Levy',
-        required: [true, 'Levy is required'],
-    },
-    units:[],
-    disabled: {
-        type: Boolean,
-        default: false
-    },
-    facilityId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'Facility', 
-        required: true
-    },
-}, 
-// { timestamps: true }
-);
-
-contractSchema.index({ contractName: 1 });
-
-const Contract = mongoose.model('Contract', contractSchema);
-
-module.exports = Contract;
-
-
-

package/src/models/invoice.js

@@ -1,105 +0,0 @@
-const mongoose = require('mongoose');
-const Schema = mongoose.Schema;
-
-const InvoiceSchema = new Schema({
-    invoiceNumber: {
-        type: String,
-        required: true,
-        unique: true,
-    },
-    client: {
-        _id: {
-            type: mongoose.Schema.Types.ObjectId,
-            ref: 'Customer',
-        },
-        name: { type: String, required: true },
-        email: { type: String, required: true },
-        address: { type: String },
-    },
-    facility: {
-        _id: {
-            type: mongoose.Schema.Types.ObjectId,
-            ref: 'Facility',
-        },
-        name: { type: String, required: true },
-        imageURL: { type: String, required: true }
-    },
-    unit: {
-        _id: {
-            type: mongoose.Schema.Types.ObjectId,
-            ref: 'Unit',
-        },
-        name: { type: String, required: true }
-    },
-    items: [
-        {
-            description: { type: String, required: true },
-            quantity: { type: Number, required: true },
-            unitPrice: { type: Number, required: true },
-        }
-    ],
-    subTotal: {
-        type: Number,
-        required: true,
-        default: 0,
-    },
-    tax: {
-        type: Number,
-        required: true,
-        default: 0,
-    },
-    totalAmount: {
-        type: Number,
-        required: true,
-        default: 0,
-    },
-    issueDate: {
-        type: Date,
-        required: true,
-        default: Date.now,
-    },
-    dueDate: {
-        type: Date,
-        required: true,
-    },
-    status: {
-        type: String,
-        enum: ['Pending', 'Paid', 'Cancelled', 'Overdue', 'Partially Paid'],
-        default: 'Pending',
-    },
-    penalty: {
-        isApplied: { type: Boolean, default: false },
-        penaltyAmount: { type: Number, default: 0 },
-        penaltyDate: { type: Date },
-        penaltyReason: { type: String },
-    },
-    whatFor: {
-        invoiceType: { type: String, required: true },
-        description: { type: String, required: true }
-    },
-    invoiceNote: {
-        type: String,
-        default: ''
-    },
-    paymentDetails: {
-        paymentStatus: {
-            type: String,
-            enum: ['Pending', 'Completed', 'Failed'],
-            default: 'Pending'
-        },
-        paymentMethod: {
-            type: String,
-            enum: ['Credit Card', 'Bank Transfer', 'PayPal', 'Cash'],
-        },
-        paymentDate: {
-            type: Date,
-        },
-        transactionId: {
-            type: String,
-            default: ''
-        }
-    }
-});
-
-const Invoice = mongoose.model('Invoice', InvoiceSchema);
-module.exports = Invoice

package/src/models/invoiceBillingSetting.js

@@ -1,29 +0,0 @@
-const mongoose = require('mongoose');
-
-// Define the schema for companies
-const InvoiceBillingSettingSchema = new mongoose.Schema({
-    dueDays: {
-        type: Number,
-        required: true,
-        min: 1 // Ensures dueDays is at least 1
-    },
-    levyNote: {
-        type: String,
-        required: true
-    },
-    facilityId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'Facility',
-        required: true // Consider making this required if every setting must be linked to a facility
-    }
-}, {
-    timestamps: true // Automatically add createdAt and updatedAt fields
-});
-
-// Indexes for improved performance
-InvoiceBillingSettingSchema.index({ facilityId: 1 }); // Index on facilityId
-
-// Compile the model from the schema
-const InvoiceBillingSetting = mongoose.model('InvoiceBillingSetting', InvoiceBillingSettingSchema);
-
-module.exports = InvoiceBillingSetting;

package/src/models/john.js

@@ -1,9 +0,0 @@
-const mongoose = require('mongoose');
-const johnSchema = mongoose.Schema({
-  fullName:{
-    type:String,
-    required:true
-  }
-})
-const John = mongoose.model('John',johnSchema);
-module.exports = John

package/src/models/levytype.js

@@ -1,19 +0,0 @@
-const mongoose = require('mongoose');
-
-const LevyTypeSchema = new mongoose.Schema({
-    levyType: {
-        type: String,
-        required: [true, 'Levy type is required'],
-        trim: true,
-    },
-    facilityId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'Facility',
-    }
-}, {
-    timestamps: true, // Automatically add createdAt and updatedAt fields
-});
-
-const LevyType = mongoose.model('LevyType', LevyTypeSchema);
-
-module.exports = LevyType;

package/src/models/reminder.js

@@ -1,47 +0,0 @@
-const mongoose = require('mongoose');
-
-// Define the schema for companies
-const reminderSchema = new mongoose.Schema({
-    title: {
-        type: String,
-        required: true
-    },
-    module: {
-        type: String,
-        required: true
-    },
-    type: {
-        type: String,
-        required: true
-    },
-    time: {
-        type: String,
-        required: true
-    },
-    day: {
-        type: Number,
-        required: true
-    },
-    isActive: {
-        type: Boolean,
-        required: true
-    },
-    disabled:{
-        type:Boolean,
-        required:true
-    },
-    facilityId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'Facility',
-    }
-}, {
-    timestamps: true // Automatically add createdAt and updatedAt fields
-});
-
-// Indexes for improved performance
-
-
-// Compile the model from the schema
-const Reminder = mongoose.model('Reminder', reminderSchema);
-
-module.exports = Reminder;

package/src/models/tax.js

@@ -1,35 +0,0 @@
-const mongoose = require('mongoose');
-
-// Define the schema for companies
-const taxSchema = new mongoose.Schema({
-    type: {
-        type: String,
-        required: true
-    },
-    percentage: {
-        type: Boolean,
-        required: true
-    },
-    amount: {
-        type: Number,
-        required: true
-    },
-    disabled:{
-        type:Boolean,
-        required:true
-    },
-    facilityId: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: 'Facility',
-    }
-}, {
-    timestamps: true // Automatically add createdAt and updatedAt fields
-});
-
-// Indexes for improved performance
-
-
-// Compile the model from the schema
-const Tax = mongoose.model('Tax', taxSchema);
-
-module.exports = Tax;

package/src/models/waterConcentrator.js

@@ -1,50 +0,0 @@
-const mongoose = require('mongoose');
-
-const waterConcentratorSchema = new mongoose.Schema({
-    serialNumber: {
-        type: String,
-        required: true
-    },
-    manufacturer: {
-        type: String,
-        required: true
-    },
-    range: {
-        type: Number,
-        required: true
-    },
-    isInstalled: {
-        type: Boolean,
-        required: true
-    },
-    isFaulty: {
-        type: Boolean,
-        required: true
-    },
-    inStock: {
-        type: Boolean,
-        required: true
-    },
-    status: {
-        type: String,
-        required: true,
-        enum: ['Offline', 'Online']
-    },
-    location: {
-        lat: {
-            type: Number,
-            required: false
-        },
-        long: {
-            type: Number,
-            required: false
-        }
-    },
-    facilityId: {
-        type: [String], // Assuming facilityId is an array of strings
-        required: true
-    }
-});
-
-const WaterConcentrator = mongoose.model('WaterConcentrator', waterConcentratorSchema);
-module.exports = WaterConcentrator;

package/src/models/waterMeter.js

@@ -1,50 +0,0 @@
-const mongoose = require('mongoose');
-
-const waterMeterSchema = new mongoose.Schema({
-    serialNumber: {
-        type: String,
-        required: true
-    },
-    manufacturer: {
-        type: String,
-        required: true
-    },
-    size: {
-        type: String,
-        required: true
-    },
-    initialValue: {
-        type: Number,
-        required: true
-    },
-    isInstalled: {
-        type: Boolean,
-        required: true
-    },
-    isFaulty: {
-        type: Boolean,
-        required: true
-    },
-    inStock: {
-        type: Boolean,
-        required: true
-    },
-    valveStatus: {
-        type: String,
-        required: true,
-        enum: ['Open', 'Closed']
-    },
-    location: {
-        lat: {
-            type: Number,
-            required: false
-        },
-        long: {
-            type: Number,
-            required: false
-        }
-    },
-});
-
-const WaterMeter = mongoose.model('waterMeter', waterMeterSchema);
-module.exports = WaterMeter;

package/src/models/waterMeterSetting.js

@@ -1,29 +0,0 @@
-const mongoose = require('mongoose');
-
-const waterMeterSettingsSchema = mongoose.Schema({
-    meterSettings: [
-        {
-            manufacturers: {
-                type: [String],
-                required: false
-            },
-            meterSizes: {
-                type: [String],
-                required: false
-            },
-        }
-    ]
-});
-
-// Middleware to ensure only one record exists
-waterMeterSettingsSchema.pre('save', async function (next) {
-    const existingSettings = await WaterMeterSettings.findOne();
-    if (existingSettings && !existingSettings._id.equals(this._id)) {
-        throw new Error('Only one water meter settings record is allowed.');
-    }
-    next();
-});
-
-const WaterMeterSettings = mongoose.model("WaterMeterSettings", waterMeterSettingsSchema);
-
-module.exports = WaterMeterSettings;