@runnerpro/backend 1.21.4 → 1.21.6

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

@@ -73,7 +73,7 @@ const getConversation = (req, res, { isClient }) => __awaiter(void 0, void 0, vo
         "ENTRENADOR"."NAME" AS "ENTRENADOR NAME", "ENTRENADOR"."PHOTO" AS "ENTRENADOR PHOTO",
         (SELECT "NAME" FROM "ENTRENADOR" WHERE "ID" = "CHAT MESSAGE"."ID SENDER") AS "ENTRENADOR REAL NAME"
       FROM "CHAT MESSAGE" 
-    LEFT JOIN "WORKOUT" ON "WORKOUT"."ID" = "CHAT MESSAGE"."ID WORKOUT"
+    LEFT JOIN "WORKOUT" ON "WORKOUT"."ID" = "CHAT MESSAGE"."ID WORKOUT"::integer
 	  LEFT JOIN "CLIENTE" ON "CLIENTE"."ID" = "CHAT MESSAGE"."ID CLIENTE"
     LEFT JOIN "ENTRENADOR" ON "ENTRENADOR"."ID" = COALESCE("CHAT MESSAGE"."ID SENDER VIEW", "CLIENTE"."ID ENTRENADOR PRINCIPAL") 
       AND "CHAT MESSAGE"."ID CLIENTE" != "CHAT MESSAGE"."ID SENDER"

package/lib/cjs/types/workout/saveWorkoutAplication.d.ts

@@ -1,6 +1,7 @@
 /**
  * @param opts {{
  *   date, type, title, description, distance, duration, power, desnivel, polyline,
+ *   startAt,                // ISO/Date de inicio (UTC) — clave del dedup cross-proveedor
  *   idCliente, aplicationType, aplicationId,
  *   queryConditionExist?,   // LEGACY string SQL — deprecated, fallback
  *   tiposEquivalentes?,     // string[] de TYPEs equivalentes

package/lib/cjs/types/workout/saveWorkoutAplication.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"saveWorkoutAplication.d.ts","sourceRoot":"","sources":["../../../../src/workout/saveWorkoutAplication.ts"],"names":[],"mappings":"AAwPA;;;;;;;;;GASG;AACH,QAAA,MAAM,qBAAqB,SACnB,GAAG,UAED,GAAG,KACV,QAAQ,MAAM,GAAG,IAAI,CAsEvB,CAAC;AA+DF,OAAO,EAAE,qBAAqB,EAAE,CAAC"}
+{"version":3,"file":"saveWorkoutAplication.d.ts","sourceRoot":"","sources":["../../../../src/workout/saveWorkoutAplication.ts"],"names":[],"mappings":"AAuRA;;;;;;;;;;GAUG;AACH,QAAA,MAAM,qBAAqB,SACnB,GAAG,UAED,GAAG,KACV,QAAQ,MAAM,GAAG,IAAI,CAsEvB,CAAC;AA+DF,OAAO,EAAE,qBAAqB,EAAE,CAAC"}

package/lib/cjs/workout/saveWorkoutAplication.js

@@ -147,12 +147,42 @@ const similar = (a, b, tol) => {
         return na === nb;
     return Math.abs(na - nb) / Math.max(na, nb) <= tol;
 };
+// Ventana de solape de hora de inicio para el dedup cross-proveedor. Las
+// grabaciones de la MISMA actividad (típicamente un mismo reloj que sincroniza a
+// Strava/Apple/Garmin) empiezan en el mismo instante; 5 min absorben cualquier
+// desfase de redondeo/zona horaria sin abrir falsos positivos (no se inician dos
+// actividades del mismo grupo de tipo en 5 min).
+const VENTANA_INICIO_MS = 5 * 60 * 1000;
+const inicioSolapa = (a, b) => {
+    if (!a || !b)
+        return false;
+    const ta = new Date(a).getTime();
+    const tb = new Date(b).getTime();
+    if (Number.isNaN(ta) || Number.isNaN(tb))
+        return false;
+    return Math.abs(ta - tb) <= VENTANA_INICIO_MS;
+};
 const buscarWorkoutSimilar = (q, opts, dateStr, pt) => __awaiter(void 0, void 0, void 0, function* () {
-    const rows = yield q(`SELECT "ID", "DURATION", "DISTANCE", "TIPO APLICATION"
+    // Pre-filtro por ventana de día ±1: el match real es por hora de inicio (no por
+    // DATE exacto). Strava deriva DATE de la hora LOCAL y Apple/Garmin de UTC, así
+    // que la misma actividad puede caer en días distintos cerca de medianoche; ±1
+    // día cubre ese borde sin ensanchar el rango de más.
+    const dayPrev = (0, moment_1.default)(dateStr, 'YYYY-MM-DD').subtract(1, 'day').format('YYYY-MM-DD');
+    const dayNext = (0, moment_1.default)(dateStr, 'YYYY-MM-DD').add(1, 'day').format('YYYY-MM-DD');
+    const rows = yield q(`SELECT "ID", "DURATION", "DISTANCE", "TIPO APLICATION", "START AT"
        FROM "WORKOUT"
-      WHERE "ID CLIENTE" = ? AND "DATE" = ? AND ${pt.sql}
-        AND "DONE" = TRUE AND "TIPO APLICATION" IS NOT NULL AND "TIPO APLICATION" <> ?`, [opts.idCliente, dateStr, ...pt.params, opts.aplicationType]);
-    const cand = rows.filter((r) => similar(r.duration, opts.duration, 0.1) && similar(r.distance, opts.distance, 0.1));
+      WHERE "ID CLIENTE" = ? AND "DATE" BETWEEN ? AND ? AND ${pt.sql}
+        AND "DONE" = TRUE AND "TIPO APLICATION" IS NOT NULL AND "TIPO APLICATION" <> ?`, [opts.idCliente, dayPrev, dayNext, ...pt.params, opts.aplicationType]);
+    const cand = rows.filter((r) => {
+        // Señal robusta: solape de hora de inicio. Inmune a las unidades de distancia
+        // (Apple en millas) y a elapsed-vs-moving en la duración (webhook Strava).
+        // Sólo aplica si AMBAS filas tienen "START AT".
+        if (opts.startAt && r.startAt)
+            return inicioSolapa(r.startAt, opts.startAt);
+        // Fallback legacy: filas sin "START AT" (anteriores a esta feature, sin
+        // backfill) → se mantiene el heurístico distancia+duración para no regresar.
+        return similar(r.duration, opts.duration, 0.1) && similar(r.distance, opts.distance, 0.1);
+    });
     cand.sort((a, b) => prioridadFuente(b.tipoAplication) - prioridadFuente(a.tipoAplication));
     return cand[0] || null;
 });
@@ -193,9 +223,9 @@ const registrarFuente = (q, idWorkout, tipo, idApp) => __awaiter(void 0, void 0,
      DO UPDATE SET "ID APLICATION" = EXCLUDED."ID APLICATION", "INGESTED AT" = NOW()`, [idWorkout, String(tipo), idApp !== null && idApp !== undefined ? String(idApp) : null]);
 });
 const aplicarMerge = (q, idWorkout, opts, esFilaNueva) => __awaiter(void 0, void 0, void 0, function* () {
-    var _a, _b;
+    var _a, _b, _c;
     const [row] = yield q(`SELECT "DISTANCE", "DURATION", "POTENCIA", "DESNIVEL", "CALORIES", "FC MEDIA",
-            "ZONE", "POLYLINE", "TIPO APLICATION", "ID APLICATION"
+            "ZONE", "POLYLINE", "TIPO APLICATION", "ID APLICATION", "START AT"
        FROM "WORKOUT" WHERE "ID" = ? FOR UPDATE`, [idWorkout]);
     const prioNueva = prioridadFuente(opts.aplicationType);
     const prioActual = esFilaNueva ? -1 : prioridadFuente(row === null || row === void 0 ? void 0 : row.tipoAplication);
@@ -210,6 +240,9 @@ const aplicarMerge = (q, idWorkout, opts, esFilaNueva) => __awaiter(void 0, void
     const zone = (0, paceZone_1.getZone)({ duration, distance, zones: cli });
     // POLYLINE: la primera fuente que la puso manda; nunca se pisa.
     const polyline = row && row.polyline ? row.polyline : getPolyline(opts.polyline);
+    // START AT: la primera fuente que lo puso manda; nunca se pisa (igual que
+    // POLYLINE). Es la clave del dedup cross-proveedor (solape de hora de inicio).
+    const startAt = row && row.startAt ? row.startAt : (_c = opts.startAt) !== null && _c !== void 0 ? _c : null;
     // TIPO/ID APLICATION: sólo se setean en INSERT o si la fila no tenía fuente;
     // nunca se reemplazan (la primera fuente se queda).
     let tipoFinal;
@@ -225,9 +258,9 @@ const aplicarMerge = (q, idWorkout, opts, esFilaNueva) => __awaiter(void 0, void
     const feelingsAsked = (0, moment_1.default)(opts.date).format('YYYY-MM-DD') !== (0, moment_1.default)().format('YYYY-MM-DD');
     yield q(`UPDATE "WORKOUT" SET
        "DISTANCE" = ?, "DURATION" = ?, "POTENCIA" = ?, "DESNIVEL" = ?, "CALORIES" = ?,
-       "FC MEDIA" = ?, "ZONE" = ?, "POLYLINE" = ?, "TIPO APLICATION" = ?, "ID APLICATION" = ?,
+       "FC MEDIA" = ?, "ZONE" = ?, "POLYLINE" = ?, "START AT" = ?, "TIPO APLICATION" = ?, "ID APLICATION" = ?,
        "FEELINGS ASKED" = ?, "DONE" = TRUE
-     WHERE "ID" = ?`, [distance, duration, potencia, desnivel, calories, fcMedia, zone, polyline, tipoFinal, idFinal, feelingsAsked, idWorkout]);
+     WHERE "ID" = ?`, [distance, duration, potencia, desnivel, calories, fcMedia, zone, polyline, startAt, tipoFinal, idFinal, feelingsAsked, idWorkout]);
     yield mergeStreams(q, idWorkout, opts.streams);
 });
 // =============================================================================
@@ -236,6 +269,7 @@ const aplicarMerge = (q, idWorkout, opts, esFilaNueva) => __awaiter(void 0, void
 /**
  * @param opts {{
  *   date, type, title, description, distance, duration, power, desnivel, polyline,
+ *   startAt,                // ISO/Date de inicio (UTC) — clave del dedup cross-proveedor
  *   idCliente, aplicationType, aplicationId,
  *   queryConditionExist?,   // LEGACY string SQL — deprecated, fallback
  *   tiposEquivalentes?,     // string[] de TYPEs equivalentes
@@ -259,6 +293,7 @@ _data) => __awaiter(void 0, void 0, void 0, function* () {
     // extra para clientes no-ES con doble proveedor, a cambio de no bloquear el lock.
     const translated = yield (0, titleDescriptionTranslated_1.getTitleDescriptionTranslated)(opts.idCliente, opts.title, opts.description);
     const idWorkout = yield withTx((q) => __awaiter(void 0, void 0, void 0, function* () {
+        var _d;
         // Lock anti-carrera: serializa ingestas del mismo cliente/día/bucket-tipo
         // (Strava-webhook y Garmin-push pueden entrar casi a la vez).
         yield q('SELECT pg_advisory_xact_lock(?)', [hashInt(`${opts.idCliente}|${dateStr}|${bucketTipo(opts.type)}`)]);
@@ -290,8 +325,8 @@ _data) => __awaiter(void 0, void 0, void 0, function* () {
         //    de abrir la tx (ver `translated` arriba) para no retener el advisory lock.
         const { title: titleNoTranslate, description: descriptionNoTranslate, titlePreferredLanguage, descriptionPreferredLanguage } = translated;
         const inserted = yield q(`INSERT INTO "WORKOUT"
-         ("ID CLIENTE", "DATE", "TITLE", "DESCRIPTION", "TITLE PREFERRED LANGUAGE", "DESCRIPTION PREFERRED LANGUAGE", "TYPE", "DONE", "SHOW CLIENT")
-       VALUES (?, ?, ?, ?, ?, ?, ?, TRUE, TRUE) RETURNING "ID"`, [opts.idCliente, dateStr, titleNoTranslate, descriptionNoTranslate, titlePreferredLanguage, descriptionPreferredLanguage, opts.type]);
+         ("ID CLIENTE", "DATE", "START AT", "TITLE", "DESCRIPTION", "TITLE PREFERRED LANGUAGE", "DESCRIPTION PREFERRED LANGUAGE", "TYPE", "DONE", "SHOW CLIENT")
+       VALUES (?, ?, ?, ?, ?, ?, ?, ?, TRUE, TRUE) RETURNING "ID"`, [opts.idCliente, dateStr, (_d = opts.startAt) !== null && _d !== void 0 ? _d : null, titleNoTranslate, descriptionNoTranslate, titlePreferredLanguage, descriptionPreferredLanguage, opts.type]);
         if (!inserted || !inserted[0])
             return null;
         const id = inserted[0].id;

package/package.json

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