From 3011fc958fc4541c88740a3cd09c07f211430640 Mon Sep 17 00:00:00 2001
From: I Kadek Yuda Budipratama Giri <13516115@std.stei.itb.ac.id>
Date: Fri, 29 Mar 2019 19:10:56 +0700
Subject: [PATCH] For real, pushing migrations
---
backend/README.md | 29 +++++-----------------------
backend/app.js | 7 -------
backend/config/env.js | 15 --------------
backend/controller/authController.js | 7 ++++---
backend/controller/testController.js | 8 ++++----
backend/models/index.js | 2 +-
backend/models/user.js | 2 +-
backend/router/verifyJwtToken.js | 5 ++---
backend/router/verifySignUp.js | 8 ++++----
backend/test/user_test.js | 7 ++-----
10 files changed, 23 insertions(+), 67 deletions(-)
delete mode 100644 backend/config/env.js
diff --git a/backend/README.md b/backend/README.md
index 1e7187b..66d7b81 100644
--- a/backend/README.md
+++ b/backend/README.md
@@ -19,28 +19,9 @@ sequelize db:migrate
```
npm start
```
+To run test, run
+```
+npm test
+```
6. Do work. Any changes in the backend will be automatically updated. No more turning the server on and off again! :)
-7. Good luck have fun!
-
-## File Structure
-```
-backend
-+-- src
-| +-- config
-| | +-- config.js (Secret key & expiration JWT. Add Role string here when adding new role.)
-| | +-- db.config.js (Database and Sequelize config)
-| | +-- env.js (Wrapper for env variables)
-| |
-| +-- controller
-| | +-- *Controller.js (Add your controllers here)
-| |
-| +-- model
-| | +-- *.model.js (Add models here and follow the name convention)
-| |
-| +-- router
-| | +-- router.js (Routing goes here)
-| | +-- verifyJwtToken.js (Middleware functions involving JWT token should go here)
-| | +-- verifySignUp.js (Middleware functions involving Sign Up)
-| +-- app.js
-+-- .env.example (Example of .env file. Please copy this to .env and set it to your env)
-```
\ No newline at end of file
+7. Good luck have fun!
\ No newline at end of file
diff --git a/backend/app.js b/backend/app.js
index 35230aa..7cd1464 100644
--- a/backend/app.js
+++ b/backend/app.js
@@ -9,13 +9,6 @@ app.use(morgan('combined'))
app.use(bodyParser.json())
app.use(cors())
-const db = require('./config/db.config.js');
-const Role = db.role;
-
-db.sequelize.sync().then(() => {
- console.log('Syncing Database...');
-});
-
var routes = require('./router/router')
routes(app)
diff --git a/backend/config/env.js b/backend/config/env.js
deleted file mode 100644
index 8505c1c..0000000
--- a/backend/config/env.js
+++ /dev/null
@@ -1,15 +0,0 @@
-const env = {
- database: 'jabar_innov_monev_2',
- username: "postgres",
- password: "hue",
- host: "localhost",
- dialect: "postgres",
- pool: {
- max: 5,
- min: 0,
- acquire: 30000,
- idle: 10000
- }
- };
-
- module.exports = env;
\ No newline at end of file
diff --git a/backend/controller/authController.js b/backend/controller/authController.js
index dfc509f..e9bfcb4 100644
--- a/backend/controller/authController.js
+++ b/backend/controller/authController.js
@@ -1,9 +1,10 @@
-const db = require('../config/db.config.js');
const config = require('../config/app.config.js');
+const models = require('../models');
+const User = models.user;
+const Role = models.role;
var jwt = require('jsonwebtoken');
var bcrypt = require('bcryptjs');
-const User = db.user;
-const Role = db.role;
+
exports.signup = (req, res) => {
console.log("Processing func -> signup");
diff --git a/backend/controller/testController.js b/backend/controller/testController.js
index 49bf8e9..a1752d6 100644
--- a/backend/controller/testController.js
+++ b/backend/controller/testController.js
@@ -1,7 +1,7 @@
-const db = require('../config/db.config.js');
-const config = require('../config/app.config.js');
-const User = db.user;
-const Role = db.role;
+const models = require('../models');
+const User = models.user;
+const Role = models.role;
+
exports.memberContent = (req, res) => {
User.findOne({
diff --git a/backend/models/index.js b/backend/models/index.js
index d22fdb5..c1a3d6d 100644
--- a/backend/models/index.js
+++ b/backend/models/index.js
@@ -5,7 +5,7 @@ const path = require('path');
const Sequelize = require('sequelize');
const basename = path.basename(__filename);
const env = process.env.NODE_ENV || 'development';
-const config = require(__dirname + '/../config/app.config.json')[env];
+const config = require(__dirname + '/../config/config.json')[env];
const db = {};
let sequelize;
diff --git a/backend/models/user.js b/backend/models/user.js
index 64cb482..93a0213 100644
--- a/backend/models/user.js
+++ b/backend/models/user.js
@@ -7,7 +7,7 @@ module.exports = (sequelize, DataTypes) => {
username: DataTypes.STRING
}, {});
user.associate = function(models) {
- models.user.belongsTo(models.Role);
+ models.user.belongsTo(models.role);
};
return user;
};
\ No newline at end of file
diff --git a/backend/router/verifyJwtToken.js b/backend/router/verifyJwtToken.js
index 1a04e8d..c2b079e 100644
--- a/backend/router/verifyJwtToken.js
+++ b/backend/router/verifyJwtToken.js
@@ -1,8 +1,7 @@
const jwt = require('jsonwebtoken');
const config = require('../config/app.config.js');
-const db = require('../config/db.config.js');
-const User = db.user;
-const Role = db.role;
+const models = require('../models');
+const User = models.user;
verifyToken = (req, res, next) => {
let token = req.headers['x-access-token'];
diff --git a/backend/router/verifySignUp.js b/backend/router/verifySignUp.js
index 957209f..e6727cb 100644
--- a/backend/router/verifySignUp.js
+++ b/backend/router/verifySignUp.js
@@ -1,7 +1,7 @@
-const db = require('../config/db.config.js');
-const config = require('../config/app.config.js');
-const ROLEs = config.ROLEs;
-const User = db.user;
+const models = require('../models');
+const User = models.user;
+const app_config = require('../config/app.config');
+const ROLEs = app_config.ROLEs;
checkDuplicateUserNameOrEmail = (req, res, next) => {
User.findOne({
diff --git a/backend/test/user_test.js b/backend/test/user_test.js
index d0bd515..84588a6 100644
--- a/backend/test/user_test.js
+++ b/backend/test/user_test.js
@@ -2,10 +2,8 @@ process.NODE_ENV = "test";
let chai = require('chai')
let chaiHttp = require('chai-http')
-let db = require('../config/db.config.js');
-let config = require('../config/app.config.js');
-let User = db.user;
-let Role = db.role;
+const models = require('../models');
+const User = models.user;
let app = require('../app.js')
let should = chai.should();
let expect = chai.expect;
@@ -20,7 +18,6 @@ describe('Users', () => {
});
done();
});
-
describe('User Sign Up', ()=>{
it('Sign user up', (done) =>{
let user = {
--
GitLab