@igea/oac_backend 1.0.9 → 1.0.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@igea/oac_backend",
-  "version": "1.0.9",
+  "version": "1.0.11",
   "description": "Backend service for the OAC project",
   "main": "src/index.js",
   "scripts": {

package/src/controllers/users.js

@@ -0,0 +1,119 @@
+const express = require('express');
+const router = express.Router();
+const Users = require('../models/users');
+
+
+// Get all users
+router.get('/', async (req, res) => {
+    Users.get().then(users => {
+      res.json({
+        success: true,
+        data: users,
+        message: null
+      });
+    }).catch(err => {
+      res.status(500).json({
+        success: false,
+        data: null,
+        message: `Error: ${err}`
+      });
+    })
+});
+
+// Get user by ID
+router.get('/:id', async (req, res) => {
+  Users.get({
+    id: req.params.id
+  }).then(user => {
+      if(user){
+        res.json({
+          success: true,
+          data: users,
+          message: null
+        });
+      }else{
+        res.status(404).json({
+          success: false,
+          data: null,
+          message: 'User not found'
+        });
+      }
+    }).catch(err => {
+      res.status(500).json({
+        success: false,
+        data: null,
+        message: `Error: ${err}`
+      });
+    })
+});
+
+// Create new user
+router.post('/', async (req, res) => {
+  const user = req.body;
+  Users.add(user).then(id => {
+    res.status(201).json({
+      success: true,
+      data: id,
+      message: null
+    });
+  }).catch(err => {
+    res.status(500).json({
+      success: false,
+      data: null,
+      message: `Error: ${err}`
+    });
+  })
+});
+
+// Update existing user
+router.put('/:id', async (req, res) => {
+  
+    const user = req.body;
+    Users.update(user).then(count=>{
+      if (count === 0) {
+        res.status(404).json({
+            success: false,
+            data: null,
+            message: 'User not found'
+        });
+      }else{
+        res.json({
+          success: true,
+          data: null,
+          message: 'User updated successfully'
+        });
+      }
+    }).catch(err=>{
+      res.status(500).json({
+        success: false,
+        data: null,
+        message: `Error: ${err}`
+      });
+    })    
+})
+
+router.delete('/:id', async (req, res) => {
+  Users.delete(req.params.id).then(deletedCount=>{
+    if (deletedCount === 0) {
+      res.status(404).json({
+          success: false,
+          data: null,
+          message: 'User not found'
+      });
+    }else{
+      res.json({
+        success: true,
+        data: null,
+        message: 'User deleted successfully'
+      });
+    }
+  }).catch(err=>{
+    res.status(500).json({
+      success: false,
+      data: null,
+      message: `Error: ${err}`
+    });
+  })
+});
+
+module.exports = router;

package/src/index.js

@@ -12,7 +12,7 @@ const jwtLib = jwtLibFactory({
         `/${serviceName}/auth/echo`,
         `/${serviceName}/health`
     ],
-    signOptions: { expiresIn: '1h' }
+    signOptions: { expiresIn: '15m' }
 });
 
 const app = express();
@@ -47,6 +47,9 @@ getPort.default({
     const authRouter = require('./controllers/auth.js')(jwtLib)
     app.use(`/${serviceName}/auth`, authRouter)
 
+    const usersRouter = require('./controllers/users.js')
+    app.use(`/${serviceName}/users`, usersRouter)
+
     app.listen(port, async () => {
         console.log(`${serviceName} listening on port ${port}`)
         await register()

package/src/models/users.js

@@ -34,6 +34,68 @@ class Users {
         });
     }
     
+    static get(options){
+       return new Promise(async (resolve, reject) => {
+            try{
+                let fields = '*'
+                if(options.id){
+                    const users = await db(table).select(fields);
+                    const safeUsers = users.map(({ password, ...rest }) => rest);
+                    resolve(safeUsers)
+                }else{
+                    const user = await db(table).select(fields)
+                        .where({ id: options.id }).first();
+                    if(user){
+                        const { password, ...safeUser } = user;   
+                        resolve(safeUser) 
+                    }else{
+                        resolve(null)
+                    }
+                }
+            }catch(e){
+                reject(e)
+            }
+        }); 
+    }
+
+    static add(user){
+        return new Promise(async (resolve, reject) => {
+            try{
+                user.password = db.raw('md5(?)', [user.password])
+                const [id] = await db(table).insert(user).returning('id');
+                resolve(id)
+            }catch(e){
+                reject(e)
+            }
+        }); 
+    }
+
+    static delete(id){
+        return new Promise(async (resolve, reject) => {
+            try{
+                const deletedCount = await db(table).where({ id }).del();
+                resolve(deletedCount)
+            }catch(e){
+                reject(e)
+            }
+        }); 
+    }
+
+    static update(user){
+        return new Promise(async (resolve, reject) => {
+            try{
+                if(user.password)
+                    user.password = db.raw('md5(?)', [user.password])
+                const count = await db(table)
+                    .where({ id: user.id })
+                    .update(user);
+                resolve(count)
+            }catch(e){
+                reject(e)
+            }
+        }); 
+    }
+
 }
 
 module.exports = Users