Merge pull request #1083 from apedley/timezones-continued

Author: CodeWithCJ

AGENTS.md

@@ -145,7 +145,7 @@ pnpm test
 ### Date, Day Strings, and Timezones
 
 - Prefer the shared helpers in `shared/src/utils/timezone.ts`, exported through `@workspace/shared`, for day-string and timezone-aware date logic.
-- Use `isDayString`, `addDays`, `compareDays`, `dayToPickerDate`, and `pickerDateToDay` for `YYYY-MM-DD` calendar-day strings.
+- Use `isDayString`, `addDays`, `compareDays`, `dayToPickerDate`, and `localDateToDay` for `YYYY-MM-DD` calendar-day strings.
 - Use `todayInZone`, `instantToDay`, `instantHourMinute`, `dayToUtcRange`, and `dayRangeToUtcRange` when a user's timezone matters.
 - On the server, load the user's timezone with `SparkyFitnessServer/utils/timezoneLoader.js` before deriving "today", bucketing timestamps by day, or building day-based query ranges.
 - Avoid ad hoc UTC date extraction such as `toISOString().split('T')[0]` for user-facing or business-logic dates. That pattern silently shifts dates near timezone boundaries and is not a substitute for timezone-aware day handling.

SparkyFitnessMobile/CLAUDE.md

@@ -126,7 +126,7 @@ Monorepo package at `../shared/` providing Zod schemas, TypeScript types, consta
 - **Exercise/workout types**: `ExerciseSessionResponse` (discriminated union: `IndividualSessionResponse | PresetSessionResponse`), `ExerciseHistoryResponse`, `CreatePresetSessionRequest`, `ExerciseEntryResponse`, `ExerciseEntrySetResponse`, `ActivityDetailResponse`, `Pagination`
 - **API schemas**: `dailySummaryResponseSchema`/`DailySummaryResponse` (aggregates goals + food entries + exercise sessions + water intake), `dailyGoalsResponseSchema`, `foodEntryResponseSchema`, `exerciseSessionResponseSchema`
 - **Constants**: `MEASUREMENT_PRECISION`/`getPrecision()` for decimal formatting, `CALORIE_CALCULATION_CONSTANTS`/`ACTIVITY_MULTIPLIERS` for step/calorie math
-- **Timezone utilities** (`shared/src/utils/timezone.ts`): `isDayString`, `addDays`, `compareDays`, `dayToPickerDate`, `pickerDateToDay` for day-string operations; `isValidTimeZone`, `todayInZone`, `instantToDay`, `userHourMinute`, `instantHourMinute`, `dayToUtcRange`, `dayRangeToUtcRange` for timezone-aware conversions
+- **Timezone utilities** (`shared/src/utils/timezone.ts`): `isDayString`, `addDays`, `compareDays`, `dayToPickerDate`, `localDateToDay` for day-string operations; `isValidTimeZone`, `todayInZone`, `instantToDay`, `userHourMinute`, `instantHourMinute`, `dayToUtcRange`, `dayRangeToUtcRange` for timezone-aware conversions
 
 ### Workout & Exercise Architecture
 

SparkyFitnessServer/integrations/fitbit/fitbitDataProcessor.js

@@ -6,7 +6,7 @@ const exerciseRepository = require('../../models/exercise');
 const activityDetailsRepository = require('../../models/activityDetailsRepository');
 const sleepRepository = require('../../models/sleepRepository');
 const { log } = require('../../config/logging');
-const { todayInZone } = require('@workspace/shared');
+const { localDateToDay, todayInZone } = require('@workspace/shared');
 
 // Conversion factors for en-US to Metric
 const LBS_TO_KG = 0.453592;
@@ -236,7 +236,6 @@ async function processFitbitTemperature(
     let tempVariation = entry.value.nightlyRelative;
 
     if (tempVariation !== undefined) {
-      
       await upsertCustomMeasurementLogic(userId, createdByUserId, {
         categoryName: 'Skin Temperature Variation',
         value: tempVariation,
@@ -393,7 +392,6 @@ async function processFitbitCoreTemperature(
     let temp = entry.value;
 
     if (temp !== undefined) {
-      
       await upsertCustomMeasurementLogic(userId, createdByUserId, {
         categoryName: 'Core Temperature',
         value: temp,
@@ -602,7 +600,7 @@ async function processFitbitActivities(
     }
 
     let distanceKm = activity.distance;
-    
+
     const entryData = {
       exercise_id: exercise.id,
       entry_date: entryDate,
@@ -663,7 +661,7 @@ async function processFitbitActivities(
         let dateKey = m.entry_date;
         // Handle different possible types for entry_date (Date object or string)
         if (dateKey instanceof Date) {
-          dateKey = dateKey.toISOString().split('T')[0];
+          dateKey = localDateToDay(dateKey);
         } else if (typeof dateKey === 'string' && dateKey.includes('T')) {
           dateKey = dateKey.split('T')[0];
         }

SparkyFitnessServer/models/exerciseTemplate.js

@@ -3,7 +3,12 @@ const format = require('pg-format');
 const { log } = require('../config/logging');
 const workoutPresetRepository = require('./workoutPresetRepository');
 const { getExerciseById } = require('./exercise');
-const { addDays, compareDays, dayOfWeek } = require('@workspace/shared');
+const {
+  addDays,
+  compareDays,
+  dayOfWeek,
+  localDateToDay,
+} = require('@workspace/shared');
 
 async function createExerciseEntriesFromTemplate(templateId, userId, today) {
   log(
@@ -66,12 +71,12 @@ async function createExerciseEntriesFromTemplate(templateId, userId, today) {
     const startDay =
       typeof template.start_date === 'string'
         ? template.start_date.slice(0, 10)
-        : template.start_date.toISOString().slice(0, 10);
+        : localDateToDay(template.start_date);
     // If end_date is not provided, default to one year from start_date
     const endDay = template.end_date
       ? typeof template.end_date === 'string'
         ? template.end_date.slice(0, 10)
-        : template.end_date.toISOString().slice(0, 10)
+        : localDateToDay(template.end_date)
       : addDays(startDay, 365);
 
     log(

SparkyFitnessServer/models/foodTemplate.js

@@ -3,7 +3,12 @@ const { log } = require('../config/logging');
 const format = require('pg-format');
 const foodEntryDb = require('./foodEntry');
 const foodEntryMealRepository = require('./foodEntryMealRepository');
-const { addDays, compareDays, dayOfWeek } = require('@workspace/shared');
+const {
+  addDays,
+  compareDays,
+  dayOfWeek,
+  localDateToDay,
+} = require('@workspace/shared');
 
 async function deleteFoodEntriesByMealPlanId(mealPlanId, userId) {
   const client = await getClient(userId); // User-specific operation
@@ -128,12 +133,12 @@ async function createFoodEntriesFromTemplate(templateId, userId, today) {
     const startDay =
       typeof start_date === 'string'
         ? start_date.slice(0, 10)
-        : start_date.toISOString().slice(0, 10);
+        : localDateToDay(start_date);
     // If end_date is not provided, default to one year from start_date
     const endDay = end_date
       ? typeof end_date === 'string'
         ? end_date.slice(0, 10)
-        : end_date.toISOString().slice(0, 10)
+        : localDateToDay(end_date)
       : addDays(startDay, 365);
 
     // Start from today if template start_date is in the past
@@ -224,7 +229,7 @@ async function createFoodEntriesFromTemplate(templateId, userId, today) {
       const dateStr =
         typeof entry.entry_date === 'string'
           ? entry.entry_date.slice(0, 10)
-          : entry.entry_date.toISOString().slice(0, 10);
+          : localDateToDay(entry.entry_date);
       const key = `${entry.food_id || entry.meal_id}-${entry.meal_type_id}-${dateStr}-${entry.variant_id}`;
       existingFoodEntries.add(key);
     });

SparkyFitnessServer/services/exerciseEntryHistoryService.ts

@@ -1,4 +1,5 @@
 import {
+  localDateToDay,
   presetSessionResponseSchema,
   type PresetSessionResponse,
   type ActivityDetailResponse,
@@ -14,7 +15,7 @@ const { log } = require('../config/logging');
 /** Convert a pg date value to a YYYY-MM-DD string, or return null. */
 function _dateToString(value: unknown): string | null {
   if (value == null) return null;
-  if (value instanceof Date) return value.toISOString().split('T')[0];
+  if (value instanceof Date) return localDateToDay(value);
   return String(value);
 }
 

SparkyFitnessServer/services/reportService.js

@@ -432,9 +432,8 @@ function calculateMuscleGroupRecovery(exerciseEntries) {
       ? JSON.parse(entry.exercises.primary_muscles || '[]')
       : [];
     muscles.forEach((muscle) => {
-      const entryDate = new Date(entry.entry_date);
-      if (!recoveryData[muscle] || entryDate > new Date(recoveryData[muscle])) {
-        recoveryData[muscle] = entryDate.toISOString().split('T')[0];
+      if (!recoveryData[muscle] || entry.entry_date > recoveryData[muscle]) {
+        recoveryData[muscle] = entry.entry_date;
       }
     });
   });
@@ -501,7 +500,7 @@ function calculatePrProgression(exerciseEntries) {
           reps > lastPr.maxReps
         ) {
           progression[entry.exercise_name].push({
-            date: new Date(entry.entry_date).toISOString().split('T')[0],
+            date: entry.entry_date,
             oneRM: oneRM,
             maxWeight: weight,
             maxReps: reps,
@@ -593,7 +592,7 @@ async function getExerciseDashboardData(
     const muscleGroupVolume = {}; // Stores total volume per muscle group
 
     exerciseEntries.forEach((entry) => {
-      totalWorkouts.add(new Date(entry.entry_date).toISOString().split('T')[0]); // Add unique dates
+      totalWorkouts.add(entry.entry_date); // Add unique dates
 
       if (entry.sets && entry.sets.length > 0) {
         entry.sets.forEach((set) => {
@@ -613,7 +612,7 @@ async function getExerciseDashboardData(
           ) {
             prData[entry.exercise_name] = {
               oneRM,
-              date: new Date(entry.entry_date).toISOString().split('T')[0],
+              date: entry.entry_date,
               weight,
               reps,
             };
@@ -632,7 +631,7 @@ async function getExerciseDashboardData(
               bestSetRepRange[entry.exercise_name][repRange] = {
                 weight,
                 reps,
-                date: new Date(entry.entry_date).toISOString().split('T')[0],
+                date: entry.entry_date,
               };
             }
           }

SparkyFitnessServer/services/sleepScienceService.js

@@ -4,6 +4,7 @@ const { loadUserTimezone } = require('../utils/timezoneLoader');
 const {
   instantHourMinute,
   dayOfWeek,
+  localDateToDay,
   userHourMinute,
 } = require('@workspace/shared');
 
@@ -184,9 +185,7 @@ function classifyDaysAutomatically(history, timezone = 'UTC') {
     if (wakeHour === null) continue;
 
     const dateStr =
-      typeof entry.date === 'string'
-        ? entry.date
-        : entry.date.toISOString().slice(0, 10);
+      typeof entry.date === 'string' ? entry.date : localDateToDay(entry.date);
     const dow = dayOfWeek(dateStr);
 
     if (!dayBuckets.has(dow)) dayBuckets.set(dow, []);
@@ -251,9 +250,7 @@ async function calculateBaseline(userId, windowDays = 90, timezone = 'UTC') {
     if (tst === null || tst < 3 || tst > 14) continue;
 
     const dateStr =
-      typeof entry.date === 'string'
-        ? entry.date
-        : entry.date.toISOString().slice(0, 10);
+      typeof entry.date === 'string' ? entry.date : localDateToDay(entry.date);
     const dow = dayOfWeek(dateStr);
     const dayType = dayClassification.get(dow) || 'workday';
 
@@ -360,9 +357,7 @@ async function calculateBaseline(userId, windowDays = 90, timezone = 'UTC') {
 
   // Determine data range
   const dates = history
-    .map((e) =>
-      typeof e.date === 'string' ? e.date : e.date.toISOString().slice(0, 10)
-    )
+    .map((e) => (typeof e.date === 'string' ? e.date : localDateToDay(e.date)))
     .sort();
   const dataStartDate = dates[0] || null;
   const dataEndDate = dates[dates.length - 1] || null;
@@ -446,9 +441,7 @@ function getDayOfWeekStats(history, classification, timezone = 'UTC') {
     if (wakeHour === null) continue;
 
     const dateStr =
-      typeof entry.date === 'string'
-        ? entry.date
-        : entry.date.toISOString().slice(0, 10);
+      typeof entry.date === 'string' ? entry.date : localDateToDay(entry.date);
     const dow = dayOfWeek(dateStr);
 
     if (!buckets.has(dow)) buckets.set(dow, []);
@@ -862,9 +855,7 @@ async function checkDataSufficiency(userId) {
   let freedayCount = 0;
   for (const entry of entriesWithTimestamps) {
     const dateStr =
-      typeof entry.date === 'string'
-        ? entry.date
-        : entry.date.toISOString().slice(0, 10);
+      typeof entry.date === 'string' ? entry.date : localDateToDay(entry.date);
     const dow = dayOfWeek(dateStr);
     if (dow === 0 || dow === 6) {
       freedayCount++;