@runnerpro/backend 1.10.18 → 1.11.2

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

@@ -54,10 +54,10 @@ const conversationRoute = (_a) => {
     router.post('/conversation/read', (req, res, next) => readMessage(req, res, params).catch((error) => (0, index_1.err)(req, res, error, next)));
 };
 exports.conversationRoute = conversationRoute;
-const getConversation = (req, res, { query, isClient }) => __awaiter(void 0, void 0, void 0, function* () {
+const getConversation = (req, res, { isClient }) => __awaiter(void 0, void 0, void 0, function* () {
     const idCliente = isClient ? req.session.userid : req.query.id;
-    const [header] = yield query('SELECT [NAME], [PREFERRED LANGUAGE] FROM [CLIENTE] WHERE [ID] = ?', [idCliente]);
-    let messages = yield query(`SELECT [CHAT MESSAGE].*,
+    const [header] = yield (0, index_1.query)('SELECT [NAME], [PREFERRED LANGUAGE] FROM [CLIENTE] WHERE [ID] = ?', [idCliente]);
+    let messages = yield (0, index_1.query)(`SELECT [CHAT MESSAGE].*,
         [WORKOUT].[DATE] AS [WORKOUT DATE], [WORKOUT].[TYPE] AS [WORKOUT TYPE], [WORKOUT].[TITLE] AS [WORKOUT TITLE], [WORKOUT].[TITLE PREFERRED LANGUAGE] AS [WORKOUT TITLE],
         [WORKOUT].[DURATION] AS [WORKOUT DURATION], [WORKOUT].[DISTANCE] AS [WORKOUT DISTANCE],
         [WORKOUT].[PHOTO URL SHARE] AS [WORKOUT PHOTO URL SHARE], [WORKOUT].[PHOTO URL] AS [WORKOUT PHOTO URL], [FEELINGS], [FEELINGS DESCRIPTION]
@@ -89,36 +89,35 @@ const getConversation = (req, res, { query, isClient }) => __awaiter(void 0, voi
     res.send({ header, messages });
     // Solo se marca como leído si es el cliente | El entrenador tiene el botón o enviar mensaje para marcar como leído
     if (isClient)
-        yield markReadMessage({ isClient, query, idCliente });
+        yield markReadMessage({ isClient, idCliente });
 });
-const deleteConversationMessage = (req, res, { query, isClient }) => __awaiter(void 0, void 0, void 0, function* () {
+const deleteConversationMessage = (req, res, { isClient }) => __awaiter(void 0, void 0, void 0, function* () {
     const { id } = req.params;
     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]);
+        yield (0, index_1.query)('UPDATE [CHAT MESSAGE] SET [ELIMINADO] = TRUE WHERE [ID] = ?', [id]);
     else
-        yield query('DELETE FROM [CHAT MESSAGE] WHERE [ID] = ?', [id]);
+        yield (0, index_1.query)('DELETE FROM [CHAT MESSAGE] WHERE [ID] = ?', [id]);
     res.send({ status: 'ok' });
 });
 // TODO: Si el cliente elimina o edita y ya se ha sugerido el mensaje
 // - Se elimina la sugerencia
 // - Se elimina el mensaje programado
 // TODO: Comprobar que el cliente/entrenador puede editar/eliminar el mensaje (no se haya contestado ya y que no haya pasado el tiempo de cortesía)
-const editConversationMessage = (req, res, { query, isClient }) => __awaiter(void 0, void 0, void 0, function* () {
+const editConversationMessage = (req, res, { isClient }) => __awaiter(void 0, void 0, void 0, function* () {
     const { id } = req.params;
     const { text } = req.body;
     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]);
+    const [message] = yield (0, index_1.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,
         idCliente: message.idCliente,
         isClient,
-        query,
     });
-    yield query('UPDATE [CHAT MESSAGE] SET [TEXT] = ?, [TEXT PREFERRED LANGUAGE] = ?, [EDITADO] = TRUE WHERE [ID] = ?', [
+    yield (0, index_1.query)('UPDATE [CHAT MESSAGE] SET [TEXT] = ?, [TEXT PREFERRED LANGUAGE] = ?, [EDITADO] = TRUE WHERE [ID] = ?', [
         textSpanish,
         textPreferredLanguage,
         id,
@@ -146,9 +145,8 @@ const canEditOrDeleteMessage = ({ idMessage, isClient, userid }) => __awaiter(vo
         return false;
     return true;
 });
-const getConversationImage = (req, res, { query, bucket, isClient }) => __awaiter(void 0, void 0, void 0, function* () {
+const getConversationImage = (req, res, { bucket, isClient }) => __awaiter(void 0, void 0, void 0, function* () {
     const result = yield getChatFile({
-        query,
         bucket,
         id: req.params.id,
         isClient,
@@ -163,9 +161,8 @@ const getConversationImage = (req, res, { query, bucket, isClient }) => __awaite
         mimetype: result.message.mimetype,
     });
 });
-const getConversationFile = (req, res, { query, bucket, isClient }) => __awaiter(void 0, void 0, void 0, function* () {
+const getConversationFile = (req, res, { bucket, isClient }) => __awaiter(void 0, void 0, void 0, function* () {
     const result = yield getChatFile({
-        query,
         bucket,
         id: req.params.id,
         isClient,
@@ -180,9 +177,9 @@ const getConversationFile = (req, res, { query, bucket, isClient }) => __awaiter
     });
     res.end(result.file);
 });
-const getChatFile = ({ query, bucket, id, isClient, userid }) => __awaiter(void 0, void 0, void 0, function* () {
+const getChatFile = ({ bucket, id, isClient, userid }) => __awaiter(void 0, void 0, void 0, function* () {
     const idBBDD = id.includes('-original') ? id.replace('-original', '') : id;
-    const [message] = yield query('SELECT [MIMETYPE], [TEXT] FROM [CHAT MESSAGE] WHERE [ID] = ? AND (? = FALSE OR [ID CLIENTE] = ?)', [
+    const [message] = yield (0, index_1.query)('SELECT [MIMETYPE], [TEXT] FROM [CHAT MESSAGE] WHERE [ID] = ? AND (? = FALSE OR [ID CLIENTE] = ?)', [
         idBBDD,
         isClient,
         userid,
@@ -197,21 +194,20 @@ const getChatFile = ({ query, bucket, id, isClient, userid }) => __awaiter(void
         return null;
     }
 });
-const sendMessage = (req, res, { sendNotification, firebaseMessaging, query, isClient }) => __awaiter(void 0, void 0, void 0, function* () {
+const sendMessage = (req, res, { sendNotification, firebaseMessaging, isClient }) => __awaiter(void 0, void 0, void 0, function* () {
     const { text, replyMessageId } = req.body;
     const { userid } = req.session;
     const idCliente = isClient ? req.session.userid : req.body.idCliente;
     // Si es entrenador, se marca leído cuando se envía un mensaje
     if (!isClient)
-        yield markReadMessage({ isClient, query, idCliente });
+        yield markReadMessage({ isClient, idCliente });
     // Devuelve el texto en el otro idioma si el cliente no habla español y el idioma del cliente
     const { textSpanish, textPreferredLanguage, preferredLanguage } = yield getPreferredLanguageForChat({
         text,
         idCliente,
         isClient,
-        query,
     });
-    const [message] = yield query('INSERT INTO [CHAT MESSAGE] ([ID CLIENTE], [ID SENDER], [TEXT], [TEXT PREFERRED LANGUAGE], [PREFERRED LANGUAGE], [REPLY MESSAGE ID], [TYPE]) VALUES (?, ?, ?, ?, ?, ?, ?) RETURNING [ID]', [isClient ? userid : idCliente, userid, textSpanish, textPreferredLanguage, preferredLanguage, replyMessageId, 1]);
+    const [message] = yield (0, index_1.query)('INSERT INTO [CHAT MESSAGE] ([ID CLIENTE], [ID SENDER], [TEXT], [TEXT PREFERRED LANGUAGE], [PREFERRED LANGUAGE], [REPLY MESSAGE ID], [TYPE]) VALUES (?, ?, ?, ?, ?, ?, ?) RETURNING [ID]', [isClient ? userid : idCliente, userid, textSpanish, textPreferredLanguage, preferredLanguage, replyMessageId, 1]);
     res.send({ idMessage: message.id });
     if (!isClient) {
         sendNotification({
@@ -221,7 +217,7 @@ const sendMessage = (req, res, { sendNotification, firebaseMessaging, query, isC
             screen: common_1.NOTIFICATION_SCREEN_TYPES.CHAT,
         });
         // Enviar a N8N lo que ha escrito el entrenador
-        const [lastSuggestionMsg] = yield query('SELECT [ID] FROM [CHAT MESSAGE] WHERE [ID CLIENTE] = ? AND [SUGGESTION TEXT] IS NOT NULL ORDER BY [ID] DESC LIMIT 1', [idCliente]);
+        const [lastSuggestionMsg] = yield (0, index_1.query)('SELECT [ID] FROM [CHAT MESSAGE] WHERE [ID CLIENTE] = ? AND [SUGGESTION TEXT] IS NOT NULL ORDER BY [ID] DESC LIMIT 1', [idCliente]);
         if (lastSuggestionMsg) {
             yield axios_1.default.put(`${process.env.N8N_URL}/edc2484f-7010-44c1-8c1d-82924496a2eb`, {
                 id: lastSuggestionMsg.id,
@@ -230,8 +226,8 @@ const sendMessage = (req, res, { sendNotification, firebaseMessaging, query, isC
         }
     }
 });
-const getPreferredLanguageForChat = ({ text, idCliente, isClient, query }) => __awaiter(void 0, void 0, void 0, function* () {
-    const [{ preferredLanguage }] = yield query('SELECT [PREFERRED LANGUAGE] FROM [CLIENTE] WHERE [ID] = ?', [idCliente]);
+const getPreferredLanguageForChat = ({ text, idCliente, isClient }) => __awaiter(void 0, void 0, void 0, function* () {
+    const [{ preferredLanguage }] = yield (0, index_1.query)('SELECT [PREFERRED LANGUAGE] FROM [CLIENTE] WHERE [ID] = ?', [idCliente]);
     if (preferredLanguage === common_1.LANGUAGES.ES)
         return {
             textSpanish: text,
@@ -248,10 +244,10 @@ const getPreferredLanguageForChat = ({ text, idCliente, isClient, query }) => __
         preferredLanguage: preferredLanguage,
     };
 });
-const sendFile = (req, res, { sendNotification, firebaseMessaging, query, isClient, bucket }) => __awaiter(void 0, void 0, void 0, function* () {
+const sendFile = (req, res, { sendNotification, firebaseMessaging, isClient, bucket }) => __awaiter(void 0, void 0, void 0, function* () {
     const { idCliente, type, duration } = req.body;
     const { userid } = req.session;
-    const [{ id: idFile }] = yield query('INSERT INTO [CHAT MESSAGE] ([ID CLIENTE], [ID SENDER], [TEXT], [MIMETYPE], [DURATION], [TYPE]) VALUES (?, ?, ?, ?, ?, ?) RETURNING [ID]', [isClient ? userid : idCliente, userid, req.file.originalname, req.file.mimetype, duration || null, type || 2]);
+    const [{ id: idFile }] = yield (0, index_1.query)('INSERT INTO [CHAT MESSAGE] ([ID CLIENTE], [ID SENDER], [TEXT], [MIMETYPE], [DURATION], [TYPE]) VALUES (?, ?, ?, ?, ?, ?) RETURNING [ID]', [isClient ? userid : idCliente, userid, req.file.originalname, req.file.mimetype, duration || null, type || 2]);
     const filePath = path_1.default.join('./uploads', req.file.filename);
     const fileData = fs_1.default.readFileSync(filePath);
     const files = [];
@@ -274,7 +270,7 @@ const sendFile = (req, res, { sendNotification, firebaseMessaging, query, isClie
     }
     fs_1.default.unlinkSync(filePath);
     if (!isClient) {
-        const [cliente] = yield query('SELECT [PREFERRED LANGUAGE] FROM [CLIENTE] WHERE [ID] = ?', [idCliente]);
+        const [cliente] = yield (0, index_1.query)('SELECT [PREFERRED LANGUAGE] FROM [CLIENTE] WHERE [ID] = ?', [idCliente]);
         sendNotification({
             firebaseMessaging,
             idCliente,
@@ -284,14 +280,14 @@ const sendFile = (req, res, { sendNotification, firebaseMessaging, query, isClie
     }
     res.send({ idFile });
 });
-const readMessage = (req, res, { query, isClient }) => __awaiter(void 0, void 0, void 0, function* () {
+const readMessage = (req, res, { isClient }) => __awaiter(void 0, void 0, void 0, function* () {
     const { idCliente } = req.body;
-    yield markReadMessage({ isClient, query, idCliente });
+    yield markReadMessage({ isClient, idCliente });
     res.send({ status: 'ok' });
 });
-const markReadMessage = ({ isClient, query, idCliente }) => __awaiter(void 0, void 0, void 0, function* () {
+const markReadMessage = ({ isClient, 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 (0, index_1.query)('UPDATE [CHAT MESSAGE] SET [READ] = TRUE WHERE [ID CLIENTE] = ? AND [READ] = FALSE ' + conditionSender, [idCliente, idCliente]);
     if (!isClient)
         yield (0, saveResponseTime_1.saveResponseTime)(idCliente);
 });

package/lib/cjs/googleSheet/index.js

@@ -140,18 +140,72 @@ const writeSheet = ({ sheetInstance, sheetName, sheetPage, cellValue, cellPositi
     }
 });
 exports.writeSheet = writeSheet;
+// Función para detectar si un valor es una fecha en formato DD/MM/YYYY o YYYY/MM/DD
+const isDateString = (value) => {
+    if (typeof value !== 'string')
+        return false;
+    // Patrones para DD/MM/YYYY y YYYY/MM/DD
+    const datePatterns = [
+        /^\d{1,2}\/\d{1,2}\/\d{4}$/, // DD/MM/YYYY o D/M/YYYY
+        /^\d{4}\/\d{1,2}\/\d{1,2}$/, // YYYY/MM/DD o YYYY/M/D
+    ];
+    return datePatterns.some((pattern) => pattern.test(value));
+};
+// Función para convertir fecha a formato que Google Sheets reconozca
+const formatDateForGoogleSheets = (dateString) => {
+    if (!isDateString(dateString))
+        return dateString;
+    try {
+        let day, month, year;
+        // Detectar si es formato DD/MM/YYYY o YYYY/MM/DD
+        const parts = dateString.split('/');
+        if (parts[0].length === 4) {
+            // Formato YYYY/MM/DD
+            year = parseInt(parts[0]);
+            month = parseInt(parts[1]);
+            day = parseInt(parts[2]);
+        }
+        else {
+            // Formato DD/MM/YYYY
+            day = parseInt(parts[0]);
+            month = parseInt(parts[1]);
+            year = parseInt(parts[2]);
+        }
+        // Validar que sea una fecha válida
+        const date = new Date(year, month - 1, day);
+        if (date.getFullYear() !== year || date.getMonth() !== month - 1 || date.getDate() !== day) {
+            return dateString; // Si no es válida, devolver el valor original
+        }
+        // Formatear para Google Sheets (MM/DD/YYYY es el formato más compatible)
+        return `${month.toString().padStart(2, '0')}/${day.toString().padStart(2, '0')}/${year}`;
+    }
+    catch (error) {
+        return dateString; // Si hay error, devolver el valor original
+    }
+};
+// Función para procesar array de valores y formatear fechas
+const processValuesForGoogleSheets = (values) => {
+    return values.map((value) => {
+        // if (typeof value === 'string' && isDateString(value)) {
+        //   return formatDateForGoogleSheets(value);
+        // }
+        return value;
+    });
+};
 const appendSheet = ({ sheetInstance, sheetName, sheetPage, cellValues, cellPositionAppend }) => __awaiter(void 0, void 0, void 0, function* () {
     try {
         if (!sheetInstance)
             sheetInstance = yield getSheetInstance();
+        // Procesar los valores para formatear fechas automáticamente
+        const processedValues = processValuesForGoogleSheets(cellValues);
         yield sheetInstance.spreadsheets.values.append({
             auth: googleAuth,
             spreadsheetId: googleSheeIds[sheetName],
             range: `${sheetPage}!${cellPositionAppend}`,
-            valueInputOption: 'RAW',
+            valueInputOption: 'USER_ENTERED',
             insertDataOption: 'INSERT_ROWS',
             resource: {
-                values: [cellValues],
+                values: [processedValues],
             },
         });
     }

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;AA+SF,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;AA2SF,OAAO,EAAE,iBAAiB,EAAE,CAAC"}

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/googleSheet/index.ts"],"names":[],"mappings":"AA6BA,iBAAe,SAAS,CAAC,EAAE,aAAa,EAAE,SAAS,EAAE,SAAS,EAAE,iBAAiB,EAAE,eAAe,EAAE;;;;;;CAAA,gBAgBnG;AAED,QAAA,MAAM,eAAe;;;;;;;;;0BAiCpB,CAAC;AAGF,iBAAS,SAAS,CAAC,MAAM,KAAA,UAaxB;AAED,iBAAS,iBAAiB,CAAC,MAAM,KAAA,UAOhC;AAED,QAAA,MAAM,UAAU;;;;;;mBAkBf,CAAC;AAEF,QAAA,MAAM,WAAW;;;;;;mBAmBhB,CAAC;AAEF,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,UAAU,EAAE,WAAW,EAAE,iBAAiB,EAAE,SAAS,EAAE,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/googleSheet/index.ts"],"names":[],"mappings":"AA6BA,iBAAe,SAAS,CAAC,EAAE,aAAa,EAAE,SAAS,EAAE,SAAS,EAAE,iBAAiB,EAAE,eAAe,EAAE;;;;;;CAAA,gBAgBnG;AAED,QAAA,MAAM,eAAe;;;;;;;;;0BAiCpB,CAAC;AAGF,iBAAS,SAAS,CAAC,MAAM,KAAA,UAaxB;AAED,iBAAS,iBAAiB,CAAC,MAAM,KAAA,UAOhC;AAED,QAAA,MAAM,UAAU;;;;;;mBAkBf,CAAC;AA4DF,QAAA,MAAM,WAAW;;;;;;mBAsBhB,CAAC;AAEF,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,UAAU,EAAE,WAAW,EAAE,iBAAiB,EAAE,SAAS,EAAE,CAAC"}

package/package.json

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