From a0e6b7b2c7086ead8b4c78f9af245bedd9a870f7 Mon Sep 17 00:00:00 2001 From: canove Date: Fri, 15 Jan 2021 07:04:01 -0300 Subject: [PATCH] fix: sonarcloud warning and code cleanup --- .../unit/User/AuthUserService.spec.ts | 15 +++++++++------ backend/src/controllers/SessionController.ts | 2 +- .../{AuthUserSerice.ts => AuthUserService.ts} | 0 .../UserServices/CreateUserService.ts | 3 ++- .../WhatsappService/CreateWhatsAppService.ts | 16 ++++++---------- .../WhatsappService/DeleteWhatsAppService.ts | 4 ++-- frontend/src/components/ContactModal/index.js | 8 ++------ .../src/components/MarkdownWrapper/index.js | 6 +++--- .../src/components/NewTicketModal/index.js | 4 ++-- .../src/components/TicketListItem/index.js | 19 +++++++++---------- frontend/src/routes/Route.js | 8 ++++---- 11 files changed, 40 insertions(+), 45 deletions(-) rename backend/src/services/UserServices/{AuthUserSerice.ts => AuthUserService.ts} (100%) diff --git a/backend/src/__tests__/unit/User/AuthUserService.spec.ts b/backend/src/__tests__/unit/User/AuthUserService.spec.ts index 180af23..c7163ca 100644 --- a/backend/src/__tests__/unit/User/AuthUserService.spec.ts +++ b/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", - password: "hardpassword" + email, + password }); const response = await AuthUserService({ - email: "mail@test.com", - password: "hardpassword" + email, + 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 { diff --git a/backend/src/controllers/SessionController.ts b/backend/src/controllers/SessionController.ts index 3dc32c1..a2198ef 100644 --- a/backend/src/controllers/SessionController.ts +++ b/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"; diff --git a/backend/src/services/UserServices/AuthUserSerice.ts b/backend/src/services/UserServices/AuthUserService.ts similarity index 100% rename from backend/src/services/UserServices/AuthUserSerice.ts rename to backend/src/services/UserServices/AuthUserService.ts diff --git a/backend/src/services/UserServices/CreateUserService.ts b/backend/src/services/UserServices/CreateUserService.ts index e277085..098846b 100644 --- a/backend/src/services/UserServices/CreateUserService.ts +++ b/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; } diff --git a/backend/src/services/WhatsappService/CreateWhatsAppService.ts b/backend/src/services/WhatsappService/CreateWhatsAppService.ts index f653d49..ce033f3 100644 --- a/backend/src/services/WhatsappService/CreateWhatsAppService.ts +++ b/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) { - const whatsappFound = await Whatsapp.findOne({ - where: { name: value } - }); - return !whatsappFound; - } - return true; + if (!value) return false; + const nameExists = await Whatsapp.findOne({ + where: { name: value } + }); + return !nameExists; } ), 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; diff --git a/backend/src/services/WhatsappService/DeleteWhatsAppService.ts b/backend/src/services/WhatsappService/DeleteWhatsAppService.ts index 8f7c7be..ff516b8 100644 --- a/backend/src/services/WhatsappService/DeleteWhatsAppService.ts +++ b/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 => { +const DeleteWhatsAppService = async (id: string): Promise => { const whatsapp = await Whatsapp.findOne({ where: { id } }); @@ -13,4 +13,4 @@ const DeleteWhatsApprService = async (id: string): Promise => { await whatsapp.destroy(); }; -export default DeleteWhatsApprService; +export default DeleteWhatsAppService; diff --git a/frontend/src/components/ContactModal/index.js b/frontend/src/components/ContactModal/index.js index ce1e632..e4fad1f 100644 --- a/frontend/src/components/ContactModal/index.js +++ b/frontend/src/components/ContactModal/index.js @@ -102,12 +102,8 @@ const ContactModal = ({ open, onClose, contactId, initialValues, onSave }) => { fetchContact(); }, [contactId, open, initialValues]); - const handleClose = contactId => { - if (contactId) { - onClose(contactId); - } else { - onClose(); - } + const handleClose = () => { + onClose(); setContact(initialState); }; diff --git a/frontend/src/components/MarkdownWrapper/index.js b/frontend/src/components/MarkdownWrapper/index.js index 4985208..9e7e719 100644 --- a/frontend/src/components/MarkdownWrapper/index.js +++ b/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 {children}; diff --git a/frontend/src/components/NewTicketModal/index.js b/frontend/src/components/NewTicketModal/index.js index 898aa92..1d0a16a 100644 --- a/frontend/src/components/NewTicketModal/index.js +++ b/frontend/src/components/NewTicketModal/index.js @@ -100,8 +100,8 @@ const NewTicketModal = ({ modalOpen, onClose }) => { handleSaveTicket(contact.id); }; - const createAddContactOption = (options, params) => { - const filtered = filter(options, params); + const createAddContactOption = (filterOptions, params) => { + const filtered = filter(filterOptions, params); if (params.inputValue !== "" && !loading && searchParam.length >= 3) { filtered.push({ diff --git a/frontend/src/components/TicketListItem/index.js b/frontend/src/components/TicketListItem/index.js index 254e8bb..8ddff74 100644 --- a/frontend/src/components/TicketListItem/index.js +++ b/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) => { - history.push(`/tickets/${ticket.id}`); + const handleSelectTicket = 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 }) => { > - + { +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 && } - + ); }; -export default RouteWrapper; +export default Route;