diff --git a/backend/src/services/MessageServices/ListMessagesService.ts b/backend/src/services/MessageServices/ListMessagesService.ts index 7656472..5791420 100644 --- a/backend/src/services/MessageServices/ListMessagesService.ts +++ b/backend/src/services/MessageServices/ListMessagesService.ts @@ -21,6 +21,12 @@ const ListMessagesService = async ({ pageNumber = "1", ticketId }: Request): Promise => { + const ticket = await ShowTicketService(ticketId); + + if (!ticket) { + throw new Error("No ticket found with this ID"); + } + const whereCondition = { body: where( fn("LOWER", col("body")), @@ -30,12 +36,6 @@ const ListMessagesService = async ({ ticketId }; - const ticket = await ShowTicketService(ticketId); - - if (!ticket) { - throw new Error("No ticket found with this ID"); - } - // await setMessagesAsRead(ticket); const limit = 20; const offset = limit * (+pageNumber - 1); diff --git a/backend/src/services/UserServices/UpdateUserService.ts b/backend/src/services/UserServices/UpdateUserService.ts index 438b85b..883ea2e 100644 --- a/backend/src/services/UserServices/UpdateUserService.ts +++ b/backend/src/services/UserServices/UpdateUserService.ts @@ -26,6 +26,15 @@ const UpdateUserService = async ({ userData, userId }: Request): Promise => { + const user = await User.findOne({ + where: { id: userId }, + attributes: ["name", "id", "email", "profile"] + }); + + if (!user) { + throw new AppError("No user found with this ID.", 404); + } + const schema = Yup.object().shape({ name: Yup.string().min(2), email: Yup.string().email(), @@ -40,15 +49,6 @@ const UpdateUserService = async ({ throw new AppError(err.message); } - const user = await User.findOne({ - where: { id: userId }, - attributes: ["name", "id", "email", "profile"] - }); - - if (!user) { - throw new AppError("No user found with this ID.", 404); - } - await user.update({ email, password,