fix: correct ConditionType IDs and update all workout enums (issue #370)

ConditionType was wrong: DISTANCE=1 (should be 3), HEART_RATE=3 (should
be 6), POWER=6 (should be 5), and CADENCE=5 (not a valid end condition).
Authoritative values sourced from /workout-service/workout/types endpoint.

- ConditionType: LAP_BUTTON=1, TIME=2, DISTANCE=3, CALORIES=4, POWER=5,
  HEART_RATE=6, ITERATIONS=7 + add FIXED_REST=8, FIXED_REPETITION=9, REPS=10
- SportType: fix SWIMMING=4, OTHER=3, MULTI_SPORT=10; add STRENGTH_TRAINING,
  CARDIO_TRAINING, YOGA, PILATES, HIIT, MOBILITY; remove incorrect aliases
- TargetType: rename to POWER_ZONE, HEART_RATE_ZONE, SPEED_ZONE, PACE_ZONE;
  add GRADE=7, HEART_RATE_LAP=8, POWER_LAP=9, RESISTANCE=15
- StepType: add OTHER=7, MAIN=8
- Update test_workout_constants.py to pin the corrected values

Author: cyberjunky

garminconnect/workout.py

@@ -25,55 +25,67 @@ def Field(*_args: Any, **_kwargs: Any) -> Any:  # type: ignore[misc]
             return None
 
 
-# Sport Type IDs (common values)
+# Sport Type IDs — from /workout-service/workout/types
 class SportType:
-    """Common Garmin sport type IDs."""
+    """Garmin workout sport type IDs."""
 
     RUNNING = 1
     CYCLING = 2
-    SWIMMING = 3
-    WALKING = 4
-    MULTI_SPORT = 5
-    FITNESS_EQUIPMENT = 6
-    HIKING = 7
-    OTHER = 8
-
-
-# Step Type IDs
+    OTHER = 3
+    SWIMMING = 4
+    STRENGTH_TRAINING = 5
+    CARDIO_TRAINING = 6
+    YOGA = 7
+    PILATES = 8
+    HIIT = 9
+    MULTI_SPORT = 10
+    MOBILITY = 11
+
+
+# Step Type IDs — from /workout-service/workout/types
 class StepType:
-    """Common Garmin workout step type IDs."""
+    """Garmin workout step type IDs."""
 
     WARMUP = 1
     COOLDOWN = 2
     INTERVAL = 3
     RECOVERY = 4
     REST = 5
     REPEAT = 6
+    OTHER = 7
+    MAIN = 8
 
 
-# Condition Type IDs
+# Condition Type IDs — from /workout-service/workout/types
 class ConditionType:
-    """Common Garmin end condition type IDs."""
+    """Garmin end condition type IDs."""
 
-    DISTANCE = 1
+    LAP_BUTTON = 1
     TIME = 2
-    HEART_RATE = 3
+    DISTANCE = 3
     CALORIES = 4
-    CADENCE = 5
-    POWER = 6
+    POWER = 5
+    HEART_RATE = 6
     ITERATIONS = 7
+    FIXED_REST = 8
+    FIXED_REPETITION = 9
+    REPS = 10
 
 
-# Target Type IDs
+# Target Type IDs — from /workout-service/workout/types
 class TargetType:
-    """Common Garmin workout target type IDs."""
+    """Garmin workout target type IDs."""
 
     NO_TARGET = 1
-    POWER = 2  # power.zone
-    CADENCE = 3  # cadence
-    HEART_RATE = 4  # heart.rate.zone
-    SPEED = 5  # speed.zone
-    OPEN = 6  # open
+    POWER_ZONE = 2
+    CADENCE = 3
+    HEART_RATE_ZONE = 4
+    SPEED_ZONE = 5
+    PACE_ZONE = 6
+    GRADE = 7
+    HEART_RATE_LAP = 8
+    POWER_LAP = 9
+    RESISTANCE = 15
 
 
 class SportTypeModel(BaseModel):
@@ -208,9 +220,7 @@ class SwimmingWorkout(BaseWorkout):
 
     sportType: dict[str, Any] = Field(
         default_factory=lambda: {
-            # Garmin workout-service expects swimming sportTypeId=4.
-            # Using 3 gets normalized to sportTypeKey="other" on upload.
-            "sportTypeId": 4,
+            "sportTypeId": SportType.SWIMMING,
             "sportTypeKey": "swimming",
             "displayOrder": 3,
         }
@@ -222,9 +232,9 @@ class WalkingWorkout(BaseWorkout):
 
     sportType: dict[str, Any] = Field(
         default_factory=lambda: {
-            "sportTypeId": SportType.WALKING,
+            "sportTypeId": 17,
             "sportTypeKey": "walking",
-            "displayOrder": 4,
+            "displayOrder": 17,
         }
     )
 
@@ -236,7 +246,7 @@ class MultiSportWorkout(BaseWorkout):
         default_factory=lambda: {
             "sportTypeId": SportType.MULTI_SPORT,
             "sportTypeKey": "multi_sport",
-            "displayOrder": 5,
+            "displayOrder": 10,
         }
     )
 
@@ -246,8 +256,8 @@ class FitnessEquipmentWorkout(BaseWorkout):
 
     sportType: dict[str, Any] = Field(
         default_factory=lambda: {
-            "sportTypeId": SportType.FITNESS_EQUIPMENT,
-            "sportTypeKey": "fitness_equipment",
+            "sportTypeId": SportType.CARDIO_TRAINING,
+            "sportTypeKey": "cardio_training",
             "displayOrder": 6,
         }
     )
@@ -258,9 +268,9 @@ class HikingWorkout(BaseWorkout):
 
     sportType: dict[str, Any] = Field(
         default_factory=lambda: {
-            "sportTypeId": SportType.HIKING,
+            "sportTypeId": 18,
             "sportTypeKey": "hiking",
-            "displayOrder": 7,
+            "displayOrder": 18,
         }
     )
 

tests/test_workout_constants.py

@@ -17,11 +17,15 @@
 def test_target_type_ids() -> None:
     """Pin TargetType IDs to match Garmin API values (issue #333)."""
     assert TargetType.NO_TARGET == 1
-    assert TargetType.POWER == 2
+    assert TargetType.POWER_ZONE == 2
     assert TargetType.CADENCE == 3
-    assert TargetType.HEART_RATE == 4
-    assert TargetType.SPEED == 5
-    assert TargetType.OPEN == 6
+    assert TargetType.HEART_RATE_ZONE == 4
+    assert TargetType.SPEED_ZONE == 5
+    assert TargetType.PACE_ZONE == 6
+    assert TargetType.GRADE == 7
+    assert TargetType.HEART_RATE_LAP == 8
+    assert TargetType.POWER_LAP == 9
+    assert TargetType.RESISTANCE == 15
 
 
 def test_step_type_ids() -> None:
@@ -32,29 +36,37 @@ def test_step_type_ids() -> None:
     assert StepType.RECOVERY == 4
     assert StepType.REST == 5
     assert StepType.REPEAT == 6
+    assert StepType.OTHER == 7
+    assert StepType.MAIN == 8
 
 
 def test_condition_type_ids() -> None:
-    """Pin ConditionType IDs to match Garmin API values."""
-    assert ConditionType.DISTANCE == 1
+    """Pin ConditionType IDs to match Garmin API values (fixes issue #370)."""
+    assert ConditionType.LAP_BUTTON == 1
     assert ConditionType.TIME == 2
-    assert ConditionType.HEART_RATE == 3
+    assert ConditionType.DISTANCE == 3
     assert ConditionType.CALORIES == 4
-    assert ConditionType.CADENCE == 5
-    assert ConditionType.POWER == 6
+    assert ConditionType.POWER == 5
+    assert ConditionType.HEART_RATE == 6
     assert ConditionType.ITERATIONS == 7
+    assert ConditionType.FIXED_REST == 8
+    assert ConditionType.FIXED_REPETITION == 9
+    assert ConditionType.REPS == 10
 
 
 def test_sport_type_ids() -> None:
     """Pin SportType IDs to match Garmin API values."""
     assert SportType.RUNNING == 1
     assert SportType.CYCLING == 2
-    assert SportType.SWIMMING == 3
-    assert SportType.WALKING == 4
-    assert SportType.MULTI_SPORT == 5
-    assert SportType.FITNESS_EQUIPMENT == 6
-    assert SportType.HIKING == 7
-    assert SportType.OTHER == 8
+    assert SportType.OTHER == 3
+    assert SportType.SWIMMING == 4
+    assert SportType.STRENGTH_TRAINING == 5
+    assert SportType.CARDIO_TRAINING == 6
+    assert SportType.YOGA == 7
+    assert SportType.PILATES == 8
+    assert SportType.HIIT == 9
+    assert SportType.MULTI_SPORT == 10
+    assert SportType.MOBILITY == 11
 
 
 def test_swimming_workout_uses_expected_sport_type_id() -> None: