backend/calculations/body_metrics.py

@@ -383,14 +383,15 @@ def calculate_body_progress_score(profile_id: str, focus_weights: Optional[Dict]
 
 def _score_weight_trend(profile_id: str) -> Optional[int]:
     """Score weight trend alignment with goals (0-100)"""
-    from goal_utils import get_goals_by_type
+    from goal_utils import get_active_goals
 
-    goals = get_goals_by_type(profile_id, 'weight')
-    if not goals:
+    goals = get_active_goals(profile_id)
+    weight_goals = [g for g in goals if g.get('type_key') == 'weight']
+    if not weight_goals:
         return None
 
     # Use primary or first active goal
-    goal = next((g for g in goals if g.get('is_primary')), goals[0])
+    goal = next((g for g in weight_goals if g.get('is_primary')), weight_goals[0])
 
     current = goal.get('current_value')
     target = goal.get('target_value')

backend/calculations/nutrition_metrics.py

@@ -392,9 +392,6 @@ def calculate_nutrition_score(profile_id: str, focus_weights: Optional[Dict] = N
 
 def _score_calorie_adherence(profile_id: str) -> Optional[int]:
     """Score calorie target adherence (0-100)"""
-    # Get goal (if exists)
-    from goal_utils import get_goals_by_type
-
     # Check for energy balance goal
     # For now, use energy balance calculation
     balance = calculate_energy_balance_7d(profile_id)