implemented userTable
This commit is contained in:
@ -10,6 +10,7 @@ import {
|
||||
getUserById,
|
||||
updateUserById,
|
||||
deleteUserById,
|
||||
getSelectedUsersByUser,
|
||||
} from "../models/usersModel.js";
|
||||
|
||||
//insert user to databased
|
||||
@ -40,7 +41,7 @@ export const signUp = async (req, res, next) => {
|
||||
minute: '2-digit'
|
||||
};
|
||||
const dateTimeString = currentTime.toLocaleString('de-DE', options);
|
||||
const results = ownConn.query(`INSERT INTO users(id, username, password, registered, fullName, email, phonenumber, address, city, postcode, adminBool, technician1Bool, technician2Bool, technicianMonitoringBool, merchantBool, internBool) VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
|
||||
const results = ownConn.query(`INSERT INTO users(id, username, password, registered, fullName, email, phonenumber, address, city, postcode, adminBool, technicianBool, readerBool) VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
|
||||
[
|
||||
uuidv4(),
|
||||
req.body.username,
|
||||
@ -53,11 +54,8 @@ export const signUp = async (req, res, next) => {
|
||||
req.body.city,
|
||||
req.body.postcode,
|
||||
req.body.adminBool,
|
||||
req.body.technician1Bool,
|
||||
req.body.technician2Bool,
|
||||
req.body.technicianMonitoringBool,
|
||||
req.body.merchantBool,
|
||||
req.body.internBool,
|
||||
req.body.technicianBool,
|
||||
req.body.readerBool,
|
||||
]);
|
||||
return res.status(201).send({
|
||||
message: "Registered!",
|
||||
@ -161,6 +159,18 @@ export const showUserById = (req, res) => {
|
||||
});
|
||||
};
|
||||
|
||||
//get all selected users by user
|
||||
export const showSelectedUsersByUser = (req, res) => {
|
||||
getSelectedUsersByUser(req.params.id, (err, results) => {
|
||||
if (err) {
|
||||
res.send(err);
|
||||
} else {
|
||||
res.json(results);
|
||||
}
|
||||
});
|
||||
};
|
||||
|
||||
|
||||
// Update user
|
||||
export const updateUser = (req, res) => {
|
||||
const data = req.body;
|
||||
|
||||
@ -28,12 +28,26 @@ export const getUserById = async (id, result) => {
|
||||
}
|
||||
};
|
||||
|
||||
//get all selected users by full name
|
||||
export const getSelectedUsersByUser = async (selected, result) => {
|
||||
try {
|
||||
let sql = `SELECT * FROM users WHERE LOWER(fullName) LIKE '%${selected.toLowerCase()}%' ORDER BY fullName ASC`;
|
||||
const results = await ownConn.execute(sql)
|
||||
result(null, results);
|
||||
}
|
||||
catch (err) {
|
||||
// Manage Errors
|
||||
console.log("SQL error : ", err);
|
||||
result(err, null);
|
||||
}
|
||||
};
|
||||
|
||||
// Update user to Database
|
||||
export const updateUserById = async (data, result) => {
|
||||
try {
|
||||
const id = data.id;
|
||||
let sql = `UPDATE users SET username = ?, password = ?, fullName = ?, email = ?, phonenumber = ?, address = ?, city = ?, postcode = ?, adminBool = ?, technician1Bool = ?, technician2Bool = ?, technicianMonitoringBool = ?, merchantBool = ?, internBool = ? WHERE id = ?`;
|
||||
const results = await ownConn.query(sql, [data.username, data.password, data.fullName, data.email, data.phonenumber, data.address, data.city, data.postcode, data.adminBool, data.technician1Bool, data.technician2Bool, data.technicianMonitoringBool, data.merchantBool, data.internBool, id]);
|
||||
let sql = `UPDATE users SET username = ?, password = ?, fullName = ?, email = ?, phonenumber = ?, address = ?, city = ?, postcode = ?, adminBool = ?, technicianBool = ?, readerBool = ? WHERE id = ?`;
|
||||
const results = await ownConn.query(sql, [data.username, data.password, data.fullName, data.email, data.phonenumber, data.address, data.city, data.postcode, data.adminBool, data.technicianBool,, data.readerBool, id]);
|
||||
result(null, results);
|
||||
}
|
||||
catch (err) {
|
||||
|
||||
@ -113,6 +113,7 @@ import {
|
||||
showUserById,
|
||||
updateUser,
|
||||
deleteUser,
|
||||
showSelectedUsersByUser,
|
||||
} from "../controller/users.js";
|
||||
|
||||
import * as userMiddleware from "../middleware/users.js";
|
||||
@ -608,6 +609,9 @@ router.post('/login', login);
|
||||
// get all users
|
||||
router.get("/users", showUsers);
|
||||
|
||||
// get all users by user
|
||||
router.get("/selectedUsersByUser/:id", showSelectedUsersByUser)
|
||||
|
||||
//get user by id
|
||||
router.get("/user/:id", showUserById);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user