@runnerpro/backend 1.4.9 → 1.4.11
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -74,7 +74,6 @@ const getConversation = (req, res, { query, isClient }) => __awaiter(void 0, voi
|
|
|
74
74
|
});
|
|
75
75
|
}
|
|
76
76
|
res.send({ header, messages });
|
|
77
|
-
console.log('read from getConversation');
|
|
78
77
|
// Solo se marca como leído si es el cliente | El entrenador tiene el botón o enviar mensaje para marcar como leído
|
|
79
78
|
if (isClient)
|
|
80
79
|
yield markReadMessage({ isClient, query, idCliente });
|
|
@@ -155,7 +154,9 @@ const sendMessage = (req, res, { sendNotification, firebaseMessaging, query, isC
|
|
|
155
154
|
const { text } = req.body;
|
|
156
155
|
const { userid } = req.session;
|
|
157
156
|
const idCliente = isClient ? req.session.userid : req.body.idCliente;
|
|
158
|
-
|
|
157
|
+
// Si es entrenador, se marca leído cuando se envía un mensaje
|
|
158
|
+
if (!isClient)
|
|
159
|
+
yield markReadMessage({ isClient, query, idCliente });
|
|
159
160
|
// Devuelve el texto en el otro idioma si el cliente no habla español y el idioma del cliente
|
|
160
161
|
const { textSpanish, textPreferredLanguage, preferredLanguage } = yield getPreferredLanguageForChat({
|
|
161
162
|
text,
|
|
@@ -163,9 +164,7 @@ const sendMessage = (req, res, { sendNotification, firebaseMessaging, query, isC
|
|
|
163
164
|
isClient,
|
|
164
165
|
query,
|
|
165
166
|
});
|
|
166
|
-
console.log(2);
|
|
167
167
|
yield query('INSERT INTO [CHAT MESSAGE] ([ID CLIENTE], [ID SENDER], [TEXT], [TEXT PREFERRED LANGUAGE], [PREFERRED LANGUAGE], [TYPE]) VALUES (?, ?, ?, ?, ?, 1)', [isClient ? userid : idCliente, userid, textSpanish, textPreferredLanguage, preferredLanguage]);
|
|
168
|
-
console.log(3);
|
|
169
168
|
if (!isClient) {
|
|
170
169
|
sendNotification({
|
|
171
170
|
firebaseMessaging,
|
|
@@ -173,8 +172,8 @@ const sendMessage = (req, res, { sendNotification, firebaseMessaging, query, isC
|
|
|
173
172
|
body: `Rubén: ${textPreferredLanguage || textSpanish}`,
|
|
174
173
|
url: '/chat',
|
|
175
174
|
});
|
|
176
|
-
// Enviar el mensaje a la IA de vuelta para que aprenda que mensaje ha acabado enviando el entrenador
|
|
177
175
|
try {
|
|
176
|
+
// Enviar el mensaje a la IA de vuelta para que aprenda que mensaje ha acabado enviando el entrenador
|
|
178
177
|
yield axios_1.default.put(`${process.env.BACKEND_IA_URL}/api/chat/suggestion`, { userId: idCliente }, {
|
|
179
178
|
headers: {
|
|
180
179
|
'ngrok-skip-browser-warning': true, // working with ngrok
|
|
@@ -187,12 +186,7 @@ const sendMessage = (req, res, { sendNotification, firebaseMessaging, query, isC
|
|
|
187
186
|
console.error(error);
|
|
188
187
|
}
|
|
189
188
|
}
|
|
190
|
-
console.log(4);
|
|
191
189
|
res.send({ status: 'ok' });
|
|
192
|
-
console.log('read from sendMessage');
|
|
193
|
-
// Si es entrenador, se marca leído cuando se envía un mensaje
|
|
194
|
-
if (!isClient)
|
|
195
|
-
yield markReadMessage({ isClient, query, idCliente });
|
|
196
190
|
});
|
|
197
191
|
const getPreferredLanguageForChat = ({ text, idCliente, isClient, query }) => __awaiter(void 0, void 0, void 0, function* () {
|
|
198
192
|
const [{ preferredLanguage }] = yield query('SELECT [PREFERRED LANGUAGE] FROM [CLIENTE] WHERE [ID] = ?', [idCliente]);
|
|
@@ -250,12 +244,10 @@ const sendFile = (req, res, { sendNotification, firebaseMessaging, query, isClie
|
|
|
250
244
|
});
|
|
251
245
|
const readMessage = (req, res, { query, isClient }) => __awaiter(void 0, void 0, void 0, function* () {
|
|
252
246
|
const { idCliente } = req.body;
|
|
253
|
-
console.log('read from readMessage');
|
|
254
247
|
yield markReadMessage({ isClient, query, idCliente });
|
|
255
248
|
res.send({ status: 'ok' });
|
|
256
249
|
});
|
|
257
250
|
const markReadMessage = ({ isClient, query, idCliente }) => __awaiter(void 0, void 0, void 0, function* () {
|
|
258
|
-
console.log({ isClient, idCliente });
|
|
259
251
|
const conditionSender = isClient ? ' AND [ID SENDER] != ?' : ' AND [ID SENDER] = ?';
|
|
260
252
|
yield query('UPDATE [CHAT MESSAGE] SET [READ] = TRUE WHERE [ID CLIENTE] = ? AND [READ] = FALSE ' + conditionSender, [idCliente, idCliente]);
|
|
261
253
|
yield saveResponseTime({ query, isClient, idCliente });
|
|
@@ -300,7 +292,6 @@ const readFeelings = (req, res, { query, isClient }) => __awaiter(void 0, void 0
|
|
|
300
292
|
res.send({ status: 'ok' });
|
|
301
293
|
});
|
|
302
294
|
const saveResponseTime = ({ query, isClient, idCliente }) => __awaiter(void 0, void 0, void 0, function* () {
|
|
303
|
-
console.log('saveResponseTime');
|
|
304
295
|
if (isClient)
|
|
305
296
|
return;
|
|
306
297
|
let lastNotReadMessage;
|
|
@@ -313,7 +304,6 @@ const saveResponseTime = ({ query, isClient, idCliente }) => __awaiter(void 0, v
|
|
|
313
304
|
ORDER BY [DATE] DESC
|
|
314
305
|
LIMIT 1
|
|
315
306
|
`, [idCliente, (lastNotReadMessage === null || lastNotReadMessage === void 0 ? void 0 : lastNotReadMessage.id) || 2147483646]);
|
|
316
|
-
console.log({ lastMessage });
|
|
317
307
|
// Si no hay más mensajes || el mensaje no es del cliente || ya tiene tiempo de respuesta => salimos del bucle
|
|
318
308
|
if (!lastMessage || (lastMessage.idSender && lastMessage.idCliente !== lastMessage.idSender) || lastMessage.tiempoRespuesta)
|
|
319
309
|
break;
|
|
@@ -321,7 +311,6 @@ const saveResponseTime = ({ query, isClient, idCliente }) => __awaiter(void 0, v
|
|
|
321
311
|
if (!firstNotReadMessage)
|
|
322
312
|
firstNotReadMessage = lastMessage; // Se guarda el primer mensaje no leído para añadir en este el tiempo de respuesta
|
|
323
313
|
}
|
|
324
|
-
console.log({ lastNotReadMessage });
|
|
325
314
|
if (!lastNotReadMessage)
|
|
326
315
|
return;
|
|
327
316
|
// @ts-ignore
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"conversation.d.ts","sourceRoot":"","sources":["../../../../../src/chat/api/conversation.ts"],"names":[],"mappings":"AAWA,QAAA,MAAM,iBAAiB,0BAA2B,GAAG,SAmBpD,CAAC;
|
|
1
|
+
{"version":3,"file":"conversation.d.ts","sourceRoot":"","sources":["../../../../../src/chat/api/conversation.ts"],"names":[],"mappings":"AAWA,QAAA,MAAM,iBAAiB,0BAA2B,GAAG,SAmBpD,CAAC;AA0SF,OAAO,EAAE,iBAAiB,EAAE,CAAC"}
|