Unit tests now all pass again, fix date parity by adding in datetime formatting to ensure consistency between python and typescript

mphuff · mphuff · commit 47239e922a04 · 2025-08-31T14:20:10.000-07:00
diff --git a/integration_test/typescript/integration-test-typescript.ts b/integration_test/typescript/integration-test-typescript.ts
@@ -7,6 +7,7 @@
 import { writeFileSync, readFileSync, existsSync } from 'fs';
 import { join } from 'path';
 import { Otf } from '../../src/otf';
+import { formatDateToPythonISO } from '../../src/utils/datetime';
 
 function loadEnvFile(): void {
   /**
@@ -104,7 +105,7 @@ async function runTypeScriptIntegrationTests(): Promise<IntegrationTestResults |
   console.log(`🔷 Running TypeScript integration tests for ${email}`);
   
   const results: IntegrationTestResults = {
-    timestamp: new Date().toISOString(),
+    timestamp: formatDateToPythonISO(new Date()),
     typescript_version: process.version,
     otf_api_ts_version: '1.0.0',  // Current version
     tests: {},
diff --git a/src/api/bookings.ts b/src/api/bookings.ts
@@ -1,4 +1,5 @@
 import { components } from '../generated/types';
+import { formatDateToPythonISO, formatDateForPythonParity, safeDateFormat } from '../utils/datetime';
 
 type BookingV2Base = components['schemas']['BookingV2'];
 type BookingStatus = components['schemas']['BookingStatus'];
@@ -102,11 +103,6 @@ export class BookingsApi {
    * Python: "2025-07-29T12:00:00+00:00" 
    * JavaScript default: "2025-07-29T12:00:00.000Z"
    */
-  private formatDateToPythonISO(date: Date): string {
-    // Get ISO string and convert Z format to +00:00 format
-    // Remove milliseconds (.000) and replace Z with +00:00
-    return date.toISOString().replace(/\.\d{3}Z$/, '+00:00');
-  }
 
   /**
    * Formats coach name consistently, handling undefined/null fields
@@ -168,8 +164,8 @@ export class BookingsApi {
       apiType: 'performance',
       path: '/v1/bookings/me',
       params: {
-        'starts_after': startDate.toISOString(),
-        'ends_before': endDate.toISOString(),
+        'starts_after': formatDateToPythonISO(startDate),
+        'ends_before': formatDateToPythonISO(endDate),
         'include_canceled': (!excludeCancelled).toString(),
         'expand': 'false',
       },
@@ -235,7 +231,7 @@ export class BookingsApi {
         } : null,
         class_id: data.class?.id || null,
         class_type: data.class?.type || {}, // Empty object to match Python behavior
-        starts_at_utc: data.class?.starts_at ? this.formatDateToPythonISO(new Date(data.class.starts_at)) : null,
+        starts_at_utc: data.class?.starts_at ? formatDateToPythonISO(new Date(data.class.starts_at)) : null,
       },
       
       // Workout - should now be included with correct API parameters
diff --git a/src/api/members.ts b/src/api/members.ts
@@ -3,6 +3,7 @@ import { components } from '../generated/types';
 type MemberDetail = components['schemas']['MemberDetail'];
 import { OtfHttpClient } from '../client/http-client';
 import { API_ENDPOINTS } from '../types/config';
+import { safeDateFormat } from '../utils/datetime';
 
 /**
  * API for member profile and membership operations
@@ -113,9 +114,9 @@ export class MembersApi {
         total_ot_live_classes_attended: data.memberClassSummary.totalOTLiveClassesAttended || null,
         total_classes_used_hrm: data.memberClassSummary.totalClassesUsedHRM || null,
         total_studios_visited: data.memberClassSummary.totalStudiosVisited || null,
-        first_visit_date: data.memberClassSummary.firstVisitDate || null,
-        last_class_visited_date: data.memberClassSummary.lastClassVisitedDate || null,
-        last_class_booked_date: data.memberClassSummary.lastClassBookedDate || null,
+        first_visit_date: safeDateFormat(data.memberClassSummary.firstVisitDate, 'first_visit_date'),
+        last_class_visited_date: safeDateFormat(data.memberClassSummary.lastClassVisitedDate, 'last_class_visited_date'),
+        last_class_booked_date: safeDateFormat(data.memberClassSummary.lastClassBookedDate, 'last_class_booked_date'),
         last_class_studio_visited: null,
       } : null,
       
diff --git a/src/api/workouts.ts b/src/api/workouts.ts
@@ -2,6 +2,7 @@ import { OtfHttpClient } from '../client/http-client';
 import { StatsTime, EquipmentType, ChallengeCategory } from '../types/workout-enums';
 import { components } from '../generated/types';
 import { BodyCompositionData } from '../models/body-composition';
+import { formatDateToPythonISO, formatDateForPythonParity, safeDateFormat } from '../utils/datetime';
 
 type Workout = components['schemas']['Workout'];
 type BookingV2 = components['schemas']['BookingV2'];
@@ -171,8 +172,8 @@ export class WorkoutsApi {
   private filterEquipmentData(equipmentData: any): any {
     if (!equipmentData) return equipmentData;
     
-    // Create a deep copy to avoid mutation
-    const filtered = JSON.parse(JSON.stringify(equipmentData));
+    // Create a deep copy to avoid mutation without converting dates
+    const filtered = this.deepCopyPreservingDates(equipmentData);
     
     // Remove max_power to match Python structure
     delete filtered.max_power;
@@ -185,14 +186,18 @@ export class WorkoutsApi {
   }
 
   /**
-   * Formats date to match Python's ISO format exactly
-   * Python: "2025-07-29T12:00:00+00:00" 
-   * JavaScript default: "2025-07-29T12:00:00.000Z"
+   * Deep copy that preserves date strings without converting them back to .000Z format
    */
-  private formatDateToPythonISO(date: Date): string {
-    // Get ISO string and convert Z format to +00:00 format
-    // Remove milliseconds (.000) and replace Z with +00:00
-    return date.toISOString().replace(/\.\d{3}Z$/, '+00:00');
+  private deepCopyPreservingDates(obj: any): any {
+    if (obj === null || typeof obj !== 'object') return obj;
+    if (obj instanceof Date) return obj; // Keep Date objects as is
+    if (Array.isArray(obj)) return obj.map(item => this.deepCopyPreservingDates(item));
+    
+    const result: any = {};
+    for (const [key, value] of Object.entries(obj)) {
+      result[key] = this.deepCopyPreservingDates(value);
+    }
+    return result;
   }
 
   /**
@@ -483,7 +488,7 @@ export class WorkoutsApi {
     // Python returns: { class_history_uuid, class_start_time, max_hr, member_uuid, performance_summary_id, window_size, zones, telemetry: [...] }
     return {
       class_history_uuid: response.classHistoryUuid || performanceSummaryId,
-      class_start_time: response.classStartTime || null,
+      class_start_time: response.classStartTime ? formatDateToPythonISO(new Date(response.classStartTime)) : null,
       max_hr: response.maxHr || 0,
       member_uuid: response.memberUuid || this.memberUuid,
       performance_summary_id: response.classHistoryUuid || performanceSummaryId,
@@ -506,8 +511,8 @@ export class WorkoutsApi {
       apiType: 'default',
       path: `/member/members/${this.memberUuid}/out-of-studio-workout`,
       params: {
-        startDate: startDate.toISOString(),
-        endDate: endDate.toISOString(),
+        startDate: formatDateToPythonISO(startDate),
+        endDate: formatDateToPythonISO(endDate),
       },
     });
 
@@ -893,7 +898,7 @@ export class WorkoutsApi {
       
       const enhancedItem = { ...item };
       const absoluteTime = new Date(classStart.getTime() + (item.relative_timestamp * 1000)); // Convert seconds to milliseconds
-      enhancedItem.timestamp = this.formatDateToPythonISO(absoluteTime);
+      enhancedItem.timestamp = formatDateToPythonISO(absoluteTime);
       
       return enhancedItem;
     });
@@ -904,7 +909,7 @@ export class WorkoutsApi {
       // Return the complete telemetry object structure to match Python
       return {
         class_history_uuid: telemetry.classHistoryUuid,
-        class_start_time: telemetry.classStartTime,
+        class_start_time: telemetry.classStartTime ? formatDateToPythonISO(new Date(telemetry.classStartTime)) : null,
         max_hr: telemetry.maxHr,
         member_uuid: telemetry.memberUuid,
         performance_summary_id: telemetry.classHistoryUuid, // Same as class_history_uuid
@@ -930,18 +935,18 @@ export class WorkoutsApi {
     // Match Python logic exactly
     switch (classType) {
       case 'ORANGE_60':
-        return this.formatDateToPythonISO(new Date(start.getTime() + (60 * 60 * 1000))); // 60 minutes
+        return formatDateToPythonISO(new Date(start.getTime() + (60 * 60 * 1000))); // 60 minutes
       case 'ORANGE_90':
-        return this.formatDateToPythonISO(new Date(start.getTime() + (90 * 60 * 1000))); // 90 minutes
+        return formatDateToPythonISO(new Date(start.getTime() + (90 * 60 * 1000))); // 90 minutes
       case 'STRENGTH_50':
       case 'TREAD_50':
-        return this.formatDateToPythonISO(new Date(start.getTime() + (50 * 60 * 1000))); // 50 minutes
+        return formatDateToPythonISO(new Date(start.getTime() + (50 * 60 * 1000))); // 50 minutes
       case 'OTHER':
         console.warn(`Class type ${classType} does not have defined length, returning start time plus 60 minutes`);
-        return this.formatDateToPythonISO(new Date(start.getTime() + (60 * 60 * 1000))); // Default 60 minutes
+        return formatDateToPythonISO(new Date(start.getTime() + (60 * 60 * 1000))); // Default 60 minutes
       default:
         console.warn(`Class type ${classType} is not recognized, returning start time plus 60 minutes`);
-        return this.formatDateToPythonISO(new Date(start.getTime() + (60 * 60 * 1000))); // Default 60 minutes
+        return formatDateToPythonISO(new Date(start.getTime() + (60 * 60 * 1000))); // Default 60 minutes
     }
   }
 
diff --git a/src/models/body-composition.ts b/src/models/body-composition.ts
@@ -10,6 +10,8 @@
  * Matches Python implementation in body_composition_list.py exactly
  */
 
+import { formatDateToLocal } from '../utils/datetime';
+
 // Constants matching Python defaults
 export const DEFAULT_WEIGHT_DIVIDERS = [55.0, 70.0, 85.0, 100.0, 115.0, 130.0, 145.0, 160.0, 175.0, 190.0, 205.0];
 export const DEFAULT_SKELETAL_MUSCLE_MASS_DIVIDERS = [70.0, 80.0, 90.0, 100.0, 110.0, 120.0, 130.0, 140.0, 150.0, 160.0, 170.0];
@@ -50,17 +52,6 @@ export function convertKgToLbs(weightKg: number): number {
  * Python: "2024-11-16T07:13:35" (no timezone, no milliseconds)
  * JavaScript default: "2024-11-16T15:13:35.000Z" (UTC with milliseconds)
  */
-function formatDateTimeToLocal(date: Date): string {
-  // Format as local time without timezone suffix to match Python
-  const year = date.getFullYear();
-  const month = String(date.getMonth() + 1).padStart(2, '0');
-  const day = String(date.getDate()).padStart(2, '0');
-  const hours = String(date.getHours()).padStart(2, '0');
-  const minutes = String(date.getMinutes()).padStart(2, '0');
-  const seconds = String(date.getSeconds()).padStart(2, '0');
-  
-  return `${year}-${month}-${day}T${hours}:${minutes}:${seconds}`;
-}
 
 /**
  * Calculate body fat mass control value to match Python implementation
@@ -344,7 +335,7 @@ export class BodyCompositionData {
     this.height = data.height;
     this.gender = data.gender;
     this.age = parseFloat(data.age) || 0; // Convert string to number to match Python
-    this.scan_datetime = formatDateTimeToLocal(new Date(data.testDatetime));
+    this.scan_datetime = formatDateToLocal(new Date(data.testDatetime));
     this.provided_weight = data.weight;
     
     // Apply critical business logic: convert kg to lbs
diff --git a/src/utils/datetime.ts b/src/utils/datetime.ts
@@ -0,0 +1,95 @@
+/**
+ * Centralized datetime formatting utilities to ensure 100% Python parity
+ * 
+ * Python uses two main datetime formats:
+ * 1. WITH TIMEZONE: 2025-07-29T12:00:26+00:00 (ISO with +00:00 format)
+ * 2. WITHOUT TIMEZONE: 2024-11-16T07:13:35 (local format, no timezone)
+ */
+
+/**
+ * Formats date to match Python's ISO format exactly
+ * Python: "2025-07-29T12:00:00+00:00" 
+ * JavaScript default: "2025-07-29T12:00:00.000Z"
+ * 
+ * Use for: class_start_time, starts_at_utc, timestamp, created_at, updated_at
+ */
+export function formatDateToPythonISO(date: Date): string {
+  // Get ISO string and convert Z format to +00:00 format
+  // Remove milliseconds (.000) and replace Z with +00:00
+  return date.toISOString().replace(/\.\d{3}Z$/, '+00:00');
+}
+
+/**
+ * Formats date to Python's local format (no timezone)
+ * Python: "2024-11-16T07:13:35"
+ * 
+ * Use for: scan_datetime, starts_at (local), open_date, end, start
+ */
+export function formatDateToLocal(date: Date): string {
+  const year = date.getFullYear();
+  const month = String(date.getMonth() + 1).padStart(2, '0');
+  const day = String(date.getDate()).padStart(2, '0');
+  const hours = String(date.getHours()).padStart(2, '0');
+  const minutes = String(date.getMinutes()).padStart(2, '0');
+  const seconds = String(date.getSeconds()).padStart(2, '0');
+  
+  return `${year}-${month}-${day}T${hours}:${minutes}:${seconds}`;
+}
+
+/**
+ * Auto-detects and formats date based on field name to match Python patterns
+ * 
+ * @param date Date object to format
+ * @param fieldName Field name to determine format (e.g., 'scan_datetime', 'class_start_time')
+ * @returns Formatted date string matching Python format
+ */
+export function formatDateForPythonParity(date: Date, fieldName: string): string {
+  // Fields that use local format (no timezone)
+  const localFormatFields = [
+    'scan_datetime',
+    'starts_at', // local class start time
+    'open_date',
+    're_open_date',
+    'end',
+    'start'
+  ];
+  
+  if (localFormatFields.includes(fieldName)) {
+    return formatDateToLocal(date);
+  }
+  
+  // Default to ISO format with +00:00 timezone for all other datetime fields
+  return formatDateToPythonISO(date);
+}
+
+/**
+ * Safely parses date string/object and formats for Python parity
+ * 
+ * @param dateValue Date string, Date object, or null/undefined
+ * @param fieldName Field name for format detection
+ * @returns Formatted date string or null
+ */
+export function safeDateFormat(dateValue: string | Date | null | undefined, fieldName: string): string | null {
+  if (!dateValue) return null;
+  
+  try {
+    const date = typeof dateValue === 'string' ? new Date(dateValue) : dateValue;
+    
+    if (isNaN(date.getTime())) {
+      return null;
+    }
+    
+    return formatDateForPythonParity(date, fieldName);
+  } catch (error) {
+    console.warn(`Failed to format date for field ${fieldName}:`, error);
+    return null;
+  }
+}
+
+/**
+ * Legacy function maintained for backward compatibility
+ * @deprecated Use formatDateToPythonISO instead
+ */
+export function formatDateTimeToLocal(date: Date): string {
+  return formatDateToLocal(date);
+}
diff --git a/test/api/bookings.test.ts b/test/api/bookings.test.ts
@@ -21,6 +21,7 @@ describe('BookingsApi', () => {
         checked_in: true,
         canceled: false,
         ratable: true,
+        status: 'Booked',
         class: {
           classUuid: 'test-class-uuid',
           name: 'Orange 60 3G',
@@ -77,7 +78,7 @@ describe('BookingsApi', () => {
             mbo_studio_id: null,
           },
           class_id: null,
-          class_type: null,
+          class_type: {},
           starts_at_utc: null,
         },
         workout: {
@@ -96,6 +97,7 @@ describe('BookingsApi', () => {
         mbo_paying_unique_id: null,
         created_at: null,
         updated_at: null,
+        status: 'Booked',
       });
 
       expect(mockClient.workoutRequest).toHaveBeenCalledWith({
diff --git a/test/api/workouts.test.ts b/test/api/workouts.test.ts
diff --git a/test/models/body-composition.test.ts b/test/models/body-composition.test.ts
