From 3c0ecd8fb1350db2ad9431e0a6cd74f81d250551 Mon Sep 17 00:00:00 2001
From: canove <cassio@economicros.com.br>
Date: Mon, 28 Sep 2020 11:38:10 -0300
Subject: [PATCH] improvement: moved delete message logic to single file

---
 backend/src/controllers/MessageController.ts             | 5 +----
 .../src/services/MessageServices/DeleteMessageService.ts | 9 ---------
 .../src/services/WbotServices/DeleteWhatsAppMessage.ts   | 2 ++
 3 files changed, 3 insertions(+), 13 deletions(-)
 delete mode 100644 backend/src/services/MessageServices/DeleteMessageService.ts

diff --git a/backend/src/controllers/MessageController.ts b/backend/src/controllers/MessageController.ts
index b8a3e17..f902260 100644
--- a/backend/src/controllers/MessageController.ts
+++ b/backend/src/controllers/MessageController.ts
@@ -6,7 +6,6 @@ import { getIO } from "../libs/socket";
 
 import CreateMessageService from "../services/MessageServices/CreateMessageService";
 import ListMessagesService from "../services/MessageServices/ListMessagesService";
-import DeleteMessageService from "../services/MessageServices/DeleteMessageService";
 import ShowTicketService from "../services/TicketServices/ShowTicketService";
 import DeleteWhatsAppMessage from "../services/WbotServices/DeleteWhatsAppMessage";
 import SendWhatsAppMedia from "../services/WbotServices/SendWhatsAppMedia";
@@ -86,9 +85,7 @@ export const remove = async (
 ): Promise<Response> => {
   const { messageId } = req.params;
 
-  const messageDeleted = await DeleteWhatsAppMessage(messageId);
-
-  const message = await DeleteMessageService(messageDeleted);
+  const message = await DeleteWhatsAppMessage(messageId);
 
   const io = getIO();
   io.to(message.ticketId.toString()).emit("appMessage", {
diff --git a/backend/src/services/MessageServices/DeleteMessageService.ts b/backend/src/services/MessageServices/DeleteMessageService.ts
deleted file mode 100644
index 5527176..0000000
--- a/backend/src/services/MessageServices/DeleteMessageService.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import Message from "../../models/Message";
-
-const DeleteMessageService = async (message: Message): Promise<Message> => {
-  await message.update({ isDeleted: true });
-
-  return message;
-};
-
-export default DeleteMessageService;
diff --git a/backend/src/services/WbotServices/DeleteWhatsAppMessage.ts b/backend/src/services/WbotServices/DeleteWhatsAppMessage.ts
index fdbdbd3..862967f 100644
--- a/backend/src/services/WbotServices/DeleteWhatsAppMessage.ts
+++ b/backend/src/services/WbotServices/DeleteWhatsAppMessage.ts
@@ -30,6 +30,8 @@ const DeleteWhatsAppMessage = async (messageId: string): Promise<Message> => {
     );
   }
 
+  await message.update({ isDeleted: true });
+
   return message;
 };