@runnerpro/backend 1.1.4 → 1.1.6

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

@@ -56,13 +56,13 @@ exports.conversationRoute = conversationRoute;
 const getConversation = (req, res, { query, 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].*,
-        [WORKOUT].[DATE] AS [WORKOUT DATE], [WORKOUT].[TYPE] AS [WORKOUT TYPE], [WORKOUT].[TITLE] AS [WORKOUT TITLE],
-        [FEELINGS], [FEELINGS DESCRIPTION]
-      FROM [CHAT MESSAGE] 
-      LEFT JOIN [WORKOUT] ON [WORKOUT].[ID] = [CHAT MESSAGE].[ID WORKOUT]
-      WHERE [CHAT MESSAGE].[ID CLIENTE] = ? AND (${isClient} = FALSE OR [CHAT MESSAGE].[SHOW CLIENT] = TRUE) 
-      ORDER BY [CHAT MESSAGE].[DATE] DESC
+    let messages = yield query(`SELECT [CHAT MESSAGE].*,
+        [WORKOUT].[DATE] AS [WORKOUT DATE], [WORKOUT].[TYPE] AS [WORKOUT TYPE], [WORKOUT].[TITLE] AS [WORKOUT TITLE],
+        [FEELINGS], [FEELINGS DESCRIPTION]
+      FROM [CHAT MESSAGE] 
+      LEFT JOIN [WORKOUT] ON [WORKOUT].[ID] = [CHAT MESSAGE].[ID WORKOUT]
+      WHERE [CHAT MESSAGE].[ID CLIENTE] = ? AND (${isClient} = FALSE OR [CHAT MESSAGE].[SHOW CLIENT] = TRUE) 
+      ORDER BY [CHAT MESSAGE].[DATE] DESC
       LIMIT 100`, [idCliente]);
     messages = messages.reverse();
     // Si el cliente no habla español, se muestran los mensajes en el idioma del cliente. El entrenador siempre ve los mensajes en español que están en la columna [TEXT]

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

@@ -32,18 +32,18 @@ const getList = (req, res, { query, isClient }) => __awaiter(void 0, void 0, voi
     else {
         const { page } = req.query;
         const limit = 20;
-        const list = yield query(`
-      SELECT [C].[ID], [C].[NAME], 
-        [CM].[DATE], [CM].[TEXT], 
-        CASE WHEN [CM].[READ] = FALSE AND [CM].[ID SENDER] = [CM].[ID CLIENTE] THEN 0
-             ELSE 1 END AS [READ]
-      FROM [CLIENTE] AS [C]
-      LEFT JOIN (
-        SELECT *, ROW_NUMBER() OVER (PARTITION BY [ID CLIENTE] ORDER BY [DATE] DESC) AS [ROW]
-        FROM [CHAT MESSAGE]
-      ) AS [CM] ON [CM].[ID CLIENTE] = [C].[ID] AND [CM].[ROW] = 1
-      ORDER BY CASE WHEN [CM].[DATE] IS NULL THEN 1 ELSE 0 END, [CM].[DATE] DESC
-      LIMIT ? OFFSET ?
+        const list = yield query(`
+      SELECT [C].[ID], [C].[NAME], 
+        [CM].[DATE], [CM].[TEXT], 
+        CASE WHEN [CM].[READ] = FALSE AND [CM].[ID SENDER] = [CM].[ID CLIENTE] THEN 0
+             ELSE 1 END AS [READ]
+      FROM [CLIENTE] AS [C]
+      LEFT JOIN (
+        SELECT *, ROW_NUMBER() OVER (PARTITION BY [ID CLIENTE] ORDER BY [DATE] DESC) AS [ROW]
+        FROM [CHAT MESSAGE]
+      ) AS [CM] ON [CM].[ID CLIENTE] = [C].[ID] AND [CM].[ROW] = 1
+      ORDER BY CASE WHEN [CM].[DATE] IS NULL THEN 1 ELSE 0 END, [CM].[DATE] DESC
+      LIMIT ? OFFSET ?
     `, [limit, limit * page]);
         res.send(list);
     }

package/lib/cjs/chat/utils/getCountNotificaciones.js

@@ -12,22 +12,22 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getCountNotificaciones = void 0;
 const getCountNotificaciones = ({ query, isClient, idClient }) => __awaiter(void 0, void 0, void 0, function* () {
     if (isClient) {
-        const [{ chat }] = yield query(`
-      SELECT COUNT([ID]) AS [CHAT]
-      FROM [CHAT MESSAGE]
-      WHERE [ID CLIENTE] = ? AND [READ] = FALSE AND [ID SENDER] != [ID CLIENTE]
+        const [{ chat }] = yield query(`
+      SELECT COUNT([ID]) AS [CHAT]
+      FROM [CHAT MESSAGE]
+      WHERE [ID CLIENTE] = ? AND [READ] = FALSE AND [ID SENDER] != [ID CLIENTE]
     `, [idClient]);
         return chat;
     }
     else {
-        const [{ chat }] = yield query(`
-      SELECT COUNT([C].[ID]) AS [CHAT]
-      FROM [CLIENTE] AS [C]
-      LEFT JOIN (
-        SELECT *, ROW_NUMBER() OVER (PARTITION BY [ID CLIENTE] ORDER BY [DATE] DESC) AS [ROW]
-        FROM [CHAT MESSAGE]
-        ) AS [CM] ON [CM].[ID CLIENTE] = [C].[ID] AND [CM].[ROW] = 1
-        WHERE [CM].[READ] = FALSE AND [CM].[ID SENDER] = [CM].[ID CLIENTE]
+        const [{ chat }] = yield query(`
+      SELECT COUNT([C].[ID]) AS [CHAT]
+      FROM [CLIENTE] AS [C]
+      LEFT JOIN (
+        SELECT *, ROW_NUMBER() OVER (PARTITION BY [ID CLIENTE] ORDER BY [DATE] DESC) AS [ROW]
+        FROM [CHAT MESSAGE]
+        ) AS [CM] ON [CM].[ID CLIENTE] = [C].[ID] AND [CM].[ROW] = 1
+        WHERE [CM].[READ] = FALSE AND [CM].[ID SENDER] = [CM].[ID CLIENTE]
     `);
         return chat;
     }

package/lib/cjs/sendMail/index.js

@@ -22,10 +22,13 @@ const transporter = nodemailer_1.default.createTransport({
     },
 });
 const sendMail = ({ subject, title, body, to, link, attachments, bcc }) => __awaiter(void 0, void 0, void 0, function* () {
+    const toMapped = process.env.NODE_ENV === 'PROD' ? to.map((correo) => correo).join(',') : process.env.GMAIL_EMAIL_USER;
+    if ((toMapped === null || toMapped === void 0 ? void 0 : toMapped.length) === 0)
+        return;
     const bodyHTML = getBodyHTML(title, body, link);
     return transporter.sendMail({
         from: process.env.GMAIL_EMAIL_USER,
-        to: process.env.NODE_ENV === 'PROD' ? to.map((correo) => correo).join(',') : process.env.GMAIL_EMAIL_USER,
+        to: toMapped,
         bcc: process.env.NODE_ENV === 'PROD' && bcc ? bcc.map((correo) => correo).join(',') : '',
         subject,
         text: body + (link ? link.url : ''),
@@ -95,7 +98,7 @@ function getBodyHTML(title, body, link) {
                     <table role="presentation" style="width:100%;border-collapse:collapse;border:0;border-spacing:0;background:#f0f0f0;">
                       <tr>
                         <td align="center" style="padding:0;">
-                          <a href="${process.env.FRONTEND_URL}${link.url}" class="button" style="color:white">${link.text}</a>
+                          <a href="${link.external ? link.url : `${process.env.FRONTEND_URL}${link.url}`}" class="button" style="color:white">${link.text}</a>
                         </td>
                       </tr>
                     </table>

package/lib/cjs/sendNotification/index.js

@@ -39,7 +39,7 @@ function notificationIOS(msg, token) {
         const options = {
             token: {
                 key: 'env/apple_notification.p8',
-                keyId: '49XT5X2ZYD',
+                keyId: 'B7CYLPUCAM',
                 teamId: 'UA78D3SXQG',
             },
             production: true,

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/sendMail/index.ts"],"names":[],"mappings":"AAUA,UAAU,IAAI;IACZ,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,MAAM,EAAE,CAAC;IACb,IAAI,CAAC,EAAE;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;IACrC,WAAW,CAAC,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,GAAG,CAAC,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IACjE,GAAG,CAAC,EAAE,MAAM,EAAE,CAAC;CAChB;AAED,QAAA,MAAM,QAAQ,yDAAgE,IAAI,qEAkBjF,CAAC;AA2EF,OAAO,EAAE,QAAQ,EAAE,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/sendMail/index.ts"],"names":[],"mappings":"AAUA,UAAU,IAAI;IACZ,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,MAAM,EAAE,CAAC;IACb,IAAI,CAAC,EAAE;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;IACrC,WAAW,CAAC,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,GAAG,CAAC,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IACjE,GAAG,CAAC,EAAE,MAAM,EAAE,CAAC;CAChB;AAED,QAAA,MAAM,QAAQ,yDAAgE,IAAI,qEAoBjF,CAAC;AA2EF,OAAO,EAAE,QAAQ,EAAE,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@runnerpro/backend",
-  "version": "1.1.4",
+  "version": "1.1.6",
   "description": "A collection of common backend functions",
   "exports": {
     ".": "./lib/cjs/index.js"
@@ -13,7 +13,6 @@
   "scripts": {
     "clean": "del-cli ./lib",
     "build": "npm run clean && tsc -p ./configs/tsconfig.cjs.json",
-    "publish": "npm run build && npm publish",
     "deploy": "npm run build && npm publish",
     "semantic-release": "semantic-release",
     "lint": "eslint --ext .ts --ignore-path .gitignore .",
@@ -54,7 +53,7 @@
   },
   "peerDependencies": {
     "@parse/node-apn": "6.0.1",
-    "@runnerpro/common": "^1.2.10",
+    "@runnerpro/common": "^1.4.1",
     "axios": "^1.6.7",
     "jimp": "^0.22.10",
     "nodemailer": "6.9.9",
@@ -69,4 +68,3 @@
     "socket.io": "^4.7.2"
   }
 }
-