delete user, change userLevel back to owner, name to NULL, email and password to ' '

Author: yanlifang

models/userModel.js

@@ -44,11 +44,11 @@ const updateUser = async (id, data) => {
 
 const deleteUser = async (id, data) => {
   const now = moment().format(constants.dateFormat);
-
   await db.pool.asyncQuery(
-    'UPDATE Users SET userLevelID=0,email=NULL,firstName=NULL,lastName=NULL WHERE Users.userID = ?',
-    [id],
+    'UPDATE Users SET userLevelID = ?, password = ?, email = ?, firstName = ?, lastName = ?, updatedAt = ? WHERE Users.userID = ?',
+    [data.userLevelID, ' ', ' ', 'NULL', 'NULL', now, id],
   );
+
   return getUserById(id);
 };
 

routes/userRouter.js

@@ -6,14 +6,19 @@ const userRouter = express.Router();
 
 userRouter.get('/', authService.jwt, userService.getAll);
 userRouter.get('/level', authService.jwt, userService.getAllLevels);
+userRouter.get('/delete', authService.jwt, userService.getAllLevels);
 userRouter.get('/:id', authService.jwt, userService.getUserById);
 userRouter.put(
   '/:id/level',
   [authService.jwt, authService.managementOnly],
   userService.editUserLevel,
 );
+userRouter.put(
+  '/:id/delete',
+  [authService.jwt, authService.managementOnly],
+  userService.deleteUserFromDB,
+);
 userRouter.post('/login', authService.login, userService.login);
 userRouter.post('/create', authService.create, userService.create);
-userRouter.put('/:id/detete', authService.jwt, userService.delUser);
 
 module.exports = userRouter;

services/userService.js

@@ -78,12 +78,6 @@ const login = async (req, res, next) => {
   });
 };
 
-const delUser = async (req, res, next) => {
-  const userID = req.params.id;
-
-  await userModel.deleteUser(userID);
-};
-
 const editUserLevel = async (req, res, next) => {
   const userID = req.params.id;
   const { userLevelID: newUserLevelID } = req.body;
@@ -118,6 +112,33 @@ const editUserLevel = async (req, res, next) => {
     });
 };
 
+const deleteUserFromDB = async (req, res, next) => {
+  const userID = req.params.id;
+  const { userLevelID: newUserLevelID } = req.body;
+  const { userLevel } = res.locals;
+  const user = await userModel.getUserById(userID);
+
+  const userLevels = await userLevelModel.getAll();
+  const schema = yup
+    .number()
+    .oneOf(userLevels.map((userLevelInner) => userLevelInner.userLevelID))
+    .required();
+
+  schema
+    .validate(newUserLevelID)
+    .then(async (validatedUserLevelID) => {
+      const updatedUser = await userModel.deleteUser(userID, {
+        ...user,
+        userLevelID: validatedUserLevelID,
+      });
+      res.status(200).send(updatedUser);
+    })
+    .catch((error) => {
+      res.status(400);
+      res.send(error);
+    });
+};
+
 const getAllLevels = async (req, res, next) => {
   let data;
   try {
@@ -135,5 +156,5 @@ module.exports = {
   login,
   editUserLevel,
   getAllLevels,
-  delUser,
+  deleteUserFromDB,
 };

src/components/Users/UserListItem.jsx

@@ -34,13 +34,15 @@ export default function UserListItem({ user: propUser }) {
       });
   };
 
-  const deleteUser = () => {
+  const deleteUser = (updatedUserRole) => {
+    const userLevelID = getIDfromRole(updatedUserRole.toLowerCase());
     API.instance
-      .put(`/user/${user.userID}/delete`)
+      .put(`/user/${user.userID}/delete`, { userLevelID })
       .then((res) => {
         console.log(res);
         setUser(res.data);
         setNewUserRole('');
+        setNewUserRole('');
         setModal('');
       })
       .catch((err) => {
@@ -99,21 +101,34 @@ export default function UserListItem({ user: propUser }) {
         <Modal show={!!modal} onHide={() => setModal('')} centered>
           <Modal.Header closeButton>
             <Modal.Title>
-              Delete {capitalize(user.firstName)}{' '}
-              {capitalize(`${user.lastName}`)} from User List
+              Remove {capitalize(user.firstName)}{' '}
+              {capitalize(`${user.lastName}`)} From User List, Change to owner
             </Modal.Title>
           </Modal.Header>
           <Modal.Body>
-            Are you sure you wanna delete {capitalize(user.firstName)}{' '}
-            {capitalize(`${user.lastName}`)} ?
             <Form>
-              <Form.Label>Replace User with NULL</Form.Label>
-              <Form.Control as="select" />
+              <Form.Label>
+                Are you sure you wanna delete {capitalize(user.firstName)}{' '}
+                {capitalize(`${user.lastName}`)} ?
+              </Form.Label>
+              <Form.Control
+                as="select"
+                value={newUserRole}
+                onChange={(e) => setNewUserRole(e.target.value)}
+              >
+                <option />
+                <option>Owner</option>
+              </Form.Control>
+              <Form.Text className="text-danger" type="invalid">
+                {error}
+              </Form.Text>
             </Form>
           </Modal.Body>
 
           <Modal.Footer>
-            <Button onClick={onModalClick}>Confirm</Button>
+            <Button disabled={newUserRole === ''} onClick={onModalClick}>
+              Confirm
+            </Button>
           </Modal.Footer>
         </Modal>
       );