create-sip 1.0.1 → 1.1.0

package/README.md

@@ -107,6 +107,12 @@ node op admin:generate
 
 Copy **config/default.json.example** to **config/default.json** file.
 
+Command:
+
+```bash
+node op conf:generate
+```
+
 ### Seed database
 
 Load data from JSON or CSV file.

package/expressapi/app/controllers/userController.js

@@ -0,0 +1,94 @@
+import bcrypt from 'bcryptjs'
+import User from '../models/user.js'
+
+const UserController = {
+    async index(req, res) {
+        try {
+            UserController.tryIndex(req, res)
+        }catch(error) {
+            res.status(500)
+            res.json({
+                success: false,
+                message: 'Error! The query is failed!'
+            })
+        }
+    },
+    async tryIndex(req, res) {
+        const users = await User.findAll()
+        res.status(200)
+        res.json({
+            success: true,
+            data: users
+        })
+    },
+    async show(req, res) {
+        try {
+            await UserController.tryShow(req, res)
+        }catch(error) {
+            res.status(500)
+            res.json({
+                success: false,
+                message: 'Error! The query is failed!'
+            })
+        }
+    },
+    async tryShow(req, res) {
+        const user = await User.findByPk(req.params.id)
+        res.status(200)
+        res.json({
+            success: true,
+            data: user
+        })
+    },
+    async create(req, res) {
+        var clientError = false;
+        try {
+            if(!req.body.name ||
+                !req.body.email ||
+                !req.body.password ||
+                !req.body.password_confirmation) {
+                clientError = true
+                throw new Error('Error! Bad request data!')
+            }
+            if(req.body.password != req.body.password_confirmation) {
+                clientError = true
+                throw new Error('Error! The two password is not same!')
+            }
+            const user = await User.findOne({
+                where: { name: req.body.name }
+            })
+            if(user) {
+                clientError = true
+                throw new Error('Error! User already exists: ' + user.name)
+            }            
+            await UserController.tryCreate(req, res)
+        }catch(error) {
+            if (clientError) {
+                res.status(400)
+            }else {
+                res.status(500)
+            }
+            res.json({
+                success: false,
+                message: 'Error! The query is failed!',
+                error: error.message
+            })
+        }
+    },
+    async tryCreate(req, res) {
+        const newUser = {
+            name: req.body.name,
+            email: req.body.email,
+            password: bcrypt.hashSync(req.body.password)
+        }        
+        const userData = await User.create(newUser)
+        res.status(201)
+        res.json({
+            success: true,
+            data: userData
+        })
+    },
+
+}
+
+export default UserController

package/expressapi/app/index.js

@@ -4,6 +4,12 @@ import cors from 'cors'
 import fs from 'fs'
 import router from './routes/api.js'
 import { readJson } from '../tools/readjson.js'
+import './models/modrels.js'
+import sequelize from './database/database.js'
+
+await sequelize.authenticate({
+    alter: true
+})
 
 const config = await readJson('config/default.json')
 

package/expressapi/app/models/modrels.js

@@ -0,0 +1,7 @@
+import User from './user.js';
+
+const db = {};
+
+db.User = User;
+
+export default db;

package/expressapi/app/models/user.js

@@ -2,19 +2,10 @@ import { DataTypes } from 'sequelize'
 import sequelize from '../database/database.js'
 
 const User = sequelize.define('user', {
-    id: { 
-        type: DataTypes.INTEGER,
-        autoIncrement: true,
-        primaryKey: true
-    },
     name: { type: DataTypes.STRING,  allowNull: false  },
     email: { type: DataTypes.STRING,  allowNull: true  },
-    password: { type: DataTypes.STRING , allowNull: false }
-})
-
-
-sequelize.sync({
-    force: false
+    password: { type: DataTypes.STRING , allowNull: false },
+    roleId: { type: DataTypes.INTEGER, defaultValue: 0 }
 })
 
 export default User

package/expressapi/app/routes/api.js

@@ -1,8 +1,8 @@
 import Router from 'express'
 const router = Router()
 
-import AuthController from '../controllers/authcontroller.js';
-import UserController from '../controllers/usercontroller.js';
+import AuthController from '../controllers/authController.js';
+import UserController from '../controllers/userController.js';
 import verifyToken from '../middlewares/authjwt.js';
  
 router.post('/register', AuthController.register)

package/expressapi/op

@@ -83,7 +83,7 @@ async function copyController(className) {
   const lowerName = className.toLowerCase()
 
   const src = 'templates/controllerTemplate.js'
-  const dest = `app/controllers/${lowerName}controller.js`
+  const dest = `app/controllers/${lowerName}Controller.js`
 
   if(await startCheckIfFileExists(dest)) {
     process.exit(1);

package/expressapi/templates/controllerTemplate.js

@@ -8,7 +8,8 @@ const ThingController = {
             res.status(500)
             res.json({
                 success: false,
-                message: 'Error! The query is failed!'
+                message: 'Error! The query is failed!',
+                error: error.message
             })
         }
     },
@@ -27,7 +28,8 @@ const ThingController = {
             res.status(500)
             res.json({
                 success: false,
-                message: 'Error! The query is failed!'
+                message: 'Error! The query is failed!',
+                error: error.message
             })
         }
     },
@@ -46,7 +48,8 @@ const ThingController = {
             res.status(500)
             res.json({
                 success: false,
-                message: 'Error! The query is failed!'
+                message: 'Error! The query is failed!',
+                error: error.message
             })
         }
     },
@@ -98,7 +101,8 @@ const ThingController = {
             res.status(500)
             res.json({
                 success: false,
-                message: 'Error! The query is failed!'
+                message: 'Error! The query is failed!',
+                error: error.message
             })
         }
     },

package/expressapi/templates/modelTemplate.js

@@ -2,17 +2,7 @@ import { DataTypes } from 'sequelize'
 import sequelize from '../database/database.js'
 
 const Thing = sequelize.define('thing', {
-    id: { 
-        type: DataTypes.INTEGER,
-        autoIncrement: true,
-        primaryKey: true
-    },
     name: { type: DataTypes.STRING,  allowNull: false  }
 })
 
-
-sequelize.sync({
-    force: false
-})
-
 export default Thing

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-sip",
-  "version": "1.0.1",
+  "version": "1.1.0",
   "main": "index.js",
   "bin": {
     "create-sip": "create-sip.js"

package/expressapi/app/controllers/usercontroller.js

@@ -1,25 +0,0 @@
-import User from '../models/user.js'
-
-const UserController = {
-    async index(req, res) {
-        try {
-            UserController.tryIndex(req, res)
-        }catch(error) {
-            res.status(500)
-            res.json({
-                success: false,
-                message: 'Error! The query is failed!'
-            })
-        }
-    },
-    async tryIndex(req, res) {
-        const users = await User.findAll()
-        res.status(200)
-        res.json({
-            success: true,
-            data: users
-        })
-    }
-}
-
-export default UserController