@runnerpro/backend 1.10.17 → 1.10.18

package/lib/cjs/chat/api/conversation.js

@@ -93,14 +93,7 @@ const getConversation = (req, res, { query, isClient }) => __awaiter(void 0, voi
 });
 const deleteConversationMessage = (req, res, { query, isClient }) => __awaiter(void 0, void 0, void 0, function* () {
     const { id } = req.params;
-    const [message] = yield query('SELECT [ID] FROM [CHAT MESSAGE] WHERE [ID] = ? AND (? = FALSE OR [ID CLIENTE] = ?)', [
-        id,
-        isClient,
-        req.session.userid,
-    ]);
-    if (!message)
-        return res.status(404).send('Not found');
-    if (!(yield canEditOrDeleteMessage({ idMessage: id, isClient })))
+    if (!(yield canEditOrDeleteMessage({ idMessage: id, isClient, userid: req.session.userid })))
         return res.send({ status: 'ok' });
     if (isClient)
         yield query('UPDATE [CHAT MESSAGE] SET [ELIMINADO] = TRUE WHERE [ID] = ?', [id]);
@@ -115,15 +108,9 @@ const deleteConversationMessage = (req, res, { query, isClient }) => __awaiter(v
 const editConversationMessage = (req, res, { query, isClient }) => __awaiter(void 0, void 0, void 0, function* () {
     const { id } = req.params;
     const { text } = req.body;
-    const [message] = yield query('SELECT [ID], [ID CLIENTE] FROM [CHAT MESSAGE] WHERE [ID] = ? AND (? = FALSE OR [ID CLIENTE] = ?)', [
-        id,
-        isClient,
-        req.session.userid,
-    ]);
-    if (!message)
-        return res.status(404).send('Not found');
-    if (!(yield canEditOrDeleteMessage({ idMessage: id, isClient })))
+    if (!(yield canEditOrDeleteMessage({ idMessage: id, isClient, userid: req.session.userid })))
         return res.send({ status: 'ok' });
+    const [message] = yield query('SELECT [ID CLIENTE] FROM [CHAT MESSAGE] WHERE [ID] = ?', [id]);
     // Devuelve el texto en el otro idioma si el cliente no habla español y el idioma del cliente
     const { textSpanish, textPreferredLanguage } = yield getPreferredLanguageForChat({
         text,
@@ -138,7 +125,25 @@ const editConversationMessage = (req, res, { query, isClient }) => __awaiter(voi
     ]);
     res.send({ status: 'ok' });
 });
-const canEditOrDeleteMessage = ({ idMessage, isClient }) => __awaiter(void 0, void 0, void 0, function* () {
+const canEditOrDeleteMessage = ({ idMessage, isClient, userid }) => __awaiter(void 0, void 0, void 0, function* () {
+    const [message] = yield (0, index_1.query)('SELECT [ID], "ID CLIENTE", "ID SENDER" FROM [CHAT MESSAGE] WHERE [ID] = ? AND (? = FALSE OR [ID CLIENTE] = ?)', [
+        idMessage,
+        isClient,
+        userid,
+    ]);
+    if (!message)
+        return false;
+    // Si es servidor del cliente, pero el mensaje no es del cliente || Si es el servidor del entrenador, pero el mensaje es del cliente
+    const messageOwnerCliente = message.idCliente === message.idSender;
+    if ((isClient && !messageOwnerCliente) || (!isClient && messageOwnerCliente))
+        return false;
+    // Si es servidor del cliente, pero el último mensaje es del entrenador || Si es el servidor del entrenador, pero el último mensaje es del cliente
+    const [lastMessage] = yield (0, index_1.query)('SELECT "ID CLIENTE", "ID SENDER" FROM [CHAT MESSAGE] WHERE [ID CLIENTE] = ? ORDER BY [ID] DESC LIMIT 1', [
+        message.idCliente,
+    ]);
+    const lastMessageOfClient = lastMessage.idCliente === lastMessage.idSender;
+    if ((isClient && !lastMessageOfClient) || (!isClient && lastMessageOfClient))
+        return false;
     return true;
 });
 const getConversationImage = (req, res, { query, bucket, isClient }) => __awaiter(void 0, void 0, void 0, function* () {

package/lib/cjs/types/chat/api/conversation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"conversation.d.ts","sourceRoot":"","sources":["../../../../../src/chat/api/conversation.ts"],"names":[],"mappings":"AAYA,QAAA,MAAM,iBAAiB,0BAA2B,GAAG,SAoBpD,CAAC;AAwSF,OAAO,EAAE,iBAAiB,EAAE,CAAC"}
+{"version":3,"file":"conversation.d.ts","sourceRoot":"","sources":["../../../../../src/chat/api/conversation.ts"],"names":[],"mappings":"AAYA,QAAA,MAAM,iBAAiB,0BAA2B,GAAG,SAoBpD,CAAC;AA+SF,OAAO,EAAE,iBAAiB,EAAE,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@runnerpro/backend",
-  "version": "1.10.17",
+  "version": "1.10.18",
   "description": "A collection of common backend functions",
   "exports": {
     ".": "./lib/cjs/index.js"