fix: sonarcloud warning and code cleanup

backend/src/__tests__/unit/User/AuthUserService.spec.ts

@@ -1,6 +1,6 @@
 import faker from "faker";
 import AppError from "../../../errors/AppError";
-import AuthUserService from "../../../services/UserServices/AuthUserSerice";
+import AuthUserService from "../../../services/UserServices/AuthUserService";
 import CreateUserService from "../../../services/UserServices/CreateUserService";
 import { disconnect, truncate } from "../../utils/database";
 
@@ -18,15 +18,18 @@ describe("Auth", () => {
   });
 
   it("should be able to login with an existing user", async () => {
+    const password = faker.internet.password();
+    const email = faker.internet.email();
+
     await CreateUserService({
       name: faker.name.findName(),
-      email: "mail@test.com",
+      email,
-      password: "hardpassword"
+      password
     });
 
     const response = await AuthUserService({
-      email: "mail@test.com",
+      email,
-      password: "hardpassword"
+      password
     });
 
     expect(response).toHaveProperty("token");
@@ -49,7 +52,7 @@ describe("Auth", () => {
     await CreateUserService({
       name: faker.name.findName(),
       email: "mail@test.com",
-      password: "hardpassword"
+      password: faker.internet.password()
     });
 
     try {

backend/src/controllers/SessionController.ts

@@ -1,7 +1,7 @@
 import { Request, Response } from "express";
 import AppError from "../errors/AppError";
 
-import AuthUserService from "../services/UserServices/AuthUserSerice";
+import AuthUserService from "../services/UserServices/AuthUserService";
 import { SendRefreshToken } from "../helpers/SendRefreshToken";
 import { RefreshTokenService } from "../services/AuthServices/RefreshTokenService";
 

backend/src/services/UserServices/CreateUserService.ts

@@ -35,8 +35,9 @@ const CreateUserService = async ({
         "Check-email",
         "An user with this email already exists.",
         async value => {
+          if (!value) return false;
           const emailExists = await User.findOne({
-            where: { email: value! }
+            where: { email: value }
           });
           return !emailExists;
         }

backend/src/services/WhatsappService/CreateWhatsAppService.ts

@@ -32,13 +32,11 @@ const CreateWhatsAppService = async ({
         "Check-name",
         "This whatsapp name is already used.",
         async value => {
-          if (value) {
+          if (!value) return false;
-            const whatsappFound = await Whatsapp.findOne({
+          const nameExists = await Whatsapp.findOne({
-              where: { name: value }
+            where: { name: value }
-            });
+          });
-            return !whatsappFound;
+          return !nameExists;
-          }
-          return true;
         }
       ),
     isDefault: Yup.boolean().required()
@@ -52,9 +50,7 @@ const CreateWhatsAppService = async ({
 
   const whatsappFound = await Whatsapp.findOne();
 
-  if (!whatsappFound) {
+  isDefault = !whatsappFound;
-    isDefault = !whatsappFound;
-  }
 
   let oldDefaultWhatsapp: Whatsapp | null = null;
 

backend/src/services/WhatsappService/DeleteWhatsAppService.ts

@@ -1,7 +1,7 @@
 import Whatsapp from "../../models/Whatsapp";
 import AppError from "../../errors/AppError";
 
-const DeleteWhatsApprService = async (id: string): Promise<void> => {
+const DeleteWhatsAppService = async (id: string): Promise<void> => {
   const whatsapp = await Whatsapp.findOne({
     where: { id }
   });
@@ -13,4 +13,4 @@ const DeleteWhatsApprService = async (id: string): Promise<void> => {
   await whatsapp.destroy();
 };
 
-export default DeleteWhatsApprService;
+export default DeleteWhatsAppService;

frontend/src/components/ContactModal/index.js

@@ -102,12 +102,8 @@ const ContactModal = ({ open, onClose, contactId, initialValues, onSave }) => {
 		fetchContact();
 	}, [contactId, open, initialValues]);
 
-	const handleClose = contactId => {
+	const handleClose = () => {
-		if (contactId) {
+		onClose();
-			onClose(contactId);
-		} else {
-			onClose();
-		}
 		setContact(initialState);
 	};
 

frontend/src/components/MarkdownWrapper/index.js

@@ -161,7 +161,7 @@ const MarkdownWrapper = ({ children }) => {
 	}
 
 	const options = React.useMemo(() => {
-		const options = {
+		const markdownOptions = {
 			disableParsingRawHTML: true,
 			forceInline: true,
 			overrides: {
@@ -171,11 +171,11 @@ const MarkdownWrapper = ({ children }) => {
 
 		elements.forEach(element => {
 			if (!allowedElements.includes(element)) {
-				options.overrides[element] = ({ children }) => children;
+				markdownOptions.overrides[element] = el => el.children;
 			}
 		});
 
-		return options;
+		return markdownOptions;
 	}, []);
 
 	return <Markdown options={options}>{children}</Markdown>;

frontend/src/components/NewTicketModal/index.js

@@ -100,8 +100,8 @@ const NewTicketModal = ({ modalOpen, onClose }) => {
 		handleSaveTicket(contact.id);
 	};
 
-	const createAddContactOption = (options, params) => {
+	const createAddContactOption = (filterOptions, params) => {
-		const filtered = filter(options, params);
+		const filtered = filter(filterOptions, params);
 
 		if (params.inputValue !== "" && !loading && searchParam.length >= 3) {
 			filtered.push({

frontend/src/components/TicketListItem/index.js

@@ -21,6 +21,7 @@ import ButtonWithSpinner from "../ButtonWithSpinner";
 import MarkdownWrapper from "../MarkdownWrapper";
 import { Tooltip } from "@material-ui/core";
 import { AuthContext } from "../../context/Auth/AuthContext";
+import toastError from "../../errors/toastError";
 
 const useStyles = makeStyles(theme => ({
 	ticket: {
@@ -114,25 +115,25 @@ const TicketListItem = ({ ticket }) => {
 		};
 	}, []);
 
-	const handleAcepptTicket = async ticketId => {
+	const handleAcepptTicket = async id => {
 		setLoading(true);
 		try {
-			await api.put(`/tickets/${ticketId}`, {
+			await api.put(`/tickets/${id}`, {
 				status: "open",
 				userId: user?.id,
 			});
 		} catch (err) {
 			setLoading(false);
-			alert(err);
+			toastError(err);
 		}
 		if (isMounted.current) {
 			setLoading(false);
 		}
-		history.push(`/tickets/${ticketId}`);
+		history.push(`/tickets/${id}`);
 	};
 
-	const handleSelectTicket = (e, ticket) => {
+	const handleSelectTicket = id => {
-		history.push(`/tickets/${ticket.id}`);
+		history.push(`/tickets/${id}`);
 	};
 
 	return (
@@ -142,7 +143,7 @@ const TicketListItem = ({ ticket }) => {
 				button
 				onClick={e => {
 					if (ticket.status === "pending") return;
-					handleSelectTicket(e, ticket);
+					handleSelectTicket(ticket.id);
 				}}
 				selected={ticketId && +ticketId === ticket.id}
 				className={clsx(classes.ticket, {
@@ -160,9 +161,7 @@ const TicketListItem = ({ ticket }) => {
 					></span>
 				</Tooltip>
 				<ListItemAvatar>
-					<Avatar
+					<Avatar src={ticket?.contact?.profilePicUrl} />
-						src={ticket.contact.profilePicUrl && ticket.contact.profilePicUrl}
-					></Avatar>
 				</ListItemAvatar>
 				<ListItemText
 					disableTypography

frontend/src/routes/Route.js

@@ -1,10 +1,10 @@
 import React, { useContext } from "react";
-import { Route, Redirect } from "react-router-dom";
+import { Route as RouterRoute, Redirect } from "react-router-dom";
 
 import { AuthContext } from "../context/Auth/AuthContext";
 import BackdropLoading from "../components/BackdropLoading";
 
-const RouteWrapper = ({ component: Component, isPrivate = false, ...rest }) => {
+const Route = ({ component: Component, isPrivate = false, ...rest }) => {
 	const { isAuth, loading } = useContext(AuthContext);
 
 	if (!isAuth && isPrivate) {
@@ -28,9 +28,9 @@ const RouteWrapper = ({ component: Component, isPrivate = false, ...rest }) => {
 	return (
 		<>
 			{loading && <BackdropLoading />}
-			<Route {...rest} component={Component} />
+			<RouterRoute {...rest} component={Component} />
 		</>
 	);
 };
 
-export default RouteWrapper;
+export default Route;