Réorganisation des sources

app.js

@@ -4,32 +4,27 @@ if (appEnv == undefined) {
 }
 require('dotenv').config({ path: `.env.${appEnv}` });
 const { promisify } = require('util'),
-    bodyParser = require('body-parser'),
-    chalk = require('chalk'),
-    utils = require('./routes/utils'),
-    exceptionHandler = require('./middlewares/exceptions.handler.js'),
-    connectDB = require('./src/services/connectDB');
+    chalk = require('chalk');
+    //bodyParser = require('body-parser')
 var express = require('express'),
     session = require('express-session'),
     cors = require('cors'),
     errorhandler = require('errorhandler'),
-    mongoose = require('mongoose'),
     morgan = require('morgan');
 
-var isProduction = appEnv === 'production';
+const utils = require('./src/utils'),
+    exceptionHandler = require('./src/middlewares/exceptions.handler'),
+    connectDb = require('./src/database/connectDatabase');
 
 // Create global app object
 var app = express();
-
 app.use(cors());
 
-// Normal express config defaults
-//app.use(morgan('combined'));
+// Morgan status code color config
 morgan.token('statusColor', (req, res) => {
     let status = (typeof res.headersSent !== 'boolean' ? Boolean(res.header) : res.headersSent)
         ? res.statusCode
         : undefined
-
     return status >= 500 ? chalk.red(status)
         : status >= 429 ? chalk.magenta(status)
             : status >= 400 ? chalk.yellow(status)
@@ -37,38 +32,34 @@ morgan.token('statusColor', (req, res) => {
                     : status >= 200 ? chalk.green(status)
                         : chalk.underline(status);
 });
+// Morgan log line config
 app.use(morgan('[:date[iso]] ":method :url HTTP/:http-version" :statusColor :res[content-length] ":referrer" ":user-agent" :remote-addr'));
-app.use(bodyParser.urlencoded({ extended: false }));
-app.use(bodyParser.json());
+
+//use express.json() to parse incoming requests with JSON payloads
+app.use(express.json());
+//parse incoming requests with urlencoded payloads
+app.use(express.urlencoded({ extended: true }));
+
+//app.use(bodyParser.urlencoded({ extended: false }));
+//app.use(bodyParser.json());
 
 app.use(require('method-override')());
 app.use(express.static(__dirname + '/public'));
 
-app.use(session({ secret: 'acapisecret', cookie: { maxAge: 60000 }, resave: false, saveUninitialized: false  }));
+app.use(session({ secret: process.env.SECRET, cookie: { maxAge: 60000 }, resave: false, saveUninitialized: false  }));
 
-if (!isProduction) {
+if (appEnv !== 'production') {
     app.use(errorhandler());
 }
 
-if(isProduction){
-    mongoose.connect(process.env.MONGODB_URI);
-} else {
-    mongoose.set('strictQuery', true);
-    mongoose.connect(process.env.MONGODB_URI).then(() => {
-        console.log(`${utils.getDateTimeISOString()}`, chalk.green('MongoDB connection has been established successfully'));
-    }).catch(() => {
-        console.log(`${utils.getDateTimeISOString()}`, chalk.red('Unable to connect to the MongoDB database'));
-    });
-    mongoose.set('debug', process.env.DEBUG);
-    console.log(`${utils.getDateTimeISOString()}`, chalk.red('debug :'), chalk.yellow(process.env.DEBUG));
-}
+require('./src/database/models/mongo');
+require('./src/config/passport');
 
-require('./models/mongo');
-require('./config/passport');
+//var userid = new mongoose.Types.ObjectId();
+//console.log('userid: ', userid._id.toString());
+
+connectDb.connectAllDb();
 
-var userid = new mongoose.Types.ObjectId();
-console.log('userid: ', userid._id.toString());
-connectDB();
 app.use(require('./src/routes'));
 
 app.use(exceptionHandler.notFoundErrorHandler);