Add Remove user and update transactions to show 'prior employeee' (#77)

Author: domlupo

models/schema.sql

@@ -42,15 +42,15 @@ CREATE TABLE Products(
 DROP TABLE IF EXISTS Transactions;
 CREATE TABLE Transactions(
 	transactionID INT AUTO_INCREMENT NOT NULL PRIMARY KEY,
-    userID INT NOT NULL,
+    userID INT,
     productID INT NOT NULL,
     date DATETIME NOT NULL,
     productQty INT NOT NULL,
     startLoc VARCHAR(10) NOT NULL,
     endLoc VARCHAR(10) NOT NULL,
     createdAt DATETIME NOT NULL,
     updatedAt DATETIME NOT NULL,
-    CONSTRAINT FOREIGN KEY (userID) REFERENCES Users(userID),
+    CONSTRAINT FOREIGN KEY (userID) REFERENCES Users(userID) on DELETE SET NULL,
     CONSTRAINT FOREIGN KEY (productID) REFERENCES Products(productID)
 );
 

models/userModel.js

@@ -42,14 +42,12 @@ const updateUser = async (id, data) => {
   return getUserById(id);
 };
 
-const deleteUser = async (id, data) => {
-  const now = moment().format(constants.dateFormat);
-  await db.pool.asyncQuery(
-    'UPDATE Users SET userLevelID = ?, password = ?, email = ?, firstName = ?, lastName = ?, updatedAt = ? WHERE Users.userID = ?',
-    [data.userLevelID, ' ', ' ', 'NULL', 'NULL', now, id],
-  );
+const deleteUserFromDB = async (id) => {
+  const data = await db.pool.asyncQuery('DELETE FROM Users where userID = ?', [
+    id.userID,
+  ]);
 
-  return getUserById(id);
+  return data;
 };
 
 const createUser = async (data) => {
@@ -72,5 +70,5 @@ module.exports = {
   getUserForAuthentication,
   updateUser,
   createUser,
-  deleteUser,
+  deleteUserFromDB,
 };

routes/userRouter.js

@@ -13,10 +13,10 @@ userRouter.put(
   [authService.jwt, authService.managementOnly],
   userService.editUserLevel,
 );
-userRouter.put(
-  '/:id/delete',
+userRouter.delete(
+  '/:id',
   [authService.jwt, authService.managementOnly],
-  userService.deleteUserFromDB,
+  userService.deleteUser,
 );
 userRouter.post('/login', authService.login, userService.login);
 userRouter.post('/create', authService.create, userService.create);

services/userService.js

@@ -112,31 +112,16 @@ const editUserLevel = async (req, res, next) => {
     });
 };
 
-const deleteUserFromDB = async (req, res, next) => {
+const deleteUser = 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);
-    });
+  let data;
+  try {
+    data = await userModel.deleteUserFromDB({ userID });
+    res.status(200).send(data);
+  } catch (e) {
+    console.log(e);
+    next(e);
+  }
 };
 
 const getAllLevels = async (req, res, next) => {
@@ -156,5 +141,5 @@ module.exports = {
   login,
   editUserLevel,
   getAllLevels,
-  deleteUserFromDB,
+  deleteUser,
 };

src/components/Transaction/TransactionListItem.jsx

@@ -19,9 +19,12 @@ export default function TransactionListItem({ transaction: propTransaction }) {
       <Card border="light">
         <Card.Body>
           <Card.Title>Transaction ID: {transaction.transactionID} </Card.Title>
-          <Card.Title>
-            User: {capitalize(user.firstName)} {capitalize(user.lastName)}
-          </Card.Title>
+          {user && (
+            <Card.Title>
+              User: {capitalize(user.firstName)} {capitalize(user.lastName)}
+            </Card.Title>
+          )}
+          {!user && <Card.Title>User: Prior Employee</Card.Title>}
           <Card.Text>Date: {transaction.date.split('T')[0]} </Card.Text>
         </Card.Body>
       </Card>

src/components/Users/UserListItem.jsx

@@ -34,18 +34,15 @@ export default function UserListItem({ user: propUser }) {
       });
   };
 
-  const deleteUser = (updatedUserRole) => {
-    const userLevelID = getIDfromRole(updatedUserRole.toLowerCase());
+  const deleteUser = () => {
     API.instance
-      .put(`/user/${user.userID}/delete`, { userLevelID })
+      .delete(`/user/${user.userID}`)
       .then((res) => {
+        window.location.reload();
         console.log(res);
-        setUser(res.data);
-        setNewUserRole('');
-        setNewUserRole('');
-        setModal('');
       })
       .catch((err) => {
+        console.log(err);
         setError(err?.response?.data?.error ?? 'Delete user failed!');
       });
   };
@@ -54,7 +51,7 @@ export default function UserListItem({ user: propUser }) {
     if (modal === CHANGE_ROLE) {
       changeRole(newUserRole);
     } else if (modal === REMOVE) {
-      deleteUser(newUserRole);
+      deleteUser();
     }
   };
 
@@ -102,34 +99,24 @@ export default function UserListItem({ user: propUser }) {
         <Modal show={!!modal} onHide={() => setModal('')} centered>
           <Modal.Header closeButton>
             <Modal.Title>
-              Remove {capitalize(user.firstName)}{' '}
-              {capitalize(`${user.lastName}`)} From User List, Change to owner
+              Remove employee {capitalize(user.firstName)}{' '}
+              {capitalize(`${user.lastName}`)}
             </Modal.Title>
           </Modal.Header>
           <Modal.Body>
             <Form>
               <Form.Label>
-                Are you sure you wanna delete {capitalize(user.firstName)}{' '}
-                {capitalize(`${user.lastName}`)} ?
+                Are you sure you wanna remove {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 disabled={newUserRole === ''} onClick={onModalClick}>
-              Confirm
-            </Button>
+            <Button onClick={onModalClick}>Confirm</Button>
           </Modal.Footer>
         </Modal>
       );