From 02d90af6573817cf1d4aa00b5779fa3dbb44a510 Mon Sep 17 00:00:00 2001 From: canove Date: Sun, 20 Sep 2020 11:27:58 -0300 Subject: [PATCH] changed find to show services --- backend/src/controllers/ContactController.ts | 4 ++-- backend/src/controllers/UserController.ts | 4 ++-- backend/src/controllers/WhatsAppController.ts | 6 ++---- ...faultWhatsapp.ts => GetDefaultWhatsApp.ts} | 7 +++---- .../ContactServices/FindContactService.ts | 17 --------------- .../ContactServices/ShowContactService.ts | 14 +++++++++++++ .../MessageServices/CreateMessageService.ts | 4 ++-- .../MessageServices/ListMessagesService.ts | 4 ++-- .../TicketServices/CreateTicketService.ts | 4 ++-- ...dTicketService.ts => ShowTicketService.ts} | 21 +++---------------- ...{FindUserService.ts => ShowUserService.ts} | 9 ++++---- ...tsAppService.ts => ShowWhatsAppService.ts} | 4 ++-- frontend/src/components/QrcodeModal/index.js | 1 + 13 files changed, 40 insertions(+), 59 deletions(-) rename backend/src/helpers/{GetDefaultWhatsapp.ts => GetDefaultWhatsApp.ts} (53%) delete mode 100644 backend/src/services/ContactServices/FindContactService.ts create mode 100644 backend/src/services/ContactServices/ShowContactService.ts rename backend/src/services/TicketServices/{FindTicketService.ts => ShowTicketService.ts} (59%) rename backend/src/services/UserServices/{FindUserService.ts => ShowUserService.ts} (59%) rename backend/src/services/WhatsappService/{FindWhatsAppService.ts => ShowWhatsAppService.ts} (81%) diff --git a/backend/src/controllers/ContactController.ts b/backend/src/controllers/ContactController.ts index 0254db2..987cc6b 100644 --- a/backend/src/controllers/ContactController.ts +++ b/backend/src/controllers/ContactController.ts @@ -2,7 +2,7 @@ import { Request, Response } from "express"; import ListContactsService from "../services/ContactServices/ListContactsService"; import CreateContactService from "../services/ContactServices/CreateContactService"; -import FindContactService from "../services/ContactServices/FindContactService"; +import ShowContactService from "../services/ContactServices/ShowContactService"; import UpdateContactService from "../services/ContactServices/UpdateContactService"; import DeleteContactService from "../services/ContactServices/DeleteContactService"; @@ -97,7 +97,7 @@ export const store = async (req: Request, res: Response): Promise => { export const show = async (req: Request, res: Response): Promise => { const { contactId } = req.params; - const contact = await FindContactService(contactId); + const contact = await ShowContactService(contactId); return res.status(200).json(contact); }; diff --git a/backend/src/controllers/UserController.ts b/backend/src/controllers/UserController.ts index 521a6eb..5adf7b0 100644 --- a/backend/src/controllers/UserController.ts +++ b/backend/src/controllers/UserController.ts @@ -6,7 +6,7 @@ import AppError from "../errors/AppError"; import CreateUserService from "../services/UserServices/CreateUserService"; import ListUsersService from "../services/UserServices/ListUsersService"; import UpdateUserService from "../services/UserServices/UpdateUserService"; -import FindUserService from "../services/UserServices/FindUserService"; +import ShowUserService from "../services/UserServices/ShowUserService"; import DeleteUserService from "../services/UserServices/DeleteUserService"; type IndexQuery = { @@ -53,7 +53,7 @@ export const store = async (req: Request, res: Response): Promise => { export const show = async (req: Request, res: Response): Promise => { const { userId } = req.params; - const user = await FindUserService(userId); + const user = await ShowUserService(userId); return res.status(200).json(user); }; diff --git a/backend/src/controllers/WhatsAppController.ts b/backend/src/controllers/WhatsAppController.ts index ff24f29..26cd7c3 100644 --- a/backend/src/controllers/WhatsAppController.ts +++ b/backend/src/controllers/WhatsAppController.ts @@ -3,7 +3,7 @@ import { Request, Response } from "express"; import CreateWhatsAppService from "../services/WhatsappService/CreateWhatsAppService"; import DeleteWhatsAppService from "../services/WhatsappService/DeleteWhatsAppService"; import ListWhatsAppsService from "../services/WhatsappService/ListWhatsAppsService"; -import FindWhatsAppService from "../services/WhatsappService/FindWhatsAppService"; +import ShowWhatsAppService from "../services/WhatsappService/ShowWhatsAppService"; import UpdateWhatsAppService from "../services/WhatsappService/UpdateWhatsAppService"; // import Yup from "yup"; // import Whatsapp from "../models/Whatsapp"; @@ -53,9 +53,7 @@ export const store = async (req: Request, res: Response): Promise => { export const show = async (req: Request, res: Response): Promise => { const { whatsappId } = req.params; - console.log(whatsappId); - - const whatsapp = await FindWhatsAppService(whatsappId); + const whatsapp = await ShowWhatsAppService(whatsappId); return res.status(200).json(whatsapp); }; diff --git a/backend/src/helpers/GetDefaultWhatsapp.ts b/backend/src/helpers/GetDefaultWhatsApp.ts similarity index 53% rename from backend/src/helpers/GetDefaultWhatsapp.ts rename to backend/src/helpers/GetDefaultWhatsApp.ts index 8c37e6b..cffddde 100644 --- a/backend/src/helpers/GetDefaultWhatsapp.ts +++ b/backend/src/helpers/GetDefaultWhatsApp.ts @@ -1,9 +1,8 @@ import AppError from "../errors/AppError"; import Whatsapp from "../models/Whatsapp"; -import FindWhatsAppService from "../services/WhatsappService/FindWhatsAppService"; -const GetDefaultWhatsapp = async (): Promise => { - const defaultWhatsapp = await FindWhatsAppService({ +const GetDefaultWhatsApp = async (): Promise => { + const defaultWhatsapp = await Whatsapp.findOne({ where: { isDefault: true } }); @@ -14,4 +13,4 @@ const GetDefaultWhatsapp = async (): Promise => { return defaultWhatsapp; }; -export default GetDefaultWhatsapp; +export default GetDefaultWhatsApp; diff --git a/backend/src/services/ContactServices/FindContactService.ts b/backend/src/services/ContactServices/FindContactService.ts deleted file mode 100644 index c381ca1..0000000 --- a/backend/src/services/ContactServices/FindContactService.ts +++ /dev/null @@ -1,17 +0,0 @@ -import Contact from "../../models/Contact"; -import AppError from "../../errors/AppError"; - -const FindContactService = async (id: string): Promise => { - const user = await Contact.findOne({ - where: { id }, - attributes: ["id", "name", "number", "email"] - }); - - if (!user) { - throw new AppError("No contact found with this ID.", 404); - } - - return user; -}; - -export default FindContactService; diff --git a/backend/src/services/ContactServices/ShowContactService.ts b/backend/src/services/ContactServices/ShowContactService.ts new file mode 100644 index 0000000..2852dba --- /dev/null +++ b/backend/src/services/ContactServices/ShowContactService.ts @@ -0,0 +1,14 @@ +import Contact from "../../models/Contact"; +import AppError from "../../errors/AppError"; + +const ShowContactService = async (id: string | number): Promise => { + const user = await Contact.findByPk(id); + + if (!user) { + throw new AppError("No contact found with this ID.", 404); + } + + return user; +}; + +export default ShowContactService; diff --git a/backend/src/services/MessageServices/CreateMessageService.ts b/backend/src/services/MessageServices/CreateMessageService.ts index 4a6c59e..8957672 100644 --- a/backend/src/services/MessageServices/CreateMessageService.ts +++ b/backend/src/services/MessageServices/CreateMessageService.ts @@ -1,5 +1,5 @@ import Message from "../../models/Message"; -import FindTicketService from "../TicketServices/FindTicketService"; +import ShowTicketService from "../TicketServices/ShowTicketService"; interface Request { ticketId: string; @@ -10,7 +10,7 @@ const CreateMessageService = async ({ messageData, ticketId }: Request): Promise => { - const ticket = await FindTicketService({ where: { id: +ticketId } }); + const ticket = await ShowTicketService(ticketId); if (!ticket) { throw new Error("No ticket found with this ID"); diff --git a/backend/src/services/MessageServices/ListMessagesService.ts b/backend/src/services/MessageServices/ListMessagesService.ts index a4bc52c..7656472 100644 --- a/backend/src/services/MessageServices/ListMessagesService.ts +++ b/backend/src/services/MessageServices/ListMessagesService.ts @@ -1,7 +1,7 @@ import { where, fn, col } from "sequelize"; import Message from "../../models/Message"; import Ticket from "../../models/Ticket"; -import FindTicketService from "../TicketServices/FindTicketService"; +import ShowTicketService from "../TicketServices/ShowTicketService"; interface Request { ticketId: string; @@ -30,7 +30,7 @@ const ListMessagesService = async ({ ticketId }; - const ticket = await FindTicketService({ where: { id: +ticketId } }); + const ticket = await ShowTicketService(ticketId); if (!ticket) { throw new Error("No ticket found with this ID"); diff --git a/backend/src/services/TicketServices/CreateTicketService.ts b/backend/src/services/TicketServices/CreateTicketService.ts index 2df4650..c52e6d6 100644 --- a/backend/src/services/TicketServices/CreateTicketService.ts +++ b/backend/src/services/TicketServices/CreateTicketService.ts @@ -1,5 +1,5 @@ import AppError from "../../errors/AppError"; -import GetDefaultWhatsapp from "../../helpers/GetDefaultWhatsapp"; +import GetDefaultWhatsApp from "../../helpers/GetDefaultWhatsApp"; import Ticket from "../../models/Ticket"; interface Request { @@ -11,7 +11,7 @@ const CreateTicketService = async ({ contactId, status }: Request): Promise => { - const defaultWhatsapp = await GetDefaultWhatsapp(); + const defaultWhatsapp = await GetDefaultWhatsApp(); if (!defaultWhatsapp) { throw new AppError("No default WhatsApp found. Check Connection page."); diff --git a/backend/src/services/TicketServices/FindTicketService.ts b/backend/src/services/TicketServices/ShowTicketService.ts similarity index 59% rename from backend/src/services/TicketServices/FindTicketService.ts rename to backend/src/services/TicketServices/ShowTicketService.ts index 6490ebd..4103685 100644 --- a/backend/src/services/TicketServices/FindTicketService.ts +++ b/backend/src/services/TicketServices/ShowTicketService.ts @@ -3,23 +3,8 @@ import AppError from "../../errors/AppError"; import Contact from "../../models/Contact"; import User from "../../models/User"; -interface WhereParams { - id?: number; - status?: string; - userId?: number; - contactId?: number; - whatsappId?: number; -} - -interface Request { - where?: WhereParams; -} - -const FindTicketService = async ({ where }: Request): Promise => { - const whereCondition = { ...where }; - - const ticket = await Ticket.findOne({ - where: whereCondition, +const ShowTicketService = async (id: string | number): Promise => { + const ticket = await Ticket.findByPk(id, { include: [ { model: Contact, @@ -42,4 +27,4 @@ const FindTicketService = async ({ where }: Request): Promise => { return ticket; }; -export default FindTicketService; +export default ShowTicketService; diff --git a/backend/src/services/UserServices/FindUserService.ts b/backend/src/services/UserServices/ShowUserService.ts similarity index 59% rename from backend/src/services/UserServices/FindUserService.ts rename to backend/src/services/UserServices/ShowUserService.ts index 868bf15..4581e98 100644 --- a/backend/src/services/UserServices/FindUserService.ts +++ b/backend/src/services/UserServices/ShowUserService.ts @@ -1,9 +1,10 @@ import User from "../../models/User"; import AppError from "../../errors/AppError"; -const FindUserService = async (id: string): Promise => { - const user = await User.findOne({ - where: { id }, +const ShowUserService = async ( + id: string | number +): Promise => { + const user = await User.findByPk(id, { attributes: ["name", "id", "email", "profile"] }); @@ -14,4 +15,4 @@ const FindUserService = async (id: string): Promise => { return user; }; -export default FindUserService; +export default ShowUserService; diff --git a/backend/src/services/WhatsappService/FindWhatsAppService.ts b/backend/src/services/WhatsappService/ShowWhatsAppService.ts similarity index 81% rename from backend/src/services/WhatsappService/FindWhatsAppService.ts rename to backend/src/services/WhatsappService/ShowWhatsAppService.ts index 741b9a8..b6afadf 100644 --- a/backend/src/services/WhatsappService/FindWhatsAppService.ts +++ b/backend/src/services/WhatsappService/ShowWhatsAppService.ts @@ -1,7 +1,7 @@ import Whatsapp from "../../models/Whatsapp"; import AppError from "../../errors/AppError"; -const FindWhatsAppService = async ( +const ShowWhatsAppService = async ( id: string | number ): Promise => { const whatsapp = await Whatsapp.findByPk(id); @@ -13,4 +13,4 @@ const FindWhatsAppService = async ( return whatsapp; }; -export default FindWhatsAppService; +export default ShowWhatsAppService; diff --git a/frontend/src/components/QrcodeModal/index.js b/frontend/src/components/QrcodeModal/index.js index fe6e541..b85af40 100644 --- a/frontend/src/components/QrcodeModal/index.js +++ b/frontend/src/components/QrcodeModal/index.js @@ -13,6 +13,7 @@ const QrcodeModal = ({ open, onClose, whatsAppId }) => { useEffect(() => { const fetchSession = async () => { if (!whatsAppId) return; + try { const { data } = await api.get(`/whatsapp/${whatsAppId}`); setQrCode(data.qrcode);