Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
114 changes: 64 additions & 50 deletions idurar-erp-crm/backend/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion idurar-erp-crm/backend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"lodash": "^4.17.21",
"module-alias": "^2.2.3",
"moment": "^2.30.1",
"mongoose": "^8.1.1",
"mongoose": "^8.24.0",
"mongoose-autopopulate": "^1.1.0",
"multer": "^1.4.4",
"node-cache": "^5.1.2",
Expand Down
3 changes: 2 additions & 1 deletion idurar-erp-crm/backend/src/server.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ require('module-alias/register');
const mongoose = require('mongoose');
const { globSync } = require('glob');
const path = require('path');
const connectToDatabase = require('./utils/connectToDatabase');

// Make sure we are running node 7.6+
const [major, minor] = process.versions.node.split('.').map(parseFloat);
Expand All @@ -14,7 +15,7 @@ if (major < 20) {
require('dotenv').config({ path: '.env' });
require('dotenv').config({ path: '.env.local' });

mongoose.connect(process.env.DATABASE);
connectToDatabase();

const OPENAI_API_KEY = process.env.OPENAI_API_KEY;

Expand Down
4 changes: 2 additions & 2 deletions idurar-erp-crm/backend/src/setup/reset.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
require('dotenv').config({ path: '.env' });
require('dotenv').config({ path: '.env.local' });

const mongoose = require('mongoose');
mongoose.connect(process.env.DATABASE);
const connectToDatabase = require('../utils/connectToDatabase');
connectToDatabase();

async function deleteData() {
const Admin = require('../models/coreModels/Admin');
Expand Down
4 changes: 2 additions & 2 deletions idurar-erp-crm/backend/src/setup/setup.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ const { globSync } = require('glob');
const fs = require('fs');
const { generate: uniqueId } = require('shortid');

const mongoose = require('mongoose');
mongoose.connect(process.env.DATABASE);
const connectToDatabase = require('../utils/connectToDatabase');
connectToDatabase();

async function setupApp() {
try {
Expand Down
17 changes: 17 additions & 0 deletions idurar-erp-crm/backend/src/utils/connectToDatabase.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
const mongoose = require('mongoose');

mongoose.set('strictQuery', false);

const connectionOptions = {
serverSelectionTimeoutMS: 30000,
};

const connectToDatabase = (databaseUrl = process.env.DATABASE) => {
if (!databaseUrl) {
throw new Error('DATABASE environment variable is required to connect to MongoDB');
}

return mongoose.connect(databaseUrl, connectionOptions);
};

module.exports = connectToDatabase;