From 3a3312ec91a2187846b7c9373ae4fb0eb20c9532 Mon Sep 17 00:00:00 2001 From: gioelecerati Date: Fri, 20 Oct 2023 16:50:32 +0200 Subject: [PATCH 1/2] tracking: do not update lastSeen if token is not found --- packages/api/src/middleware/tracking.ts | 29 ++++++++++++++----------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/packages/api/src/middleware/tracking.ts b/packages/api/src/middleware/tracking.ts index 7b192ceb49..96ca0da4a5 100644 --- a/packages/api/src/middleware/tracking.ts +++ b/packages/api/src/middleware/tracking.ts @@ -44,19 +44,22 @@ class Tracker { if (!id) { return; } - try { - await table.update( - [ - sql`id = ${id}`, - sql`coalesce((data->'lastSeen')::bigint, 0) < ${lastSeen}`, - ], - { lastSeen } - ); - } catch (err) { - console.log( - `error saving last seen: table=${table?.name} id=${id} err=`, - err - ); + let apiToken = await db.apiToken.get(id); + if (apiToken) { + try { + await table.update( + [ + sql`id = ${id}`, + sql`coalesce((data->'lastSeen')::bigint, 0) < ${lastSeen}`, + ], + { lastSeen } + ); + } catch (err) { + console.log( + `error saving last seen: table=${table?.name} id=${id} err=`, + err + ); + } } } From f49d27ca07e3f34cba15949f122e4df1d25a1d82 Mon Sep 17 00:00:00 2001 From: gioelecerati Date: Fri, 20 Oct 2023 16:55:09 +0200 Subject: [PATCH 2/2] single line --- packages/api/src/middleware/tracking.ts | 26 ++++++++++--------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/packages/api/src/middleware/tracking.ts b/packages/api/src/middleware/tracking.ts index 96ca0da4a5..d5fee64600 100644 --- a/packages/api/src/middleware/tracking.ts +++ b/packages/api/src/middleware/tracking.ts @@ -44,22 +44,16 @@ class Tracker { if (!id) { return; } - let apiToken = await db.apiToken.get(id); - if (apiToken) { - try { - await table.update( - [ - sql`id = ${id}`, - sql`coalesce((data->'lastSeen')::bigint, 0) < ${lastSeen}`, - ], - { lastSeen } - ); - } catch (err) { - console.log( - `error saving last seen: table=${table?.name} id=${id} err=`, - err - ); - } + try { + await table.update( + [ + sql`id = ${id}`, + sql`coalesce((data->'lastSeen')::bigint, 0) < ${lastSeen}`, + ], + { lastSeen } + ); + } catch (err) { + console.log(`error saving last seen: table=${table?.name} id=${id}`); } }