Réorganisation des sources

src/database/connectDb.js

@@ -2,8 +2,7 @@
 const chalk = require('chalk');
 const mongoose = require('mongoose');
 
-
-const DB = require('.');
+const DB = require('./mysql');
 const sequelize = require('./config/sequelize');
 const associate = require('./relationships');
 const utils = require('../utils');

src/database/models/mongo/User.js

@@ -2,8 +2,7 @@ var mongoose = require('mongoose');
 var uniqueValidator = require('mongoose-unique-validator');
 var crypto = require('crypto');
 var jwt = require('jsonwebtoken'),
-    secret = require('../../../config').secret,
-    session_lifetime = require('../../../config').session_lifetime;
+    config = require('../../../config');
 
 var UserSchema = new mongoose.Schema({
     email: { type: String, lowercase: true, unique: true, required: [true, "email can't be blank"], match: [/\S+@\S+\.\S+/, 'is invalid'], index: true },
@@ -36,13 +35,13 @@ UserSchema.methods.setPassword = function (password) {
 
 UserSchema.methods.generateJWT = function () {
     var today = new Date();
-    var exp = new Date(today.getTime() + (session_lifetime * 1000));
+    var exp = new Date(today.getTime() + (config.session_lifetime * 1000));
 
     return jwt.sign({
         id: this._id,
         username: this.username,
         exp: parseInt(exp.getTime() / 1000)
-    }, secret, { algorithm: 'HS256' });
+    }, config.secret, { algorithm: 'HS256' });
 };
 
 UserSchema.methods.toAuthJSON = function () {

src/database/models/mysql/User.js

@@ -1,8 +1,7 @@
 const { DataTypes, Model } = require("sequelize");
 var crypto = require('crypto');
 var jwt = require('jsonwebtoken'),
-    secret = require('../../../config').secret,
-    session_lifetime = require('../../../config').session_lifetime;
+    config = require('../../../config')
 
 const sequelize = require("../../config/sequelize");
 
@@ -100,13 +99,13 @@ const UserModel = () => {
 
     User.prototype.generateJWT = function () {
         var today = new Date();
-        var exp = new Date(today.getTime() + (session_lifetime * 1000));
+        var exp = new Date(today.getTime() + (config.session_lifetime * 1000));
 
         return jwt.sign({
             id: this.id,
             username: this.username,
             exp: parseInt(exp.getTime() / 1000)
-        }, secret, { algorithm: 'HS256' });
+        }, config.secret, { algorithm: 'HS256' });
     };
 
     User.prototype.toAuthJSON = function () {

src/database/models/mysql/index.js

@@ -0,0 +1,8 @@
+exports.Article = require('./Article');
+exports.ArticleTag = require('./ArticleTag');
+exports.Comment = require('./Comment');
+exports.Favorite = require('./Favorite');
+exports.Follower = require('./Follower');
+exports.Tag = require('./Tag');
+exports.TagList = require('./TagList');
+exports.User = require('./User');

src/database/mysql.js

@@ -1,3 +1,4 @@
+var DataTypes = require("sequelize").DataTypes;
 const sequelize = require('./config/sequelize');
 const ArticleModel = require('./models/mysql/Article');
 const ArticleTageModel = require('./models/mysql/ArticleTag');
@@ -10,14 +11,14 @@ const UserModel = require('./models/mysql/User');
 
 const DB = {
   sequelize,
-  User: UserModel(sequelize),
-  Article: ArticleModel(sequelize),
-  ArticleTag: ArticleTageModel(sequelize),
-  Comment: CommentModel(sequelize),
-  Favorite: FavoriteModel(sequelize),
-  Follower: FollowerModel(sequelize),
-  Tag: TagModel(sequelize),
-  TagList: TagListModel(sequelize),
+  User: UserModel(sequelize, DataTypes),
+  Article: ArticleModel(sequelize, DataTypes),
+  ArticleTag: ArticleTageModel(sequelize, DataTypes),
+  Comment: CommentModel(sequelize, DataTypes),
+  Favorite: FavoriteModel(sequelize, DataTypes),
+  Follower: FollowerModel(sequelize, DataTypes),
+  Tag: TagModel(sequelize, DataTypes),
+  TagList: TagListModel(sequelize, DataTypes),
 };
 
 module.exports = DB;

src/database/relationships/index.js

@@ -1,4 +1,4 @@
-const DB = require('../index');
+const DB = require('../mysql');
 
 const associate = () => {
     /*