Test server

app.js

@@ -8,7 +8,7 @@ const route  = require('./routes/')
 const handleError = require('./middlewares/errHandler')
 const app = express()
 
-const port = process.env.PORT || 3000
+const port = process.env.PORT || 4000
 
 app.use(cors())
 app.use(express.urlencoded({ extended: true }))

bin/http.js

@@ -1,4 +1,4 @@
 const app = require('../app')
-const port = process.env.PORT || 3000
+const port = process.env.PORT || 4000
 
 app.listen(port, ()=> console.log('App run in port : ', port))

config/config.js

@@ -6,11 +6,11 @@ if (env == 'development' || env =='test') {
 
 let capsEnv = env.toUpperCase()
   let database = {
-      username : process.env["DB_USERNAME_" + capsEnv],
-      password : process.env["DB_PASSWORD_" + capsEnv],
-      database : process.env["DB_NAME_" + capsEnv],
-      host : process.env["DB_HOST_" + capsEnv],
-      dialect : process.env["DB_DIALECT_" + capsEnv] 
+    username : process.env["DB_USERNAME_" + capsEnv],
+    password : process.env["DB_PASSWORD_" + capsEnv],
+    database : process.env["DB_NAME_" + capsEnv],
+    host : process.env["DB_HOST_" + capsEnv],
+    dialect : process.env["DB_DIALECT_" + capsEnv] 
   }
 
 module.exports = {

controllers/adminController.js

@@ -7,35 +7,39 @@ const createToken = require('../helpers/useToken')
 class AdminController {
 
   static async registerAdmin(req, res, next) {
-    const { name, username, password, role, nameVillage, location, balance } = req.body
+    const { name, username, password, nameVillage, location, balance } = req.body
     console.log(req.body);
     try {
         const invitation_code = createToken()
-        const user = await User.create({ name, username, password, role })
+        const user = await User.create({ name, username, password, role: 'admin' })
 
         const village = await Village.create({ name: nameVillage, location, invitation_code, balance, UserId: user.id})
 
         await User.update({ VillageId: village.id } ,{ where: { id: user.id }})
 
-        res.status(201).json({ message: 'Success Crete User and Village', invitation_code})
+        res.status(201).json({ message: 'Successfully Created User and Village', invitation_code})
     } catch (error) {
       next(error)
     }
   }
 
   static async loginAdmin(req, res, next) {
-    const { username, password, role } = req.body
+    console.log(req.body, 'login admin');
+    const { username, password } = req.body
     try {
         const user = await User.findOne({ where: { username }})
 
         if (user) {
           const isPassword = comparePassword( password, user.password )
+          console.log(isPassword, ' cek isPassword');
 
-          if (isPassword && role === 'admin') {
+          if (isPassword && user.role === 'admin') {
+            console.log('masuk if ok');
             const access_token = generateToken({ id: user.id, username: user.username })
 
             res.status(200).json(access_token)
           } else {
+            console.log('masuk error');
             next({ code: 404, message: "Invalid Username/Password" })
           }
         } else {

controllers/transactionController.js

@@ -1,12 +1,15 @@
-const { Transaction, Village } = require('../models')
+const { Transaction, Village, User } = require('../models')
 
 class TransactionController { 
 
   static async fetchTransaction(req, res, next) {
     try {
       const { VillageId } = req.currentUser
 
-      const village = await Village.findByPk(VillageId, { include: Transaction })
+      const village = await Village.findByPk(VillageId, { include: [{
+        model:  Transaction,
+        include: User }]
+      })
 
       res.status(200).json(village)
     } catch (error) {

controllers/userController.js

@@ -39,12 +39,12 @@ class UserController {
   }
 
   static async register(req, res, next) {
-    const { name, username, password, role, invitation_code } = req.body
+    const { name, username, password, invitation_code } = req.body
     try {
       const village = await Village.findOne({ where: { invitation_code }})
 
       if (village) {
-        const user = await User.create({ name, username, password, role })
+        const user = await User.create({ name, username, password, role: 'member', VillageId: village.id })
 
         res.status(201).json(user)
       } else {

middlewares/auth.js

@@ -13,7 +13,7 @@ const authenticate = async (req, res, next) =>{
                 next()
             } else {
               next({ code : 401,
-                message : 'Unauthoraized'
+                message : 'Unauthorized'
               })
             }
         } else {