fix(1158): garmin activity sync fail

Author: Sim-sat

SparkyFitnessServer/models/exerciseEntry.ts

@@ -267,12 +267,22 @@ async function _updateExerciseEntryWithClient(
         : currentEntry.distance,
     avg_heart_rate:
       updateData.avg_heart_rate !== undefined
-        ? updateData.avg_heart_rate
+        ? updateData.avg_heart_rate != null
+          ? Math.round(updateData.avg_heart_rate)
+          : null
         : currentEntry.avg_heart_rate,
     sort_order:
       updateData.sort_order !== undefined
-        ? updateData.sort_order
+        ? updateData.sort_order != null
+          ? Math.round(updateData.sort_order)
+          : 0
         : currentEntry.sort_order,
+    steps:
+      updateData.steps !== undefined
+        ? updateData.steps != null
+          ? Math.round(updateData.steps)
+          : null
+        : currentEntry.steps,
     // Snapshot fields - these should ideally come from the exercise itself if exercise_id is updated
     exercise_name: updateData.exercise_name || currentEntry.exercise_name,
     calories_per_hour:
@@ -526,10 +536,12 @@ async function _createExerciseEntryWithClient(
           snapshot.instructions,
           snapshot.images,
           entryData.distance || null, // Ensure distance is not undefined
-          entryData.avg_heart_rate || null, // Ensure avg_heart_rate is not undefined
+          entryData.avg_heart_rate != null
+            ? Math.round(entryData.avg_heart_rate)
+            : null, // Ensure avg_heart_rate is an integer
           exercisePresetEntryId, // New parameter
-          entryData.sort_order || 0,
-          entryData.steps || null,
+          entryData.sort_order != null ? Math.round(entryData.sort_order) : 0,
+          entryData.steps != null ? Math.round(entryData.steps) : null,
         ]
       );
       newEntryId = entryResult.rows[0].id;
@@ -646,10 +658,11 @@ async function updateExerciseEntry(
         distance = COALESCE($8, distance),
         avg_heart_rate = COALESCE($9, avg_heart_rate),
         sort_order = COALESCE($10, sort_order),
-        exercise_name = COALESCE($11, exercise_name),
-        updated_by_user_id = $12,
+        steps = COALESCE($11, steps),
+        exercise_name = COALESCE($12, exercise_name),
+        updated_by_user_id = $13,
         updated_at = now()
-      WHERE id = $13 AND user_id = $14
+      WHERE id = $14 AND user_id = $15
       RETURNING id`,
       [
         updateData.exercise_id,
@@ -660,8 +673,13 @@ async function updateExerciseEntry(
         updateData.workout_plan_assignment_id || null,
         updateData.image_url || null,
         updateData.distance || null,
-        updateData.avg_heart_rate || null,
-        updateData.sort_order !== undefined ? updateData.sort_order : null,
+        updateData.avg_heart_rate != null
+          ? Math.round(updateData.avg_heart_rate)
+          : null,
+        updateData.sort_order != null
+          ? Math.round(updateData.sort_order)
+          : null,
+        updateData.steps != null ? Math.round(updateData.steps) : null,
         updateData.exercise_name || null,
         actingUserId,
         id,

SparkyFitnessServer/services/garminService.ts

@@ -515,7 +515,9 @@ async function processGarminWorkoutSession(
         source_id: activity.activityId
           ? `${activity.activityId}_${exerciseSortOrder}`
           : null,
-        steps: activity.steps || activity.totalSteps || activity.stepCount || 0,
+        steps: Math.round(
+          activity.steps || activity.totalSteps || activity.stepCount || 0
+        ),
       };
       await exerciseEntryRepository.createExerciseEntry(
         userId,
@@ -659,14 +661,20 @@ async function processGarminSimpleActivity(
   const exerciseEntryData = {
     exercise_id: exercise.id,
     duration_minutes: activity.duration || 0,
-    calories_burned: activity.active_calories || 0,
+    calories_burned: Math.round(activity.active_calories || 0),
     entry_date: entryDate,
     notes: `Garmin Activity: ${activity.activityName} (${activity.activityType?.typeKey})`,
     distance: activity.distance,
     avg_heart_rate:
-      activity.averageHR || activity.averageHeartRateInBeatsPerMinute || null,
+      activity.averageHR || activity.averageHeartRateInBeatsPerMinute
+        ? Math.round(
+            activity.averageHR || activity.averageHeartRateInBeatsPerMinute
+          )
+        : null,
     source_id: activity.activityId?.toString() ?? null,
-    steps: activity.steps || activity.totalSteps || activity.stepCount || 0,
+    steps: Math.round(
+      activity.steps || activity.totalSteps || activity.stepCount || 0
+    ),
   };
   const newEntry = await exerciseEntryRepository.createExerciseEntry(
     userId,