From 7a99abe543f8a4c97cdd020beb8029409abda945 Mon Sep 17 00:00:00 2001
From: canove <cassio@economicros.com.br>
Date: Tue, 4 Aug 2020 10:07:03 -0300
Subject: [PATCH] improvement: better media filename handle

---
 backend/src/app.js                           | 5 +++--
 backend/src/controllers/MessageController.js | 3 ++-
 backend/src/services/wbotMessageListener.js  | 8 +++-----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/backend/src/app.js b/backend/src/app.js
index 69b32a0..585dd6d 100644
--- a/backend/src/app.js
+++ b/backend/src/app.js
@@ -17,12 +17,13 @@ const TicketsRoutes = require("./routes/tickets");
 const WhatsRoutes = require("./routes/whatsapp");
 
 const app = express();
+
 const fileStorage = multer.diskStorage({
 	destination: (req, file, cb) => {
 		cb(null, path.resolve(__dirname, "..", "public"));
 	},
 	filename: (req, file, cb) => {
-		cb(null, new Date().getTime() + "-" + file.originalname.replace(/\s/g, ""));
+		cb(null, new Date().getTime() + path.extname(file.originalname));
 	},
 });
 
@@ -55,7 +56,7 @@ const io = require("./libs/socket").init(server);
 io.on("connection", socket => {
 	console.log("Client Connected");
 	socket.on("joinChatBox", ticketId => {
-		console.log("A client joined in a ticket channel");
+		console.log("A client joined a ticket channel");
 		socket.join(ticketId);
 	});
 
diff --git a/backend/src/controllers/MessageController.js b/backend/src/controllers/MessageController.js
index 0e630bc..cb92091 100644
--- a/backend/src/controllers/MessageController.js
+++ b/backend/src/controllers/MessageController.js
@@ -110,9 +110,10 @@ exports.store = async (req, res, next) => {
 	});
 
 	if (media) {
+		console.log(media);
 		const newMedia = MessageMedia.fromFilePath(req.file.path);
 
-		message.mediaUrl = req.file.filename.replace(/\s/g, "");
+		message.mediaUrl = req.file.filename;
 		if (newMedia.mimetype) {
 			message.mediaType = newMedia.mimetype.split("/")[0];
 		} else {
diff --git a/backend/src/services/wbotMessageListener.js b/backend/src/services/wbotMessageListener.js
index 64e032b..f3fa714 100644
--- a/backend/src/services/wbotMessageListener.js
+++ b/backend/src/services/wbotMessageListener.js
@@ -161,11 +161,9 @@ const wbotMessageListener = () => {
 				where: { id: msg.id.id },
 			});
 			if (!messageToUpdate) {
-				// will throw an error in frist ack if msg wast sent from cellphone
-				const error = new Error(
-					"Erro ao alterar o ack da mensagem no banco de dados"
-				);
-				error.statusCode = 501;
+				// will throw an error if msg was sent from cellphone
+				const error = new Error("No message with this ID found in database");
+				error.statusCode = 404;
 				throw error;
 			}
 			await messageToUpdate.update({ ack: ack });