@runnerpro/backend 1.8.15 → 1.8.17

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

@@ -34,6 +34,7 @@ const common_1 = require("@runnerpro/common");
 const index_2 = require("../../locale/index");
 const multer_1 = __importDefault(require("multer"));
 const axios_1 = __importDefault(require("axios"));
+const saveResponseTime_1 = require("../saveResponseTime");
 const conversationRoute = (_a) => {
     var { router } = _a, params = __rest(_a, ["router"]);
     const uploadFile = (0, multer_1.default)({
@@ -233,7 +234,7 @@ const readMessage = (req, res, { query, isClient }) => __awaiter(void 0, void 0,
 const markReadMessage = ({ isClient, query, idCliente }) => __awaiter(void 0, void 0, void 0, function* () {
     const conditionSender = isClient ? ' AND [ID SENDER] != ?' : ' AND ([ID SENDER] = ? OR [ID SENDER] IS NULL)';
     yield query('UPDATE [CHAT MESSAGE] SET [READ] = TRUE WHERE [ID CLIENTE] = ? AND [READ] = FALSE ' + conditionSender, [idCliente, idCliente]);
-    yield saveResponseTime({ query, isClient, idCliente });
+    yield (0, saveResponseTime_1.saveResponseTime)({ isClient, idCliente });
 });
 const resizeImage = (data, filePath, mimetype) => __awaiter(void 0, void 0, void 0, function* () {
     if (mimetype.includes('webp'))
@@ -266,29 +267,3 @@ const rotateOrientationImage = (data, filePath, image = null, mimetype) => __awa
         image = yield image.rotate(rotate);
     return image.getBufferAsync(jimp_1.default.MIME_JPEG);
 });
-const saveResponseTime = ({ query, isClient, idCliente }) => __awaiter(void 0, void 0, void 0, function* () {
-    if (isClient)
-        return;
-    let lastNotReadMessage;
-    let firstNotReadMessage;
-    // eslint-disable-next-line no-constant-condition
-    while (true) {
-        const [lastMessage] = yield query(`
-      SELECT * FROM [CHAT MESSAGE]
-      WHERE [ID CLIENTE] = ? AND [ID] < ?
-      ORDER BY [DATE] DESC
-      LIMIT 1
-    `, [idCliente, (lastNotReadMessage === null || lastNotReadMessage === void 0 ? void 0 : lastNotReadMessage.id) || 2147483646]);
-        // Si no hay más mensajes || el mensaje no es del cliente || ya tiene tiempo de respuesta => salimos del bucle
-        if (!lastMessage || (lastMessage.idSender && lastMessage.idCliente !== lastMessage.idSender) || lastMessage.tiempoRespuesta)
-            break;
-        lastNotReadMessage = lastMessage; // Se va actualizando el último mensaje no leído hasta que se encuentra el primero
-        if (!firstNotReadMessage)
-            firstNotReadMessage = lastMessage; // Se guarda el primer mensaje no leído para añadir en este el tiempo de respuesta
-    }
-    if (!lastNotReadMessage)
-        return;
-    // @ts-ignore
-    const responseTime = Math.floor((new Date() - new Date(lastNotReadMessage.date)) / 1000);
-    yield query('UPDATE [CHAT MESSAGE] SET [TIEMPO RESPUESTA] = ? WHERE [ID] = ?', [responseTime, firstNotReadMessage.id]);
-});

package/lib/cjs/chat/saveResponseTime.js

@@ -0,0 +1,40 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.saveResponseTime = void 0;
+const index_1 = require("../db/index");
+const saveResponseTime = ({ isClient, idCliente }) => __awaiter(void 0, void 0, void 0, function* () {
+    if (isClient)
+        return;
+    let lastNotReadMessage;
+    let firstNotReadMessage;
+    // eslint-disable-next-line no-constant-condition
+    while (true) {
+        const [lastMessage] = yield (0, index_1.query)(`
+        SELECT * FROM [CHAT MESSAGE]
+        WHERE [ID CLIENTE] = ? AND [ID] < ?
+        ORDER BY [DATE] DESC
+        LIMIT 1
+      `, [idCliente, lastNotReadMessage === null || lastNotReadMessage === void 0 ? void 0 : lastNotReadMessage.id]);
+        // Si no hay más mensajes || el mensaje no es del cliente || ya tiene tiempo de respuesta => salimos del bucle
+        if (!lastMessage || (lastMessage.idSender && lastMessage.idCliente !== lastMessage.idSender) || lastMessage.tiempoRespuesta)
+            break;
+        lastNotReadMessage = lastMessage; // Se va actualizando el último mensaje no leído hasta que se encuentra el primero
+        if (!firstNotReadMessage)
+            firstNotReadMessage = lastMessage; // Se guarda el primer mensaje no leído para añadir en este el tiempo de respuesta
+    }
+    if (!lastNotReadMessage)
+        return;
+    // @ts-ignore
+    const responseTime = Math.floor((new Date() - new Date(lastNotReadMessage.date)) / 1000);
+    yield (0, index_1.query)('UPDATE [CHAT MESSAGE] SET [TIEMPO RESPUESTA] = ? WHERE [ID] = ?', [responseTime, firstNotReadMessage.id]);
+});
+exports.saveResponseTime = saveResponseTime;

package/lib/cjs/chat/sendMessageChatToClient.js

@@ -26,10 +26,9 @@ const sendMessageChatToClient = (idCliente, text, textPreferredLanguage, preferr
             return;
         idEntrenador = entrenadorBBDD.idEntrenador;
     }
-    let result;
     if (notification) {
         try {
-            result = yield (0, index_2.sendNotification)({
+            yield (0, index_2.sendNotification)({
                 firebaseMessaging: (0, messaging_1.getMessaging)(),
                 idCliente,
                 body: (0, common_1.removeAccent)((textPreferredLanguage || text).substring(0, 50)) + ((textPreferredLanguage || text).length > 50 ? '...' : ''),
@@ -37,20 +36,9 @@ const sendMessageChatToClient = (idCliente, text, textPreferredLanguage, preferr
             });
         }
         catch (e) {
-            console.log('Error al enviar notificación', e);
             (0, index_1.err)(null, null, e, null);
-            return e;
         }
     }
     yield (0, index_3.query)('INSERT INTO [CHAT MESSAGE] ([ID CLIENTE], [ID SENDER], [TEXT], [TEXT PREFERRED LANGUAGE], [PREFERRED LANGUAGE], [TYPE]) VALUES (?, ?, ?, ?, ?, 1)', [idCliente, idEntrenador, text, textPreferredLanguage, preferredLanguage]);
-    return {
-        // status: 'success',
-        // notification,
-        // options,
-        // firebaseMessaging: getMessaging(),
-        // body: removeAccent((textPreferredLanguage || text).substring(0, 50)) + ((textPreferredLanguage || text).length > 50 ? '...' : ''),
-        // screen: NOTIFICATION_SCREEN_TYPES.CHAT,
-        result,
-    };
 });
 exports.sendMessageChatToClient = sendMessageChatToClient;

package/lib/cjs/sendNotification/index.js

@@ -24,19 +24,15 @@ const sendNotification = ({ firebaseMessaging, idCliente, title, body, screen =
         }),
     ]);
     const screenParamsString = JSON.stringify(screenParams);
-    const resultsDevices = [];
     for (const device of devices) {
-        const resultDevice = yield notificationWEB(firebaseMessaging, {
+        yield notificationWEB(firebaseMessaging, {
             title,
             body,
             idNotification: (idNotification || '0').toString(),
             screen,
             screenParams: screenParamsString,
         }, device.subscription);
-        // @ts-ignore
-        resultsDevices.push(resultDevice);
     }
-    return { status: 'success', idNotification, devices, resultsDevices };
 });
 exports.sendNotification = sendNotification;
 function notificationWEB(firebaseMessaging, msg, token) {
@@ -44,7 +40,7 @@ function notificationWEB(firebaseMessaging, msg, token) {
         if (!msg.title)
             msg.title = '';
         try {
-            const result = yield firebaseMessaging.send({
+            yield firebaseMessaging.send({
                 token,
                 notification: {
                     title: msg.title,
@@ -52,11 +48,9 @@ function notificationWEB(firebaseMessaging, msg, token) {
                 },
                 data: msg,
             });
-            return result;
         }
         catch (error) {
             console.log('Error al enviar notificación', error);
-            return error;
         }
     });
 }

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":"AAUA,QAAA,MAAM,iBAAiB,0BAA2B,GAAG,SAiBpD,CAAC;AA4QF,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,SAiBpD,CAAC;AA6OF,OAAO,EAAE,iBAAiB,EAAE,CAAC"}

package/lib/cjs/types/chat/saveResponseTime.d.ts

@@ -0,0 +1,6 @@
+declare const saveResponseTime: ({ isClient, idCliente }: {
+    isClient: any;
+    idCliente: any;
+}) => Promise<void>;
+export { saveResponseTime };
+//# sourceMappingURL=saveResponseTime.d.ts.map

package/lib/cjs/types/chat/saveResponseTime.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"saveResponseTime.d.ts","sourceRoot":"","sources":["../../../../src/chat/saveResponseTime.ts"],"names":[],"mappings":"AAEA,QAAA,MAAM,gBAAgB;;;mBA6BrB,CAAC;AAEF,OAAO,EAAE,gBAAgB,EAAE,CAAC"}

package/lib/cjs/types/chat/sendMessageChatToClient.d.ts

@@ -1,3 +1,3 @@
-declare const sendMessageChatToClient: (idCliente: any, text: any, textPreferredLanguage: any, preferredLanguage: any, options: any) => Promise<any>;
+declare const sendMessageChatToClient: (idCliente: any, text: any, textPreferredLanguage: any, preferredLanguage: any, options: any) => Promise<void>;
 export { sendMessageChatToClient };
 //# sourceMappingURL=sendMessageChatToClient.d.ts.map

package/lib/cjs/types/chat/sendMessageChatToClient.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sendMessageChatToClient.d.ts","sourceRoot":"","sources":["../../../../src/chat/sendMessageChatToClient.ts"],"names":[],"mappings":"AAMA,QAAA,MAAM,uBAAuB,+GAuC5B,CAAC;AAEF,OAAO,EAAE,uBAAuB,EAAE,CAAC"}
+{"version":3,"file":"sendMessageChatToClient.d.ts","sourceRoot":"","sources":["../../../../src/chat/sendMessageChatToClient.ts"],"names":[],"mappings":"AAMA,QAAA,MAAM,uBAAuB,gHA2B5B,CAAC;AAEF,OAAO,EAAE,uBAAuB,EAAE,CAAC"}

package/lib/cjs/types/sendNotification/index.d.ts

@@ -7,11 +7,6 @@ interface Notification {
     screen?: string;
     screenParams?: any;
 }
-declare const sendNotification: ({ firebaseMessaging, idCliente, title, body, screen, screenParams, }: Notification) => Promise<{
-    status: string;
-    idNotification: any;
-    devices: any;
-    resultsDevices: any[];
-}>;
+declare const sendNotification: ({ firebaseMessaging, idCliente, title, body, screen, screenParams, }: Notification) => Promise<void>;
 export { sendNotification };
 //# sourceMappingURL=index.d.ts.map

package/lib/cjs/types/sendNotification/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/sendNotification/index.ts"],"names":[],"mappings":"AAEA,UAAU,YAAY;IACpB,iBAAiB,EAAE,GAAG,CAAC;IACvB,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,YAAY,CAAC,EAAE,GAAG,CAAC;CACpB;AAED,QAAA,MAAM,gBAAgB,yEAOnB,YAAY;;;;;EAmCd,CAAC;AAyBF,OAAO,EAAE,gBAAgB,EAAE,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/sendNotification/index.ts"],"names":[],"mappings":"AAEA,UAAU,YAAY;IACpB,iBAAiB,EAAE,GAAG,CAAC;IACvB,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,YAAY,CAAC,EAAE,GAAG,CAAC;CACpB;AAED,QAAA,MAAM,gBAAgB,yEAOnB,YAAY,kBA8Bd,CAAC;AAuBF,OAAO,EAAE,gBAAgB,EAAE,CAAC"}

package/package.json

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